From b533c9cedb2252dfdc001f3d9358c7f082a3a9ae Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 九月 2023 15:44:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/experiment/planAssignments/plan.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 05d0439..8742464 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -96,8 +96,10 @@
</el-table-column>
<el-table-column prop="testState" label="妫�楠岀姸鎬�" width="100px">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.testState==1">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.testState==0">涓嶅悎鏍�</el-tag>
+ <el-tag type="success" effect="dark" v-if="scope.row.children!=undefined&&scope.row.testState!=null">宸蹭笂鎶�</el-tag>
+ <el-tag type="danger" effect="dark" v-else-if="scope.row.children!=undefined&&scope.row.testState==null">鏈笂鎶�</el-tag>
+ <el-tag type="success" v-else-if="scope.row.children==undefined&&scope.row.testState!=null">宸叉楠�</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.children==undefined&&scope.row.testState==null">鏈楠�</el-tag>
</template>
</el-table-column>
<el-table-column prop="startTime" label="妫�楠屽紑濮�" width="100px">
@@ -160,7 +162,7 @@
<el-col :span="7">{{upData.internal}}</el-col>
</el-row>
<el-row style="line-height: 46px;">
- <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀姸鎬侊細</el-col>
+ <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀粨鏋滐細</el-col>
<el-col :span="7">
<el-tag type="success" v-if="upData.testState==1">鍚堟牸</el-tag>
<el-tag type="danger" v-else-if="upData.testState==0">涓嶅悎鏍�</el-tag>
--
Gitblit v1.9.3