From 206cf80d2a1ac3299ab79d8aa6e6469f36aa204b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Feb 2025 20:56:26 +0800
Subject: [PATCH] =?UTF-8?q?2/26=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue     | 4 ++--
 src/views/collect/IoSplitFifoRemove.vue | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 43a1ea07..94f2b106 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -47,7 +47,7 @@
             <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
                        style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
                        :disabled="orderFormData.billNo == null && curQueueName == ''  "
-            >放弃
+            >取消上货
             </el-button>
             <!--<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"-->
             <!--           v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"-->
@@ -2531,7 +2531,7 @@ export default {
 
     // 接受
     EventBus.$on('sendCreateData', (data) => {
-      console.log("上货页面接受数据",data.message)
+      console.log("上货页面接受数据：：：",data.message)
       this.handleData(data.message)
     });
   },
diff --git a/src/views/collect/IoSplitFifoRemove.vue b/src/views/collect/IoSplitFifoRemove.vue
index 8f344cf7..cbd4207b 100644
--- a/src/views/collect/IoSplitFifoRemove.vue
+++ b/src/views/collect/IoSplitFifoRemove.vue
@@ -713,6 +713,9 @@ export default {
             this.getSplitCodes()
             this.init()
             this.alertInit()
+            if (!isBlank(this.message)){
+              EventBus.$emit('sendCreateData', { message: this.message });
+            }
             return this.$message.success('回退成功')
           } else {
             this.getCodes()
@@ -748,6 +751,9 @@ export default {
       this.queueCodeTotal = 0
       this.collectSet = null
       this.alertInit()
+      if (!isBlank(this.message)){
+        EventBus.$emit('sendCreateData', { message: this.message });
+      }
     },
     paizhao() {
       if (this.ws && this.ws.readyState === WebSocket.OPEN) {