From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 01 七月 2025 14:03:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- company/src/components/enterprise/insuranceRecords.vue | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/company/src/components/enterprise/insuranceRecords.vue b/company/src/components/enterprise/insuranceRecords.vue index e8b1928..770a105 100644 --- a/company/src/components/enterprise/insuranceRecords.vue +++ b/company/src/components/enterprise/insuranceRecords.vue @@ -8,9 +8,9 @@ > <div class="info"> <div class="info_left"> - 濮撳悕锛歿{form.name}} 韬唤璇佸彿锛歿{form.idcardNo}} 鐘舵�侊細 - <span style="color: green;" v-if="form.solutionsStatus === 1">淇濋殰涓�</span> - <span v-else>涓嶅湪淇�</span> + 濮撳悕锛歿{form.name}} 韬唤璇佸彿锛歿{form.idcardNo}} +<!-- 鐘舵�侊細 <span style="color: green;" v-if="form.solutionsStatus === 1">淇濋殰涓�</span> + <span v-else>涓嶅湪淇�</span>--> </div> <el-button type="primary" @click="expr">瀵煎嚭璁板綍</el-button> </div> @@ -23,6 +23,14 @@ <span>{{scope.$index + 1}}</span> </template> </el-table-column> + <el-table-column + prop="status" + label="鐘舵��"> + <template scope="{row}"> + <span v-if="row.isValid == 1" style="color: red">涓嶅湪淇�</span> + <span v-else style="color: green">淇濋殰涓�</span> + </template> + </el-table-column> <el-table-column prop="solutionName" label="淇濋櫓鏂规"> @@ -42,14 +50,6 @@ <el-table-column prop="worktypeName" label="鎵�灞炲伐绉�"> - </el-table-column> - <el-table-column - prop="status" - label="鐘舵��"> - <template scope="{row}"> - <span v-if="row.isValid == 1" style="color: red">宸插け鏁�</span> - <span v-else style="color: green">鏈夋晥</span> - </template> </el-table-column> <el-table-column prop="startTime" -- Gitblit v1.9.3