From 465842381d4492f9ee012901461b5fe41f3855f6 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 10 Jan 2025 10:33:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=BF=E6=8D=B7=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E3=80=81=E5=8F=96=E6=B6=88=E3=80=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue               | 27 ++++++++++++++-----
 .../collect/IocCollectOrderCheckCode.vue      | 26 +++++++++++++-----
 src/views/collect/IocCollectOrderVerify.vue   | 25 ++++++++++++-----
 3 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 28fa813a..fca56fe9 100644
--- a/src/views/collect/DealOrder.vue
+++ b/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();
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index 02c6862c..d9008dab 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/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(';')) {
diff --git a/src/views/collect/IocCollectOrderVerify.vue b/src/views/collect/IocCollectOrderVerify.vue
index 75f143de..6967f631 100644
--- a/src/views/collect/IocCollectOrderVerify.vue
+++ b/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() {