From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/unionApply.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/company/src/views/business/unionApply.vue b/company/src/views/business/unionApply.vue
index 3944843..cf2521e 100644
--- a/company/src/views/business/unionApply.vue
+++ b/company/src/views/business/unionApply.vue
@@ -2,13 +2,15 @@
<TableLayout :permissions="['business:insuranceapply:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="淇濆崟鐘舵��" prop="status" >
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @keypress.enter.native="search">
+ <el-form-item label="淇濆崟鐘舵��" prop="queryStatus" >
+ <el-select v-model="searchForm.queryStatus" placeholder="璇烽�夋嫨" clearable @change="search">
<el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="寰呯缃�" value="1"></el-option>
<el-option label="寰呭嚭鍗�" value="2"></el-option>
<el-option label="淇濋殰涓�" value="3"></el-option>
<el-option label="宸查��鍥�" value="4"></el-option>
+ <el-option label="寰呯敓鏁�" value="5"></el-option>
+ <el-option label="宸茶繃鏈�" value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="solutionId">
@@ -39,9 +41,9 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:unionapply:create']">
- <li><el-button type="primary" @click="$refs.OpearaUnionApply.open('濮旀墭鎶曚繚鐢宠')" v-permissions="['business:unionapply:create']">鎻愪氦鐢宠</el-button></li>
- </ul>
+<!-- <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:unionapply:create']">-->
+<!-- <li><el-button type="primary" @click="$refs.OpearaUnionApply.open('濮旀墭鎶曚繚鐢宠')" v-permissions="['business:unionapply:create']">鎻愪氦鐢宠</el-button></li>-->
+<!-- </ul>-->
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -54,7 +56,11 @@
</el-table-column>
<el-table-column prop="statusInfo" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'union-apply-status'+row.status" >{{ row.statusInfo}}</span>
+ <span v-if="row.status === 3 && row.statusInfo === '宸茶繃鏈�'" style="color: #999;">{{ row.statusInfo}}</span>
+ <span v-else-if="row.status === 3 && row.statusInfo === '寰呯敓鏁�'" style="color: #f95601;">{{ row.statusInfo}}</span>
+ <span v-else-if="row.status === 4 && row.statusInfo === '宸查��鍥�'" style="color: red;">{{ row.statusInfo}}</span>
+ <span v-else-if="row.status === 5 && row.statusInfo === '寰呭鏍�'" style="color: #216EEE;">{{ row.statusInfo}}</span>
+ <span :class="'union-apply-status'+row.status" v-else>{{ row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
@@ -106,7 +112,7 @@
queryStartTime: '',
queryEndTime: '',
solutionId: '',
- status: '',
+ queryStatus: '',
time: []
},
solutionList: []
--
Gitblit v1.9.3