From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1

---
 company/src/views/business/insuranceApply.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 0e8fdba..4a49a27 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -68,9 +68,13 @@
                     <span>{{scope.$index + 1}}</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="statusInfo"   align="center"  fixed label="鐘舵��">
+                <el-table-column prop="statusInfo" align="center"  fixed label="鐘舵��">
                   <template slot-scope="{row}">
-                    <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+                    <span style="color: #666;" v-if="[9,25,27,5].includes(row.status) && ['宸插叧闂�','宸茶繃鏈�'].includes(row.statusInfo)">{{row.statusInfo}}</span>
+                    <span style="color: red;" v-else-if="row.status === 4 && row.statusInfo === '宸查��鍥�'">{{ row.statusInfo}}</span>
+                    <span style="color: #f95601;" v-else-if="[5,27].includes(row.status) && row.statusInfo === '寰呯敓鏁�'">{{ row.statusInfo}}</span>
+                      <span style="color: #216EEE;" v-else-if="[12].includes(row.status) && row.statusInfo === '寰呭鏍�'">{{ row.statusInfo}}</span>
+                    <span :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="solutionsName" fixed label="淇濋櫓鏂规" align="center" min-width="150"></el-table-column>
@@ -146,7 +150,7 @@
         <!--    閫夋嫨浼佷笟    -->
         <chooseCompany ref="chooseCompany" @submit="getVal" />
         <!--    鏂板鎶曚繚    -->
-        <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="handlePageChange" />
+            <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="handlePageChange" />
     </TableLayout>
 </template>
 
@@ -181,6 +185,7 @@
           status: [
             { label: '寰呭鏍�', id: '0' },
             { label: '寰呭嚭鍗�', id: '1' },
+            { label: '鎶曚繚涓�', id: '26' },
             { label: '寰呯缃�', id: '7' },
             { label: '寰呯敓鏁�', id: '2,0' },
             { label: '淇濋殰涓�', id: '2,1' },
@@ -207,6 +212,7 @@
           this.searchForm.timeOut = e.split(',')[1]
           this.searchForm.statusCollect = e.split(',')[0]
         } else {
+          this.searchForm.timeOut = ''
           this.searchForm.statusCollect = e
         }
         this.search()
@@ -218,7 +224,8 @@
         reset () {
             this.$refs.searchForm.resetFields()
             this.statusCollect = ''
-          this.searchForm.statusCollect = ''
+            this.searchForm.timeOut = ''
+            this.searchForm.statusCollect = ''
             this.searchForm.createTimeS = ''
             this.searchForm.createTimeE = ''
             this.search()

--
Gitblit v1.9.3