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() //处理哪个活动的明细子组件