From 3d3a9b06fb711e35db4ae4fe7e7eca3f62afc8da Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 8 Apr 2025 15:14:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?4/8=20=E4=BC=98=E5=8C=961.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/IoReturncllectOrder.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/collect/IoReturncllectOrder.vue b/src/views/collect/IoReturncllectOrder.vue index d2ae965a..81d6772a 100644 --- a/src/views/collect/IoReturncllectOrder.vue +++ b/src/views/collect/IoReturncllectOrder.vue @@ -665,7 +665,7 @@ export default { _this.$nextTick(() => { _this.panelALive = true }) - // _this.getBizDetailList(); + _this.getBizDetailList(); _this.vailOrderFinish() }, refreshCodesPanelP() { @@ -1080,7 +1080,7 @@ export default { if (res.code == 20000) { const audio = new Audio(require('@/assets/audioFiles/order.mp3')) audio.play() - this.resetSplit() + this.reset() return this.$message.success("退货成功") if (this.formDataVisible.scanType != 1) { this.findCurOrder() From fd10847a9cae956da716dca601c346b325ed6aa5 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 8 Apr 2025 15:59:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?4/8=20=E4=BC=98=E5=8C=961.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/IoCreateOrder.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index 9c7b811a..53fc3a7b 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -292,7 +292,7 @@ { if (res.code === 20000) { + loading.close() this.$refs.inputRef.focus() this.orderFormData.billNo = res.data.orderId this.refreshCodesPanel(this) this.printMutiCodeResult(res.data.vailCodeResultResponses) } else { + loading.close() this.$message.error(res.message) } + loading.close() }) }, async printMutiCodeResult(vailCodeResultResponses) { From 9b62a922810d060243230c27cc6ef173334c23ef Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 8 Apr 2025 21:24:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?4/8=20=E6=96=B0=E5=A2=9E=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=BC=BA=E5=88=B6=E6=8F=90=E4=BA=A41..0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collectOrder.js | 8 + .../basic/workplace/addBusTypeDialog.vue | 17 +- src/views/collect/DealOrder.vue | 1 + src/views/collect/IoEndCollectOrderStats.vue | 228 ++++++++++++++++++ 4 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 src/views/collect/IoEndCollectOrderStats.vue diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js index 8753dcc5..b1a67205 100644 --- a/src/api/collect/collectOrder.js +++ b/src/api/collect/collectOrder.js @@ -377,3 +377,11 @@ export function codeReturnRemove(query) { data: query }); } + +export function orderStats(query) { + return axios({ + url: "/udiwms/basic/collect/orderFinish/orderStats", + method: "post", + data: query + }); +} diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue index 6542a4f6..5be0684f 100644 --- a/src/views/basic/workplace/addBusTypeDialog.vue +++ b/src/views/basic/workplace/addBusTypeDialog.vue @@ -127,6 +127,17 @@ + + + + + + + + + + + @@ -374,7 +385,8 @@ export default { shipper: 1, consignee: 5, autoHandle: false, - productType: 1 + productType: 1, + coercionSubmit:1, }, invList: [], busTypes: [], @@ -423,6 +435,9 @@ export default { productType: [ {required: true, message: '请选择业务类型', trigger: 'blur'} ], + coercionSubmit: [ + {required: true, message: '请选择是否强制完成单据', trigger: 'blur'} + ], consignee: [] } } diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 65a304cc..cda9ac6e 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -1047,6 +1047,7 @@ export default { }).catch(() => { }) } else if (res.code == 503) { + loading.close(); this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', { confirmButtonText: '确定', callback: action => { diff --git a/src/views/collect/IoEndCollectOrderStats.vue b/src/views/collect/IoEndCollectOrderStats.vue new file mode 100644 index 00000000..c7cf3f8e --- /dev/null +++ b/src/views/collect/IoEndCollectOrderStats.vue @@ -0,0 +1,228 @@ + + + + + From 4444e47172a5d08b7012e0f4cb80e3a5845e6924 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 8 Apr 2025 21:37:47 +0800 Subject: [PATCH 4/5] 4/8 1.1 --- src/views/collect/IoCreateOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index 53fc3a7b..faa9c01b 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -292,7 +292,7 @@ Date: Tue, 8 Apr 2025 22:00:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?4/8=20bug=E4=BC=98=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B7=B2=E5=AE=8C=E6=88=90=E5=8D=95=E6=8D=AE1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/SelectCollectOrderEndDialog.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/collect/SelectCollectOrderEndDialog.vue b/src/views/collect/SelectCollectOrderEndDialog.vue index 905a3c12..da99a892 100644 --- a/src/views/collect/SelectCollectOrderEndDialog.vue +++ b/src/views/collect/SelectCollectOrderEndDialog.vue @@ -345,7 +345,10 @@ export default { billNo: null, workPlaceCode: null, page: 1, - limit: 10 + limit: 10, + //配套系统 + isMatching:1, + inAndOutType:1 }, defaultSort: {prop: 'createTime', order: 'desc'}, loading: false,