diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 6dfb54b3..95dbd7e0 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -55,8 +55,9 @@
             <!--&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"
+                       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="" :loading="submitLoading" v-show="isLinkDisabled"
@@ -723,7 +724,7 @@ export default {
       this.scanCode = ''
       this.corpOrderIdDisabled = false
       this.curQueueName = '';
-      this.redMesg = this.redMesgOld
+      this.redMesg = true
       this.orderStatus = false
       this.scanReCount = 0
       this.$refs.newCreateCodeDetail.codeCount = 0
@@ -1002,14 +1003,17 @@ export default {
         {
           let item = this.allWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode)
           this.queueStatus = item.queueStatus
-          if (this.curQueue == null){
-            if (this.queueStatus == 1) {
+          // if (this.curQueue == null){ 这个控制加上初始化的时候不会此案时
+          if (this.queueStatus == 1){
+            if (this.curQueue.code != null){
+              this.redMesg = false
+              this.redMesgOld = false
+            }else {
               this.redMesg = true
               this.redMesgOld = true
             }
           }
         }
-
       })
 
     },