From 7af24e2656ddae37f03f1ae62b439f1bbf6a9dc4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 六月 2025 18:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 company/src/views/enterprise/settleClaimsCom.vue |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/company/src/views/enterprise/settleClaimsCom.vue b/company/src/views/enterprise/settleClaimsCom.vue
index df52836..2a1d638 100644
--- a/company/src/views/enterprise/settleClaimsCom.vue
+++ b/company/src/views/enterprise/settleClaimsCom.vue
@@ -71,9 +71,23 @@
                 v-loading="isWorking.search"
                 :data="tableData.list"
                 stripe>
-                <el-table-column label="搴忓彿" width="80px">
-                    <template slot-scope="scope">
-                        <span>{{scope.$index + 1}}</span>
+<!--                <el-table-column label="搴忓彿" width="80px">-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <span>{{scope.$index + 1}}</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column prop="code" label="鎶ユ鍙�" min-width="100px"></el-table-column>
+                <el-table-column prop="informantName" label="鎶ユ浜�" min-width="100px"></el-table-column>
+                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="150px"></el-table-column>
+                <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
+                <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="180px"></el-table-column>
+                <el-table-column prop="duName" label="鐢ㄤ汉閬e崟浣�" min-width="180px"></el-table-column>
+                <el-table-column prop="applyCode" label="淇濆崟鍙�" min-width="100px"></el-table-column>
+                <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="180px"></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="statusName" label="妗堜欢鐘舵��" min-width="100px">
@@ -81,25 +95,12 @@
                   <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="informantName" label="鎶ユ浜�" min-width="100px"></el-table-column>
-                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="150px"></el-table-column>
-              <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
-                <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="180px"></el-table-column>
-              <el-table-column prop="duName" label="鐢ㄤ汉閬e崟浣�" min-width="180px"></el-table-column>
-              <el-table-column prop="applyCode" label="淇濆崟鍙�" min-width="100px"></el-table-column>
-              <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="180px"></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="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></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>
-                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="100px"></el-table-column>
+
+<!--                <el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></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>-->
+<!--                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="100px"></el-table-column>-->
                 <el-table-column
                     v-if="containPermissions(['business:settleclaims:update', 'business:settleclaims:delete'])"
                     label="鎿嶄綔"

--
Gitblit v1.9.3