From 36653c98622c8a74cb850575b2001457121b794c Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期四, 25 一月 2024 16:16:22 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/quality/rawMaterial/index.vue | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue index 063bb40..ecdd037 100644 --- a/src/views/quality/rawMaterial/index.vue +++ b/src/views/quality/rawMaterial/index.vue @@ -375,7 +375,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 +391,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