diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 5835a41d..e55e2d6f 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -637,7 +637,8 @@ export default {
           component: DevicesIoCreateOrderOut,
           // 假设你需要传递的参数
           componentProps: {
-            fromSplitType: 'out'
+            fromSplitType: 'out',
+            fifoSplitTag: 0
           }
         },
         {
@@ -1062,7 +1063,8 @@ export default {
             component: DevicesIoCreateOrderOut,
             // 假设你需要传递的参数
             componentProps: {
-              fromSplitType: 'out'
+              fromSplitType: 'out',
+              fifoSplitTag: 0
             }
           }
           ]
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index a48e23eb..b221fa7d 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1022,6 +1022,9 @@ export default {
               this.redMesgOld = true
             }
           }
+          if (this.queueStatus == 0){
+            this.getOrder()
+          }
         }
       })
 
@@ -2356,17 +2359,24 @@ export default {
     getOrder() {
       let query = {
         workPlaceCode: this.workplaceId,
-        workPlaceQueueCode: this.curQueue.code
+        workPlaceQueueCode: this.curQueue.code,
+        action: this.orderFormData.action,
+        fifoSplitTag: this.fifoSplitTag
       }
       getProcessingOrder(query).then(res => {
         if (res.code == 20000) {
           if (res.data != null) {
-            this.refreshOrder(res.data)
-          }else {
+            this.orderFormData = res.data
             this.scanCode = ''
             this.result = ''
             this.refreshCodesPanel()
-            this.init()
+            // this.refreshOrder(res.data)
+          }else {
+            this.refreshCodesPanel()
+            // this.scanCode = ''
+            // this.result = ''
+            // this.refreshCodesPanel()
+            // this.init()
           }
         }
         // this.redMesg = false
diff --git a/src/views/collect/device/DevicesIoCreateOrder.vue b/src/views/collect/device/DevicesIoCreateOrder.vue
index b7f567b6..61e556b2 100644
--- a/src/views/collect/device/DevicesIoCreateOrder.vue
+++ b/src/views/collect/device/DevicesIoCreateOrder.vue
@@ -55,8 +55,8 @@
             <!--&gt;保存-->
             <!--</el-button>-->
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
-                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
-                       :disabled="splitType=='out' && redMesg"
+                       v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"
+                       :disabled="orderFormData.billNo == null && curQueueName == ''  "
             >上货完成
             </el-button>
             <!-- <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"
@@ -435,7 +435,11 @@ export default {
     resetKey: {
       type: Function,
       required: true
-    }
+    },
+    fifoSplitTag: {//拆零标记
+      type: Object,
+      required: true
+    },
 
   },
   watch: {
@@ -1008,6 +1012,9 @@ export default {
               this.redMesgOld = true
             }
           }
+          if (this.queueStatus == 0){
+            this.getOrder()
+          }
         }
 
       })
@@ -1179,6 +1186,8 @@ export default {
 
     //添加条码后提交
     addCodeSubmit(tQuery) {
+      console.log("当前拆零标记" , this.fifoSplitTag)
+      tQuery.fifoSplitTag = this.fifoSplitTag
       addOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.orderFormData.billNo = response.data.orderId
@@ -2344,12 +2353,24 @@ export default {
     getOrder() {
       let query = {
         workPlaceCode: this.workplaceId,
-        workPlaceQueueCode: this.curQueue.code
+        workPlaceQueueCode: this.curQueue.code,
+        action: this.orderFormData.action,
+        fifoSplitTag: this.fifoSplitTag
       }
       getProcessingOrder(query).then(res => {
         if (res.code == 20000) {
           if (res.data != null) {
-            this.refreshOrder(res.data)
+            this.orderFormData = res.data
+            this.scanCode = ''
+            this.result = ''
+            this.refreshCodesPanel()
+            // this.refreshOrder(res.data)
+          }else {
+            this.refreshCodesPanel()
+            // this.scanCode = ''
+            // this.result = ''
+            // this.refreshCodesPanel()
+            // this.init()
           }
         }
         // this.redMesg = false