Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

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();
             }
 

src/views/collect/PanelOrderDeal.vue

@@ -221,26 +221,26 @@
       <!--          :prescribeData="curRow"-->
       <!--        ></PanelOrderManuTagCode>-->
       <!--      </el-tab-pane>-->
-      <el-tab-pane label="拆零详情">
+<!--      <el-tab-pane label="拆零详情">-->
-        <prescribeCodePanel
+<!--        <prescribeCodePanel-->
-          v-if="panelALive"
+<!--          v-if="panelALive"-->
-          :prescribeData="curRow"
+<!--          :prescribeData="curRow"-->
-          :fifoSplit="1"
+<!--          :fifoSplit="1"-->
-        ></prescribeCodePanel>
+<!--        ></prescribeCodePanel>-->
-      </el-tab-pane>
+<!--      </el-tab-pane>-->
-      <el-tab-pane label="整取详情">
+<!--      <el-tab-pane label="整取详情">-->
-        <prescribeCodePanel
+<!--        <prescribeCodePanel-->
-          v-if="panelALive"
+<!--          v-if="panelALive"-->
-          :prescribeData="curRow"
+<!--          :prescribeData="curRow"-->
-          :fifoSplit="2"
+<!--          :fifoSplit="2"-->
-        ></prescribeCodePanel>
+<!--        ></prescribeCodePanel>-->
-      </el-tab-pane>
+<!--      </el-tab-pane>-->
-      <el-tab-pane label="整单详情">
+<!--      <el-tab-pane label="整单详情">-->
-        <PanelOrderAllDetail
+<!--        <PanelOrderAllDetail-->
-          v-if="panelALive"
+<!--          v-if="panelALive"-->
-          :prescribeData="curRow"
+<!--          :prescribeData="curRow"-->
-        ></PanelOrderAllDetail>
+<!--        ></PanelOrderAllDetail>-->
-      </el-tab-pane>
+<!--      </el-tab-pane>-->
     </el-tabs>
 
   </div>

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';
       }