From da9072ffcb3f0d3dca2c6cbafffdb1b9dbbc2348 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 21 Feb 2025 10:28:33 +0800
Subject: [PATCH] =?UTF-8?q?2/21=20=E7=95=8C=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     | 8 +++-----
 src/views/collect/IoSplitFifoRemove.vue | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 261825e0..8f8f461a 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -20,7 +20,7 @@
             style="display: flex; margin-top: 5px; float: right"
           >
             <el-button size="mini" type="primary" @click.native="paizhao()" :loading="submitLoading"
-                       v-if="splitType=='out' &&  !redMesg" style="margin-right: 8px;border-radius: 5%;" :disabled=" collectSet.autoDecode == 1"
+                       v-if="splitType=='out' &&  !redMesg && collectSet.autoDecode == 0 " style="margin-right: 8px;border-radius: 5%;" :disabled=" collectSet.autoDecode == 1"
                        v-show="isLinkDisabled"
             >拍照解码
             </el-button>
@@ -999,7 +999,7 @@ export default {
         {
           let item = this.allWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode)
           this.queueStatus = item.queueStatus
-          if (isBlank(this.curQueue.code)){
+          if (this.curQueue == null){
             if (this.queueStatus == 1) {
               this.redMesg = true
               this.redMesgOld = true
@@ -2037,11 +2037,9 @@ export default {
             } else {
               this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
             }
-
-
-
             this.orderFormData.workPlaceQueueCode = this.curQueue.code
             this.scanCode = '';
+            this.redMesg = false
             // //查找当前用户工位是否有正在处理的单据
             this.getOrder()
           } else {
diff --git a/src/views/collect/IoSplitFifoRemove.vue b/src/views/collect/IoSplitFifoRemove.vue
index 76414d3b..80d428be 100644
--- a/src/views/collect/IoSplitFifoRemove.vue
+++ b/src/views/collect/IoSplitFifoRemove.vue
@@ -22,7 +22,7 @@
             style="display: flex; margin-top: 5px; float: right"
           >
             <el-button size="mini" type="primary" @click.native="paizhao()"
-                       v-if="!redMeg" style="margin-right: 8px;border-radius: 5%;" :disabled=" collectSet.autoDecode == 1"
+                       v-if="collectSet.autoDecode == 0" style="margin-right: 8px;border-radius: 5%;"
             >拍照解码
             </el-button>
             <el-button size="mini" type="primary" @click.native="fallbackCode()" :disabled="redMeg" style="margin-right: 8px;border-radius: 5%;"
@@ -676,6 +676,7 @@ export default {
       getSet().then((response) => {
         if (response.code == 20000) {
           this.collectSet = response.data
+          console.log("高拍仪设置" ,this.collectSet)
         }
       })
     },