diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 1a15cd8a..28fa813a 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -796,6 +796,22 @@ export default { this.enterBillNoKey() return; } + + if (this.scanCode.includes("DMOENTER")) { + this.confirmFinishOrder() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMOCANCEL")) { + this.cancelOrder() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMODEL")) { + this.deleteCode() + this.scanCode = '' + return + } + + this.checkSuccess = true; this.filterQuery.code = this.scanCode.trim(); if (this.filterQuery.code.includes(";")) { diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index af242ffa..76f84e79 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -1671,10 +1671,10 @@ export default { ) tQuery.billNo = this.orderFormData.billNo tQuery.orderType = 2 - // if (this.orderFormData.billNo == null) { - // this.$message.error('请先录入单据信息!') - // return - // } + if (this.orderFormData.billNo == null) { + this.$message.error('请先录入单据信息!') + return + } this.saveLoading = true if (this.orderFormData.billNo != null) { deleteByOrderId(tQuery).then((response) => { @@ -1716,6 +1716,21 @@ export default { this.checkSuccess = true // this.workPlaceQueueCode = this.scanCode if (this.getDMHotskeyValue(this.scanCode)) { + + if (this.scanCode.includes("DMOENTER")) { + this.submit() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMOCANCEL")) { + this.delOrder() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMODEL")) { + this.deleteCode() + this.scanCode = '' + return + } + //获取当前工位的所有码 然后批量扫入 if (this.splitType == 'return') { getCodeList({workPlaceQueueCode:this.scanCode}).then((response) => { @@ -1964,6 +1979,12 @@ export default { }).catch(() => { }) return true + }else if (str.includes("DMOENTER")) { + return true + }else if (str.includes("DMOCANCEL")) { + return true + }else if (str.includes("DMODEL")) { + return true } return false }, diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue index 466ffeef..02c6862c 100644 --- a/src/views/collect/IocCollectOrderCheckCode.vue +++ b/src/views/collect/IocCollectOrderCheckCode.vue @@ -305,6 +305,23 @@ export default { this.enterBillNoKey() return } + + if (this.scanCode.includes("DMOENTER")) { + this.confirmCheckOrder() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMOCANCEL")) { + this.cancelOrder() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMODEL")) { + // this.deleteCode() + this.scanCode = '' + return + } + + + this.filterQuery.udiCode = this.scanCode.trim() if (this.filterQuery.udiCode.includes(';')) { const codeArray = this.filterQuery.udiCode.split(';') diff --git a/src/views/collect/IocCollectOrderVerify.vue b/src/views/collect/IocCollectOrderVerify.vue index d37bab0a..75f143de 100644 --- a/src/views/collect/IocCollectOrderVerify.vue +++ b/src/views/collect/IocCollectOrderVerify.vue @@ -255,6 +255,21 @@ export default { this.enterBillNoKey() return } + + if (this.scanCode.includes("DMOENTER")) { + this.confirmCheckOrder() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMOCANCEL")) { + this.abandonOrder() + this.scanCode = '' + return + }else if (this.scanCode.includes("DMODEL")) { + // this.deleteCode() + this.scanCode = '' + return + } + this.check() }, check() {