feat: 便捷操作确认、取消、删除

src/views/collect/DealOrder.vue

@@ -792,25 +792,38 @@ export default {
     },
 
     enterKey() {
-      if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
-        this.enterBillNoKey()
-        return;
-      }
 
       if (this.scanCode.includes("DMOENTER")) {
-        this.confirmFinishOrder()
+        if (this.orderData.billNo == null) {
+          this.$message.error('请先选择单据')
+        }else {
+          this.confirmFinishOrder()
+        }
         this.scanCode = ''
         return
       }else if (this.scanCode.includes("DMOCANCEL")) {
-        this.cancelOrder()
+        if (this.orderData.billNo == null) {
+          this.$message.error('请先选择单据')
+        }else {
+          this.cancelOrder()
+        }
         this.scanCode = ''
         return
       }else if (this.scanCode.includes("DMODEL")) {
-        this.deleteCode()
+        if (this.orderData.billNo == null) {
+          this.$message.error('请先选择单据')
+        }else {
+          this.deleteCode()
+        }
         this.scanCode = ''
         return
       }
 
+      if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
+        this.enterBillNoKey()
+        return;
+      }
+
 
       this.checkSuccess = true;
       this.filterQuery.code = this.scanCode.trim();

src/views/collect/IocCollectOrderCheckCode.vue

@@ -300,18 +300,21 @@ export default {
       this.errResult = ''
       // this.errVisible = false
       // this.successVisible = true
-      //是否已经有单据
-      if (this.orderData.billNo == null) {
-        this.enterBillNoKey()
-        return
-      }
 
       if (this.scanCode.includes("DMOENTER")) {
-        this.confirmCheckOrder()
+        if (this.orderData.billNo == null) {
+          this.$message.error('请先选择单据')
+        }else {
+          this.confirmCheckOrder()
+        }
         this.scanCode = ''
         return
       }else if (this.scanCode.includes("DMOCANCEL")) {
-        this.cancelOrder()
+        if (this.orderData.billNo == null) {
+          this.$message.error('请先选择单据')
+        }else {
+          this.cancelOrder()
+        }
         this.scanCode = ''
         return
       }else if (this.scanCode.includes("DMODEL")) {
@@ -321,6 +324,15 @@ export default {
       }
 
 
+      //是否已经有单据
+      if (this.orderData.billNo == null) {
+        this.enterBillNoKey()
+        return
+      }
+
+
+
+
 
       this.filterQuery.udiCode = this.scanCode.trim()
       if (this.filterQuery.udiCode.includes(';')) {

src/views/collect/IocCollectOrderVerify.vue

@@ -251,17 +251,23 @@ export default {
   methods: {
     enterKey() {
       this.errResult = ''
-      if (this.orderData.billNo == null) {
+
-        this.enterBillNoKey()
+
-        return
-      }
 
       if (this.scanCode.includes("DMOENTER")) {
-        this.confirmCheckOrder()
+        if (this.orderData.billNo == null) {
+          this.$message.error('请先选择单据')
+        }else {
+          this.confirmCheckOrder()
+        }
         this.scanCode = ''
         return
       }else if (this.scanCode.includes("DMOCANCEL")) {
-        this.abandonOrder()
+        if (this.orderData.billNo == null) {
+          this.$message.error('请先选择单据')
+        }else {
+          this.abandonOrder()
+        }
         this.scanCode = ''
         return
       }else if (this.scanCode.includes("DMODEL")) {
@@ -270,6 +276,13 @@ export default {
         return
       }
 
+
+      if (this.orderData.billNo == null) {
+        this.enterBillNoKey()
+        return
+      }
+
+
       this.check()
     },
     check() {