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 1619e5e4..97085a95 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -1048,6 +1048,7 @@ export default { }).catch(() => { }) } else if (res.code == 503) { + loading.close(); this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', { confirmButtonText: '确定', callback: action => { diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index 9c7b811a..faa9c01b 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -1720,6 +1720,7 @@ export default { confirmSelect(row) { this.selectPrescriptionVisible = false this.formData = row + this.batchAddCodeByOrderFinish(row.billNo) }, draftOrder() { @@ -2380,15 +2381,24 @@ export default { }, batchAddCodeByOrderFinish(orderFinishBillNo) { this.orderFormData.orderFinishBillNo = orderFinishBillNo + const loading = this.$loading({ + lock: true, + text: '追溯码录入中...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); batchAddCodeByOrderFinish(this.orderFormData).then((res) => { 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) { 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 @@ + + + + + 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() 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,