From 1fe3da1b15e1d1f793a3455be90df3fdf51a0c24 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 4 Sep 2024 16:16:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 624ba191..f1ad9ada 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -462,6 +462,7 @@ export default {
               this.findCurOrder();
             } else {
               this.formData.busType = this.$route.query.busType
+              this.findCurOrder();
               this.$refs.inputRef.focus();
             }
 

From c9598fc915a4f7ef82eeaef672b02643a1a396d6 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 4 Sep 2024 16:50:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=A2=9C=E8=89=B2=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/PanelOrderDeal.vue | 40 ++++++++++++++--------------
 src/views/collect/PannelOrderBiz.vue |  8 +++++-
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index f2ae4265..a61af13f 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -221,26 +221,26 @@
       <!--          :prescribeData="curRow"-->
       <!--        ></PanelOrderManuTagCode>-->
       <!--      </el-tab-pane>-->
-      <el-tab-pane label="拆零详情">
-        <prescribeCodePanel
-          v-if="panelALive"
-          :prescribeData="curRow"
-          :fifoSplit="1"
-        ></prescribeCodePanel>
-      </el-tab-pane>
-      <el-tab-pane label="整取详情">
-        <prescribeCodePanel
-          v-if="panelALive"
-          :prescribeData="curRow"
-          :fifoSplit="2"
-        ></prescribeCodePanel>
-      </el-tab-pane>
-      <el-tab-pane label="整单详情">
-        <PanelOrderAllDetail
-          v-if="panelALive"
-          :prescribeData="curRow"
-        ></PanelOrderAllDetail>
-      </el-tab-pane>
+<!--      <el-tab-pane label="拆零详情">-->
+<!--        <prescribeCodePanel-->
+<!--          v-if="panelALive"-->
+<!--          :prescribeData="curRow"-->
+<!--          :fifoSplit="1"-->
+<!--        ></prescribeCodePanel>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="整取详情">-->
+<!--        <prescribeCodePanel-->
+<!--          v-if="panelALive"-->
+<!--          :prescribeData="curRow"-->
+<!--          :fifoSplit="2"-->
+<!--        ></prescribeCodePanel>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="整单详情">-->
+<!--        <PanelOrderAllDetail-->
+<!--          v-if="panelALive"-->
+<!--          :prescribeData="curRow"-->
+<!--        ></PanelOrderAllDetail>-->
+<!--      </el-tab-pane>-->
     </el-tabs>
 
   </div>
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index d254deb6..673ce363 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -297,7 +297,13 @@ export default {
 
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
-      if (row.count != row.scanActCount) {
+      if (row.autoTagStatus == 2) {
+        rowBackground.color = '#fffb00';
+      }else
+      if (row.scanActCount > row.count) {
+        rowBackground.color = '#000000';
+      }else
+      if (row.scanActCount < row.count) {
         rowBackground.color = '#f60303';
       }