+
+
+
+
+
+ 选择钢卷
+
+
+ {{ form.currentCoilNo }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请先选择材料类型
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请先选择材料类型
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
发 货
-
重 置
+
+ 发 货
+ 重 置
+
-
- 发货记录
-
-
-
- {{ scope.row.currentCoilNo }}
-
-
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+ 创建人:
+ {{ item.createBy || '—' }}
+
+
+ 创建时间:
+ {{ parseTime(item.createTime, '{m}-{d} {h}:{i}') || '—' }}
+
+
+
+
+
-
-
- 普通
- 重要
- 紧急
-
-
+
+
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
-
-
-
@@ -198,6 +226,9 @@ export default {
coilSelectorVisible: false,
loading: false,
buttonLoading: false,
+ queryForm: {
+ currentCoilNo: null,
+ },
// 分页参数
pagination: {
currentPage: 1,
@@ -271,7 +302,7 @@ export default {
getList() {
// 获取发货历史
this.loading = true
- listPendingAction({ actionType: 402, ...this.pagination }).then(res => {
+ listPendingAction({ actionType: 402, ...this.pagination, ...this.queryForm }).then(res => {
this.pendingActions = res.rows
this.total = res.total
this.loading = false
@@ -291,6 +322,7 @@ export default {
actionType: 402,
currentCoilNo: this.form.currentCoilNo,
coilId: this.form.coilId,
+ sourceType: 'manual',
priority: 0,
remark: this.form.remark,
actionStatus: 2,
@@ -312,4 +344,378 @@ export default {
}
}
}
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index 05d271e1..828fa10a 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -2,148 +2,178 @@
-
- 新增入库
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请先选择材料类型
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请先选择材料类型
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 入 库
+ 重 置
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 入 库
- 重 置
-
-
-
- 入库记录
-
-
-
- {{ scope.row.currentCoilNo }}
-
-
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+ 创建人:
+ {{ item.createBy || '—' }}
+
+
+ 创建时间:
+ {{ parseTime(item.createTime, '{m}-{d} {h}:{i}') || '—' }}
+
+
+
+
+
-
-
- 普通
- 重要
- 紧急
-
-
+
+
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
-
-
-
@@ -176,6 +206,9 @@ export default {
form: {},
loading: false,
buttonLoading: false,
+ queryForm: {
+ currentCoilNo: null,
+ },
// 分页参数
pagination: {
currentPage: 1,
@@ -235,7 +268,7 @@ export default {
getList() {
// 获取入库历史
this.loading = true
- listPendingAction({ actionType: 401, ...this.pagination }).then(res => {
+ listPendingAction({ actionType: 401, ...this.pagination, ...this.queryForm }).then(res => {
this.pendingActions = res.rows
this.total = res.total
this.loading = false
@@ -250,6 +283,7 @@ export default {
addPendingAction({
actionType: 401,
currentCoilNo: this.form.currentCoilNo,
+ sourceType: 'manual',
coilId: response.data.coilId,
priority: 0,
remark: this.form.remark,
@@ -272,4 +306,378 @@ export default {
}
}
}
-
\ No newline at end of file
+
+
+
\ No newline at end of file