From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 company/src/views/business/settleClaims.vue |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index c27ca9c..0c178d9 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -32,10 +32,10 @@
                 <el-select v-model="searchForm.status" clearable placeholder="璇烽�夋嫨" @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="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="5"></el-option>-->
                     <el-option label="鎷掔粷鍙楃悊" value="6"></el-option>
                     <el-option label="鍟嗚寰呭鎵�" value="7"></el-option>
                     <el-option label="鍟嗚瀹℃壒鎷掔粷" value="8"></el-option>
@@ -70,7 +70,11 @@
                         <span>{{scope.$index + 1}}</span>
                     </template>
                 </el-table-column>
-              <el-table-column prop="statusName" label="妗堜欢鐘舵��" min-width="100px"></el-table-column>
+              <el-table-column prop="statusName" label="妗堜欢鐘舵��" min-width="100px">
+                <template slot-scope="{row}">
+                  <span :class="'settle-status'+row.status">{{row.statusName}}</span>
+                </template>
+              </el-table-column>
                 <el-table-column prop="reportNum" label="鎶ユ鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="companyName" label="鎶ユ浼佷笟" min-width="100px"></el-table-column>
                 <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
@@ -79,6 +83,14 @@
                 <el-table-column prop="duName" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
                 <el-table-column prop="worktypeName" label="鎵�灞炲伐绉�" min-width="100px"></el-table-column>
                 <el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
+              <el-table-column prop="applyCode" label="淇濆崟鍙�" min-width="100px"></el-table-column>
+              <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
+              <el-table-column prop="money" label="璧斾粯閲戦(鍏�)" min-width="100px">
+                <template slot-scope="{row}">
+                  <span style="color: #f95601;cursor: pointer" v-if="[11,12,13].includes(row.status)" :title="'涓昏禂浠橈細'+(row.hpAccount||0) +'鍏� 鍏朵粬璧斾粯锛�'+(row.hpOtherAccount||0) +'鍏�'">{{(row.hpAccount||0) +(row.hpOtherAccount ||0 ) }}</span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
                 <el-table-column prop="isRisk" label="鏄惁椋庨櫓妗堜欢" min-width="100px">
                   <template slot-scope="{row}"> <span style="color: red" v-if="row.isRisk === 1">椋庨櫓妗堜欢</span></template>
                 </el-table-column>
@@ -92,7 +104,7 @@
                     <template slot-scope="{row}">
                         <el-button
                             type="text"
-                            @click="$refs.operaSettleClaimsWindow.open('鎶ユ璇︽儏', row.id)"
+                            @click="$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂璇︽儏', row.id)"
                             v-if="row.status !== 0">
                             鏌ョ湅璇︽儏
                         </el-button>

--
Gitblit v1.9.3