From 9bd3dad1ee0df02c3e4a0fc2dccc7a0c6369716f Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Thu, 29 Aug 2024 19:15:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=20=E4=BF=AE=E5=A4=8D=E5=A4=87=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/clcKanban.vue | 2 ++ src/layout/clcNoPlan.vue | 6 ------ src/layout/doKitting.vue | 28 ++++++++++++++++------------ src/layout/goods.vue | 4 ---- src/layout/sortBoxs.vue | 17 ++++++++++++----- src/layout/stock.vue | 10 ++++++++-- 6 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/layout/clcKanban.vue b/src/layout/clcKanban.vue index 64efe4b..c349af8 100644 --- a/src/layout/clcKanban.vue +++ b/src/layout/clcKanban.vue @@ -300,8 +300,10 @@ export default { this.workFormEntity.NumOfBoxOf811 = response.returnData.NumOfBoxOf811 this.workFormEntity.NumOfBoxOf911 = response.returnData.NumOfBoxOf911 this.workFormEntity.NumOfBoxOf822 = response.returnData.NumOfBoxOf822 + ElMessage.success("获取CLC看板需求成功。") } else { this.resetForms() + ElMessage.error(response.message) } }).catch(err => { console.log(err) diff --git a/src/layout/clcNoPlan.vue b/src/layout/clcNoPlan.vue index 48e880a..022c2fd 100644 --- a/src/layout/clcNoPlan.vue +++ b/src/layout/clcNoPlan.vue @@ -24,12 +24,6 @@ label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
-
diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue index 03b218a..ba9aa63 100644 --- a/src/layout/doKitting.vue +++ b/src/layout/doKitting.vue @@ -24,12 +24,10 @@ label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
- + + {{ workFormEntity.tip }} +
@@ -173,6 +171,7 @@ export default { { required: true, message: '请输入料号' } ] }), + dialogVisible: false, } }, mounted() { @@ -205,6 +204,10 @@ export default { this.workFormEntity.finishedCounts = response.returnData.finishedCounts this.workFormEntity.totalCounts = response.returnData.totalCounts this.workFormEntity.tip = response.returnData.tip + if (this.workFormEntity.remainNumOrigin == 0) { + this.workFormEntity.tip = "理论剩余库存为0，请确认。" + this.dialogVisible = true + } } else { this.resetForms() ElMessage.error(response.message) @@ -229,11 +232,12 @@ export default { if (response.code == 0) { if (response.returnData != null && response.returnData.tip != '') { this.workFormEntity.tip = response.returnData.tip - ElMessage({ - message: response.returnData.tip, - type: 'warning', - showClose: true - }) + this.dialogVisible = true + // ElMessage({ + // message: response.returnData.tip, + // type: 'warning', + // showClose: true + // }) } else { ElMessage({ message: response.message, @@ -282,7 +286,7 @@ export default { confirmFinishWork(confirmParams).then(res => { const response = res.data if (response.code == 0) { - if (response.returnData != null) { + if (response.returnData != null && response.returnData.tip != '') { this.workFormEntity.tip = response.returnData.tip } this.resetForms() diff --git a/src/layout/goods.vue b/src/layout/goods.vue index d0e2440..66510a8 100644 --- a/src/layout/goods.vue +++ b/src/layout/goods.vue @@ -167,10 +167,6 @@ 导入物料 -
- 导入工站配置 - -
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue index ba14264..7112d76 100644 --- a/src/layout/sortBoxs.vue +++ b/src/layout/sortBoxs.vue @@ -35,7 +35,7 @@ clearable>
- +
@@ -81,7 +81,7 @@ export default { workFormRef: ref(), workFormEntity: reactive({ bigBoxNo: '', - // orderOfOrders: 1 + orderOfOrders: null }), rules: reactive({}), } @@ -99,7 +99,7 @@ export default { this.$refs.bigBoxNo.focus() this.workFormEntity = reactive({ bigBoxNo: '', - // orderOfOrders: 1 + orderOfOrders: null }) }, confirmTask() { @@ -110,10 +110,17 @@ export default { }) return } + if (this.workFormEntity.orderOfOrders == null) { + ElMessage({ + message: '请输入工单顺序', + type: 'error', + }) + return + } const request = { standId: this.standId, bigBoxNo: this.workFormEntity.bigBoxNo, - // orderOfOrders: this.workFormEntity.orderOfOrders, + orderOfOrders: this.workFormEntity.orderOfOrders, userName: store.getters.getUserName } requestSortBox(request).then(res => { diff --git a/src/layout/stock.vue b/src/layout/stock.vue index 6443985..e31d2d8 100644 --- a/src/layout/stock.vue +++ b/src/layout/stock.vue @@ -22,9 +22,11 @@ - + - + @@ -233,6 +235,10 @@ export default { return '盘点中' case 3: return '移库中' + case 4: + return '拣选中' + case 5: + return '回库中' case 9: return '库存锁定' default: