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/components/business/OperaSettleClaimsWindow.vue |   49 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index ec348b6..a652802 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -37,7 +37,11 @@
                         <div class="box_dk_list_row_label">鎵撴鍑瘉锛�</div>
                         <div class="box_dk_list_row_l" v-if="info.payFileList">
                             <div class="box_dk_list_row_l_img" v-for="(item, index) in info.payFileList" :key="index">
-                                <img :src="item.fileurlFull" alt="">
+                                <el-image
+                                    style="width: 80px; height: 80px"
+                                    :src="item.fileurlFull"
+                                    :preview-src-list="[item.fileurlFull]">
+                                </el-image>
                             </div>
                         </div>
                     </div>
@@ -51,7 +55,7 @@
                     <div class="box_tui_info">浜哄憳锛氬钩鍙扮悊璧斾汉鍛�-{{info.refuseSettleClaimsLog.creatorName}}</div>
                     <div class="box_tui_row"><div class="yuan"></div>{{info.refuseSettleClaimsLog.content}}</div>
                 </div>
-                <div class="box_tui" v-if="[6].includes(info.status)">
+                <div class="box_tui" v-if="[6,8].includes(info.status)">
                     <span class="box_tui_status">宸叉嫆缁�</span>
                     <div class="box_tui_title">鎷掔粷鍘熷洜</div>
                     <div class="box_tui_info">鏃堕棿锛歿{info.refuseSettleClaimsLog.createDate}}</div>
@@ -166,7 +170,7 @@
                             <span>椋庨櫓妗堜欢</span>
                         </div>
                         <template v-if="userInfo.type === 0">
-                            <el-select v-model="info.caseType" @change="setCaseType" style="width: 100px;" placeholder="妗堜欢绫诲瀷" v-if="[9,10,11].includes(info.status)">
+                            <el-select v-model="info.caseType" @change="setCaseType" style="width: 100px;" placeholder="妗堜欢绫诲瀷" v-if="[9,10,11,12].includes(info.status)">
                                 <el-option label="鍖荤枟" :value="1"></el-option>
                                 <el-option label="浼ゆ畫" :value="2"></el-option>
                                 <el-option label="姝讳骸" :value="3"></el-option>
@@ -182,8 +186,8 @@
                             <el-button type="danger" @click="returnCase" v-if="[1,2].includes(info.status)">閫�鍥�</el-button>
                             <el-button type="primary" @click="register" v-if="[1,2].includes(info.status)">绔嬫</el-button>
                             <el-button type="primary" @click="$refs.acceptance.open('妗堜欢鍙楃悊', info.id)" v-if="[3,5].includes(info.status)">鍙楃悊</el-button>
-                            <el-button type="primary" @click="addRemark" v-if="![0,1,2,4,13,14].includes(info.status)">澶囨敞</el-button>
-                            <el-button type="primary" @click="addReport(1)" v-if="[3,7,9].includes(info.status) && info.reportNumStatus === 0">娣诲姞鎶ユ鍙�</el-button>
+                            <el-button type="primary" @click="addRemark" v-if="![0,1,2,4,14].includes(info.status)">澶囨敞</el-button>
+                            <el-button type="primary" @click="addReport(1)" v-if="[3,9].includes(info.status) && info.reportNumStatus === 0">娣诲姞鎶ユ鍙�</el-button>
                             <el-button type="primary" @click="addReport(2)" v-if="[9].includes(info.status) && info.reportNumStatus === 1">缂栬緫鎶ユ鍙�</el-button>
                             <el-button type="primary" @click="$refs.adjustment.open('鐞嗙畻', info.id, 1)" v-if="[9].includes(info.status)">鐞嗙畻</el-button>
                             <el-button type="primary" @click="$refs.adjustment.open('閲嶆柊鐞嗙畻', info.id, 1)" v-if="[10].includes(info.status)">閲嶆柊鐞嗙畻</el-button>
@@ -205,7 +209,7 @@
                         鎶ユ鍙凤細{{info.code}}
                     </div>
                     <div class="box_desc_list_row">
-                        淇濆徃鎶ユ鍙凤細{{info.reportNum || 's'}}
+                        淇濆徃鎶ユ鍙凤細{{info.reportNum}}
                     </div>
                     <div class="box_desc_list_row">
                         鎵�灞炰繚鍗曪細{{info.applyCode}}
@@ -301,6 +305,22 @@
                         </div>
                     </div>
                 </div>
+                <div class="box_desc_head" style="margin-top: 30px;">
+                    <div class="box_desc_title">
+                        <span class="box_desc_title_val">鏀舵淇℃伅</span>
+                    </div>
+                </div>
+                <div class="box_desc_list">
+                    <div class="box_desc_list_row">
+                        鏀舵閾惰锛歿{info.receiveBank}}
+                    </div>
+                    <div class="box_desc_list_row">
+                        鏀舵浜猴細{{info.receiveUserName}}
+                    </div>
+                    <div class="box_desc_list_row">
+                        鏀舵璐﹀彿锛歿{info.receiveAccount}}
+                    </div>
+                </div>
             </div>
             <div class="box_desc">
                 <div class="box_desc_head">
@@ -393,14 +413,15 @@
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
 import GlobalWindow from '@/components/common/GlobalWindow'
-import { findById, returnSettle } from '@/api/business/settleClaims'
+import { findById } from '@/api/business/settleClaims'
 import {
   register,
   addReportNum,
   addRemark,
   saveSupplementDescribe,
   updCaseType,
-  confirmFee
+  confirmFee,
+  returnSettle
 } from '@/api/business/settleRisk'
 import RiskCaseReminder from '@/components/business/riskCaseReminder'
 import CaseProgress from '@/components/business/caseProgress'
@@ -447,6 +468,9 @@
       updCaseType({ id: this.id, caseType: e })
         .then(res => {
           this.getDetail()
+        })
+        .catch(err => {
+            this.$message.error(err.message)
         })
     },
     supplementaryMaterials () {
@@ -606,16 +630,19 @@
         })
     },
     // 鎾ら攢
-    revoke (id) {
+    revoke () {
       this.$confirm('鎾ら攢鍚庯紝妗堜欢鐩存帴缁撴潫锛屾棤娉曠户缁繘琛岀悊璧旀搷浣滐紒', '鏄惁鎾ら攢鎶ユ锛�', {
         confirmButtonText: '纭畾鎾ら攢',
         cancelButtonText: '鎴戝啀鎯虫兂',
-        type: 'warning'
+        type: 'warning',
       }).then(() => {
         returnSettle({ id: this.info.id })
           .then(res => {
             this.getDetail()
-          })
+          }).catch(err => {
+              console.log(err)
+            this.$message.error(err.message)
+        })
       }).catch(() => {
 
       })

--
Gitblit v1.9.3