From 796e9f28105a533f4acde20c0f6aab2adff01bee Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 27 Feb 2025 10:13:36 +0800
Subject: [PATCH] =?UTF-8?q?2/27=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue     |  9 ++++++++-
 src/views/collect/IoSplitFifoRemove.vue | 13 +++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 94f2b106..b6815af7 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1754,7 +1754,9 @@ export default {
         this.result = ''
         this.$refs.inputRef.focus()
       }
-
+      this.sharedData = 'over'
+      //上货页面完成 发送 over 给tabs 页面
+      EventBus.$emit('update-data', { message: this.sharedData });
     },
     // 刷新表单
     resetForm() {
@@ -2324,6 +2326,11 @@ export default {
         if (res.code == 20000) {
           if (res.data != null) {
             this.refreshOrder(res.data)
+          }else {
+            this.scanCode = ''
+            this.result = ''
+            this.refreshCodesPanel()
+            this.init()
           }
         }
         // this.redMesg = false
diff --git a/src/views/collect/IoSplitFifoRemove.vue b/src/views/collect/IoSplitFifoRemove.vue
index cbd4207b..4021a0c5 100644
--- a/src/views/collect/IoSplitFifoRemove.vue
+++ b/src/views/collect/IoSplitFifoRemove.vue
@@ -751,7 +751,7 @@ export default {
       this.queueCodeTotal = 0
       this.collectSet = null
       this.alertInit()
-      if (!isBlank(this.message)){
+      if (!isBlank(this.message) && this.message.includes("DMQ")){
         EventBus.$emit('sendCreateData', { message: this.message });
       }
     },
@@ -910,13 +910,14 @@ export default {
       // 更新数据
       if (!isBlank(data)){
         //如果是 over 表示上货页面完成 初始化
-        if (data == 'over'){
+        if (data.includes("over")){
           this.dropCode()
           return;
+        }else {
+          this.scanCode = data;
+          this.workplaceId = this.$route.query.workplaceId
+          this.handleSlotCodeScan()
         }
-        this.scanCode = data;
-        this.workplaceId = this.$route.query.workplaceId
-        this.handleSlotCodeScan()
       }
     }
   },
@@ -993,7 +994,7 @@ export default {
   created() {
     this.workplaceId = this.$route.query.workplaceId
     // this.selectSysParam()
-    if (!isBlank(this.message)){
+    if (!isBlank(this.message) && this.message.includes("DMQ")){
       this.scanCode = this.message
       this.handleSlotCodeScan()
     }