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