From 789a3e4549aa554e3293d967bf5ac32a34debf19 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 04 七月 2024 14:52:55 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 283523e..94b0932 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -324,7 +324,7 @@
                       <el-option label="鍚堟牸" :value="1"></el-option>
                       <el-option label="涓嶅悎鏍�" :value="0"></el-option>
                     </el-select>
-                    <template v-if="PROJECT=='妫�娴嬩腑蹇�'||PROJECT=='瑁呭鐢电紗'&&((!getInspectionValueType(n.i) == 2 && !getInspectionValueType(n.i) == 5))||state!=1">
+                    <template v-if="PROJECT=='妫�娴嬩腑蹇�'||PROJECT=='瑁呭鐢电紗'&&getInspectionValueType(n.i) != 2 ">
                       <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
                       <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
                       <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>

--
Gitblit v1.9.3