From 04313efe2b8affe73f8045ca809b9cf6c1b5aac4 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 8 Apr 2025 14:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/splitCreateOrder.js | 1 -
 src/views/collect/DealOrder.vue     | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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