From d621fb916db5f04e69d2e75459891d5f399253e0 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sun, 30 Mar 2025 16:21:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=9A=E8=BF=87=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IocCollectOrderCheckCode.vue      | 20 +++++++++++++++----
 .../DevicesIocCollectOrderCheckCode.vue       | 16 ++++++++++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index f7c1ccca..f866983a 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -393,6 +393,13 @@ export default {
 
       //是否已经有单据
       if (this.orderData.billNo == null) {
+
+        if (this.scanCode != null) {
+          if (this.validateFormat(this.scanCode)) {
+            this.parseInvoice(this.scanCode)
+          }
+        }
+
         this.enterBillNoKey()
         return
       }
@@ -491,7 +498,14 @@ export default {
     checkCode(code) {
       return this.checkCodeList.includes(code)
     },
-
+    parseInvoice(inputText) {
+      const separator = inputText.includes(',') ? ',' : '，';
+      const arr = inputText.split(separator);
+      if (arr.length == 8 ) this.scanCode = arr[3];
+    },
+    validateFormat(str) {
+      return str?.length >= 3 && /^(10|01|04|32|31)[，,]/.test(str)
+    },
     enterBillNoKey(billNo) {
       this.loading = true;
       this.filterQuery.code = this.scanCode
@@ -501,9 +515,7 @@ export default {
         busType: this.filterQuery.busType,
         code: this.filterQuery.code.trim()
       }
-      if (billNo != null) {
-        tQuery.code = billNo
-      }
+
       enterCodeBillNo(tQuery).then((response) => {
         if (response.code == 601) {
           this.placeholder = '已选入单据，请扫描追溯码进行审核'
diff --git a/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue b/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue
index 68e652b7..2bdb39ab 100644
--- a/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue
+++ b/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue
@@ -390,6 +390,13 @@ export default {
 
       //是否已经有单据
       if (this.orderData.billNo == null) {
+
+        if (this.scanCode != null) {
+          if (this.validateFormat(this.scanCode)) {
+            this.parseInvoice(this.scanCode)
+          }
+        }
+
         this.enterBillNoKey()
         return
       }
@@ -488,7 +495,14 @@ export default {
     checkCode(code) {
       return this.checkCodeList.includes(code)
     },
-
+    parseInvoice(inputText) {
+      const separator = inputText.includes(',') ? ',' : '，';
+      const arr = inputText.split(separator);
+      if (arr.length == 8 ) this.scanCode = arr[3];
+    },
+    validateFormat(str) {
+      return str?.length >= 3 && /^(10|01|04|32|31)[，,]/.test(str)
+    },
     enterBillNoKey(billNo) {
       this.loading = true;
       this.filterQuery.code = this.scanCode