From 1ae2f83c0f3ac9807590edd5c81afbc867ec0049 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 25 Jan 2024 15:56:37 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/board/thisWeekShipmentBoard.vue   | 20 +++++----
 .../modules/production/liuhuaProductView.vue  | 41 +++++++++++++------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/board/thisWeekShipmentBoard.vue b/src/views/modules/board/thisWeekShipmentBoard.vue
index 578374b..4165bfd 100644
--- a/src/views/modules/board/thisWeekShipmentBoard.vue
+++ b/src/views/modules/board/thisWeekShipmentBoard.vue
@@ -132,15 +132,20 @@
         }
       },
       tableRowClassName ({row, rowIndex}) {
-        if ( new Date(row.planShipDate) <new Date()) {
-          return 'false-row'
+        if(row.remark!=null&&row.remark!==''){
+          if (row.remark.indexOf('急')===0) {
+            return 'error-row'
+          }
         }
-        if (row.finishedFlag == '2') {
+        if (new Date(row.enteredDate)>new Date(this.dayjs().add(-1,'day'))) {
           return 'success-row'
         }
-        if (row.finishedFlag == '3') {
-          return 'error-row'
+        if ( new Date(row.planShipDate) <new Date(this.dayjs().format('YYYY-MM-DD').replace('-', '/'))) {
+          return 'false-row'
         }
+        // if (row.finishedFlag == '2') {
+        //   return 'success-row'
+        // }
         return ''
       },
       search () {
@@ -217,13 +222,14 @@
   }
   .boardDel .el-table .success-row {
     background: #1bb61b;
+    color: #f2f6fc;
   }
   .boardDel .el-table .error-row {
-    background: #e5b655;
+    background: #ffc800;
     color: #f2f6fc;
   }
   .boardDel .el-table .false-row {
-    background-color: orangered;
+    background-color: #ff0000;
     color: #f2f6fc;
   }
 </style>
diff --git a/src/views/modules/production/liuhuaProductView.vue b/src/views/modules/production/liuhuaProductView.vue
index 9e58538..d93cff1 100644
--- a/src/views/modules/production/liuhuaProductView.vue
+++ b/src/views/modules/production/liuhuaProductView.vue
@@ -191,6 +191,23 @@
             serialNumber: null,
             columnType: null,
             align: 'left'
+          }, {
+            tableId: "liuhuaView",
+            tableName: this.$route.meta.title,
+            columnProp: "firstReportDate",
+            columnLabel: "首次报工日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
@@ -228,8 +245,8 @@
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
-            columnProp: "xiubianWancheng",
-            columnLabel: "修边完成率",
+            columnProp: "liuhuaWancheng",
+            columnLabel: "硫化完成率",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -245,8 +262,8 @@
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
-            columnProp: "hongkaoWancheng",
-            columnLabel: "烘烤完成率",
+            columnProp: "xiubianWancheng",
+            columnLabel: "修边完成率",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -262,8 +279,8 @@
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
-            columnProp: "jiagongWancheng",
-            columnLabel: "加工完成率",
+            columnProp: "hongkaoWancheng",
+            columnLabel: "烘烤完成率",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -279,8 +296,8 @@
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
-            columnProp: "jianyanWancheng",
-            columnLabel: "检验完成率",
+            columnProp: "jiagongWancheng",
+            columnLabel: "加工完成率",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -296,8 +313,8 @@
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
-            columnProp: "baozhuangWancheng",
-            columnLabel: "包装完成率",
+            columnProp: "jianyanWancheng",
+            columnLabel: "检验完成率",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -313,8 +330,8 @@
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
-            columnProp: "liuhuaWancheng",
-            columnLabel: "总完成率",
+            columnProp: "baozhuangWancheng",
+            columnLabel: "包装完成率",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,