diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index f5e63d1a..261825e0 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -24,36 +24,36 @@
                        v-show="isLinkDisabled"
             >拍照解码
             </el-button>
-            <el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"
-                       v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"
-                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null || (splitType=='out' && redMesg)"
-            >扫码剔除
-            </el-button>
-            <el-button size="mini" type="primary" @click.native="overdeleteCode" :loading="submitLoading"
-                       v-if="splitType=='out' && labelName == 2" style="margin-right: 8px;border-radius: 5%;"
-                       v-show="isLinkDisabled"
-            >结束剔除
-            </el-button>
-            <el-button size="mini" type="primary" @click.native="selectPrescribe()" :loading="submitLoading"
-                       v-if="splitType=='out' &&  !redMesg" style="margin-right: 8px;border-radius: 5%;"
-                       v-show="isLinkDisabled"
-            >选入已完成单据
-            </el-button>
+            <!--<el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"-->
+            <!--           v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"-->
+            <!--           v-show="isLinkDisabled" :disabled="orderFormData.billNo == null || (splitType=='out' && redMesg)"-->
+            <!--&gt;扫码剔除-->
+            <!--</el-button>-->
+            <!--<el-button size="mini" type="primary" @click.native="overdeleteCode" :loading="submitLoading"-->
+            <!--           v-if="splitType=='out' && labelName == 2" style="margin-right: 8px;border-radius: 5%;"-->
+            <!--           v-show="isLinkDisabled"-->
+            <!--&gt;结束剔除-->
+            <!--</el-button>-->
+            <!--<el-button size="mini" type="primary" @click.native="selectPrescribe()" :loading="submitLoading"-->
+            <!--           v-if="splitType=='out' &&  !redMesg" style="margin-right: 8px;border-radius: 5%;"-->
+            <!--           v-show="isLinkDisabled"-->
+            <!--&gt;选入已完成单据-->
+            <!--</el-button>-->
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
                        style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled "
                        :disabled="splitType=='out' && redMesg"
             >选入单据
             </el-button>
-            <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%;"
-                       :disabled="splitType=='out' && redMesg"
-            >保存
-            </el-button>
+            <!--<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 == ''  "-->
+            <!--&gt;放弃-->
+            <!--</el-button>-->
+            <!--<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"-->
+            <!--           v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"-->
+            <!--           :disabled="splitType=='out' && redMesg"-->
+            <!--&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"
@@ -328,7 +328,8 @@ import {
   batchVailCode,
   batchAddCode,
   batchAddCodeByOrderFinish,
-  upProcessing
+  upProcessing,
+  getProcessingOrder
 } from '@/api/inout/order'
 import {filterSubAll, findByFrom, findInvByUser} from '@/api/system/invSubWarehouse'
 import {parseTime} from '@/utils/coTools'
@@ -998,9 +999,11 @@ export default {
         {
           let item = this.allWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode)
           this.queueStatus = item.queueStatus
-          if (this.queueStatus == 1) {
-            this.redMesg = true
-            this.redMesgOld = true
+          if (isBlank(this.curQueue.code)){
+            if (this.queueStatus == 1) {
+              this.redMesg = true
+              this.redMesgOld = true
+            }
           }
         }
 
@@ -1626,6 +1629,32 @@ export default {
       this.orderQuery = currentRow
       this.chooseDraftOrderVisible = false
       this.refreshOrder(this.orderQuery)
+      let query = {
+        code : currentRow.workPlaceQueueCode,
+        workPlaceIdFk: currentRow.workPlaceCode
+      }
+      getByCode(query).then((response) => {
+        this.loading = false;
+        if (response.code == 20000) {
+          this.curQueue = response.data;
+          this.productName = this.curQueue.cpmctymc
+          if (isBlank(this.productName)) {
+            this.curQueueName = "当前取货槽:" + this.curQueue.code
+          } else {
+            this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
+          }
+
+          this.redMesg = false
+          this.orderFormData.workPlaceQueueCode = this.curQueue.code
+          this.scanCode = '';
+
+        } else {
+          this.scanCode = ''
+          this.$message.error(response.message)
+        }
+      }).catch(() => {
+      })
+      // this.redMesg = false
       //选入单据 判断此订单是否正在处理中
       // this.upOrderStatus()
 
@@ -2009,14 +2038,18 @@ export default {
               this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
             }
 
-            this.redMesg = false
+
+
             this.orderFormData.workPlaceQueueCode = this.curQueue.code
             this.scanCode = '';
+            // //查找当前用户工位是否有正在处理的单据
+            this.getOrder()
           } else {
             this.scanCode = ''
             this.$message.error(response.message)
           }
         }).catch(() => {
+
         })
         return true
       }else if (str.includes("DMOENTER")) {
@@ -2273,16 +2306,20 @@ export default {
     },
     getOrder() {
       let query = {
-        workPlaceCode: this.workplaceId
+        workPlaceCode: this.workplaceId,
+        workPlaceQueueCode: this.curQueue.code
       }
       getProcessingOrder(query).then(res => {
         if (res.code == 20000) {
           if (res.data != null) {
             this.refreshOrder(res.data)
           }
-        } else {
-          this.$message.error('获取错误')
         }
+        // this.redMesg = false
+        // else {
+        //   this.$message.error('获取错误')
+        // }
+
       })
     },
 
@@ -2469,8 +2506,7 @@ export default {
       this.workplaceId = this.$route.query.workplaceId
       this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId)
       this.orderFormData.splitBusType = 'YPCF002'
-      //查找当前用户工位是否有正在处理的单据
-      // this.getOrder()
+
     } else {
       if (this.orderQuery.workPlaceCode != null) {
         this.orderFormData.workPlaceCode = String(this.orderQuery.workPlaceCode)