From 8687e4941e30703445a827489339b88ebdc3bdb4 Mon Sep 17 00:00:00 2001
From: angus liu <“yixin1@foreverwin.com.cn”>
Date: Fri, 27 Dec 2024 10:53:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20IQC=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E5=8F=98=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=88=A4=E5=AE=9A=E7=BB=93=E6=9E=9C=E5=92=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=87=8D=E9=AA=8C=E6=97=B6=EF=BC=8C=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=A1=8C=E9=A2=9C=E8=89=B2=E4=B8=8D=E5=90=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/qms/iqc-inspec/index.vue | 25 ++++++++++++++++++++++---
 src/views/mes/qms/iqc-inspec/init.js   |  1 +
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/mes/qms/iqc-inspec/index.vue b/src/views/mes/qms/iqc-inspec/index.vue
index e814de9..1c3e345 100644
--- a/src/views/mes/qms/iqc-inspec/index.vue
+++ b/src/views/mes/qms/iqc-inspec/index.vue
@@ -449,8 +449,20 @@ export default {
 			}
 		},
     tableRowClassName({row, rowIndex}) {
-      if (row.inspecResult === 'NG') {
-        return 'ng-row';
+
+      if (row.inspecResult === 'NG'){
+        // 非重验任务时，背景红色ng-row
+        if (row.originalJobNo === '' || row.originalJobNo == null){
+          return 'ng-row';
+        } else {
+          // 重验任务时，背景红色，字体黄色
+          return 'ng-receipt-row';
+        }
+      }else{
+        // 非NG ，重验任务 字体黄色
+        if (row.originalJobNo != '' && row.originalJobNo != null){
+          return 'receipt-row';
+        }
       }
       return '';
     },
@@ -937,7 +949,14 @@ export default {
 	}
 }
 ::v-deep .el-table__body .ng-row {
-  background-color: red !important;
+  background-color: pink  !important;
   color: black !important;
 }
+::v-deep .el-table__body .ng-receipt-row {
+  background-color: pink  !important;
+  color: red !important;
+}
+::v-deep .el-table__body .receipt-row {
+  color: red !important;
+}
 </style>
diff --git a/src/views/mes/qms/iqc-inspec/init.js b/src/views/mes/qms/iqc-inspec/init.js
index 4fbf2b3..c7de413 100644
--- a/src/views/mes/qms/iqc-inspec/init.js
+++ b/src/views/mes/qms/iqc-inspec/init.js
@@ -11,6 +11,7 @@ export const searchRules = {
 	from: [{ required: true, message: '', trigger: ['change', 'blur'] }],
 }
 export const tableObj = [
+  { prop: 'originalJobNo', label: '原任务号', width: '300' },
   { prop: 'inspectionBatch', label: '检验批', width: '200' },
   { prop: 'qcPlan', label: '检验计划编号', width: '200' },
   { prop: 'itemDesc', label: '物料名称', width: '200' },