From 04313efe2b8affe73f8045ca809b9cf6c1b5aac4 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 8 Apr 2025 14:39:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/splitCreateOrder.js | 1 - src/views/collect/DealOrder.vue | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js index a623dabe..eb6f15ea 100644 --- a/src/api/collect/splitCreateOrder.js +++ b/src/api/collect/splitCreateOrder.js @@ -81,7 +81,6 @@ export function updateOrder(query) { } - export function checkCollectOrderManCode(query) { return axios({ url: "/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode", diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 65a304cc..1619e5e4 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -710,6 +710,7 @@ export default { this.checkSuccess = true this.filterQuery.code = this.scanCode.trim() + this.scanCode = ''; if (this.filterQuery.code.includes(';')) { const codeArray = this.filterQuery.code.split(';') const verify = this.verifyScanCount(codeArray) @@ -1054,7 +1055,11 @@ export default { }) } else { loading.close(); - this.$message.error(res.message) + this.$alert(res.message, '提示', { + confirmButtonText: '确定', + callback: action => { + } + }) } }).catch(() => { loading.close(); @@ -1131,7 +1136,7 @@ export default { }, startDeal() { - this.autoFinishOrderFlag = true + this.autoFinishOrderFlag = false this.curRow = this.formData this.dealSplitOrder() //处理哪个活动的明细子组件 From db7b82cb5a3992e8a4bd5530ff8eb6c8b96d3131 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 8 Apr 2025 23:08:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B5=8B=E7=A0=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/collectPoint/timerSetting.vue | 187 +++++++++++------- 1 file changed, 115 insertions(+), 72 deletions(-) diff --git a/src/views/basic/collectPoint/timerSetting.vue b/src/views/basic/collectPoint/timerSetting.vue index eb1d5087..a7ca7e76 100644 --- a/src/views/basic/collectPoint/timerSetting.vue +++ b/src/views/basic/collectPoint/timerSetting.vue @@ -38,25 +38,25 @@ - - - - - - - - - + + + + + + + + + - + 是 否 @@ -88,7 +88,7 @@ - + 是 否 @@ -96,7 +96,7 @@ - + 是 否 @@ -104,25 +104,25 @@ - - - - - - - - - + + + + + + + + + + + + + + 是 + 否 + + + + + + + 是 + 否 + + + + + + + 是 + 否 + + + - + + + 是 + 否 + + + + + + - + - + + + @@ -373,8 +409,7 @@ export default { return { num: 1, ShelfDisplayFlag: false, - busTypeOptions: [ - ], + busTypeOptions: [], shelfData: [ { row: 1, @@ -455,9 +490,14 @@ export default { ipcMaxCount: null, autoDecode: 1, outputMode: 1, - autoDownloadKey:[], - autoFinishOrderKey:[], - autoUploadOrderKey:[] + autoDownloadKey: [], + autoFinishOrderKey: [], + autoUploadOrderKey: [], + delayTageCode: null, + conflictScan: null, + conflictReturn: null, + noCodeScan: null, + }, systemParam: null, socket: null, @@ -469,10 +509,10 @@ export default { }, methods: { getWorkBindBusTypes() { - getWorkBindBusTypes({page:1,limit:500}).then(res => { + getWorkBindBusTypes({page: 1, limit: 500}).then(res => { if (res.code == 20000) { - this.busTypeOptions = res.data.list || [] - } + this.busTypeOptions = res.data.list || [] + } }) }, handleInput() { @@ -521,7 +561,7 @@ export default { .then((response) => { if (response.code != 20000) { this.$message.error(response.message); - } else{ + } else { this.selectSysParam() this.$message.success("操作成功"); } @@ -630,5 +670,8 @@ export default { padding-bottom: 17px; padding-top: 17px; } +.el-col{ + +}