From 6aebccf9bc911c746303d3e10f6d6c2975d76835 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 5 Sep 2024 18:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderNew.vue | 21 ++++++++++-----------
 src/views/collect/PannelOrderBiz.vue  | 16 ++++++++--------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index fe47e5b8..08efa018 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -250,10 +250,10 @@ import {convertDate} from "@/utils/date";
 import {detail} from "@/api/basic/sicker/prescribeApi";
 import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
 import prescribeOriginPanel from "./PannelOrderBiz";
-import {clearAllOrder, deleteByOrder, importOrder, orderPage,downloadOrder} from "@/api/collect/collectOrder";
+import {clearAllOrder, deleteByOrder, importOrder, orderPage, downloadOrder} from "@/api/collect/collectOrder";
 import {filterSubAllOptimize} from "@/api/system/invSubWarehouse";
 import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
-import { getWorkBindBusTypes } from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "prescribePanel",
@@ -318,7 +318,7 @@ export default {
       },
       curRow: null,
       panelALive: false,
-      busQuery:{
+      busQuery: {
         workplaceCode: '',
         page: 1,
         limit: 100
@@ -377,15 +377,15 @@ export default {
         this.loading = false
       })
     },
-    downloadData(){
-      if (this.filterQuery.busType == null ||this.filterQuery.workPlaceCode == null ){
+    downloadData() {
+      if (this.filterQuery.busType == null || this.filterQuery.workPlaceCode == null) {
         return this.$message.error("请选择工位和业务类型")
       }
       downloadOrder(this.filterQuery).then(res => {
-        if (res.code == 20000){
+        if (res.code == 20000) {
           return this.$message.success(res.data)
-        }else {
-          return  this.$message.error("获取错误")
+        } else {
+          return this.$message.error(res.message)
         }
       })
     },
@@ -521,8 +521,7 @@ export default {
           _this.options.getBusType = getWorkPlace
           if (_this.options.getBusType.length == 1) {
             _this.filterQuery.busType = _this.options.getBusType[0].code
-          }
-          else {
+          } else {
             _this.filterQuery.busType = null
           }
         }
@@ -542,7 +541,7 @@ export default {
       this.getList();
     });
     this.filterQuery.tagStatus = this.tagStatus
-    this.findWorkPlace(this,'')
+    this.findWorkPlace(this, '')
   }
 
 }
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index 673ce363..cbf5e1bd 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -297,16 +297,16 @@ export default {
 
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
-      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';
+        rowBackground.color = '#F56C6C';
+      }
+      if (row.autoTagStatus == 2) {
+        rowBackground.color = '#E6A23C';
+      }
+      if (row.scanActCount >= row.count) {
+        rowBackground.color = '#67C23A';
       }
-
       rowBackground.height = "38px"
       return rowBackground;
     },