From ca24e514400e386de5066ec6e423d7fd2de43f65 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 31 一月 2024 16:30:17 +0800 Subject: [PATCH] 不合格状态 --- src/views/quality/rawMaterial/index.vue | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue index 063bb40..0839cf1 100644 --- a/src/views/quality/rawMaterial/index.vue +++ b/src/views/quality/rawMaterial/index.vue @@ -105,6 +105,17 @@ }, { minWidth: '120', + prop: 'type', + label: '妫�楠岀被鍨�', + isTrue: true, + isSearch: true, + searchInfoType: 'select', + optList: () => { + return this.typeList + } + }, + { + minWidth: '120', prop: 'code', label: '鍘熸潗鏂欑紪鐮�', isTrue: true, @@ -225,6 +236,7 @@ }, insStateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉娴�',value:'1'},{label:'鏈娴�',value:'0'}], StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸插悎鏍�',value:'1'},{label:'涓嶅悎鏍�',value:'0'}], + typeList: [{label:'鍏ㄩ儴',value:''},{label:'棣栨',value:'棣栨'},{label:'杩旀',value:'杩旀'}], } }, components: { @@ -375,7 +387,9 @@ this.$router.push({ name: 'rawMaterialForm', query: { - id: row == null ? null : row.id, + id: row == null ? null : row.id + }, + params: { resultVal: row == null ? null : row.judgeState } }) @@ -389,7 +403,7 @@ } }, formatJudgeState(row, column, cellValue){ - if(cellValue != undefined || cellValue != null){ + if(cellValue != undefined && cellValue != null && cellValue != ''){ if(cellValue == 0){ return "<span style='color:#E84738;'>涓嶅悎鏍�</span>" } -- Gitblit v1.9.3