From 36a30a262c16b6c37be7d1817c46d6693a324cc4 Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期四, 19 十二月 2024 13:15:57 +0800 Subject: [PATCH] 完成管理评审搬迁 --- src/components/do/b1-sample/detail.vue | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue index 5a07876..92e0658 100644 --- a/src/components/do/b1-sample/detail.vue +++ b/src/components/do/b1-sample/detail.vue @@ -2,7 +2,7 @@ <div style="width: 100%;height: 100%;overflow-y: auto;" class="detail"> <div> <el-row class="title"> - <el-col :span="12" style="padding-left: 20px;">鏍峰搧璇︽儏</el-col> + <el-col :span="12" style="padding-left: 20px;text-align: left;">鏍峰搧璇︽儏</el-col> <el-col :span="12" style="text-align: right;"> <el-button size="small" @click="hanldeBack">杩斿洖</el-button> </el-col> @@ -66,17 +66,27 @@ </el-table-column> <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100" show-overflow-tooltip></el-table-column> - <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column> - <el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column> + <el-table-column prop="inspectionItemSubclass" label="妫�楠屽瓙椤�" min-width="100" + show-overflow-tooltip></el-table-column> + <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip v-if="PROJECT=='瑁呭鐢电紗'"></el-table-column> + <el-table-column prop="sonLaboratory" label="绔欑偣" min-min-width="100" show-overflow-tooltip></el-table-column> <el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column> - <el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip></el-table-column> + <el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip> + <template slot-scope="scope"> + {{handleData(scope.row.equipValue)}} + </template> + </el-table-column> <el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column> <el-table-column prop="updateUserName" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column> <el-table-column prop="updateTime" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column> + <el-table-column prop="lastValue" label="妫�楠屽��" min-width="100" show-overflow-tooltip></el-table-column> <el-table-column prop="insResult" label="缁撹" min-width="100"> <template slot-scope="scope"> <el-tag - :type="scope.row.insResult==1?'success':'danger'" size="medium">{{scope.row.insResult==1?'鍚堟牸':'涓嶅悎鏍�'}}</el-tag> + :type="scope.row.insResult === 1 ? 'success' : (scope.row.insResult === 0 ? 'danger' : (scope.row.insResult === 3 ? 'gray' : 'info'))" + size="medium"> + {{ scope.row.insResult === 1 ? '鍚堟牸' : (scope.row.insResult === 0 ? '涓嶅悎鏍�' : (scope.row.insResult === 3 ? '涓嶅垽瀹�' : '寰呭畾')) }} + </el-tag> </template> </el-table-column> </el-table> @@ -129,6 +139,15 @@ this.histories = histories; this.products = products; }) + }, + handleData(e){ + let info = '' + if(e){ + info = JSON.parse(e).map(item => { + return item.v; + }).join(',') + } + return info } } } -- Gitblit v1.9.3