From 6574fb57a37621e2347d7012d2513a35c2bb6bb0 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 27 Aug 2024 15:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86=E7=BB=93?=
 =?UTF-8?q?=E6=B8=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/settle/settleAdd.vue              | 17 ++++++++++++++++-
 .../views/workFlow/jieqingFlow/settleEdit.vue   | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
index 797de7784c..8b076b520e 100644
--- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
+++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue
@@ -183,7 +183,7 @@
               <div class="span-sty">资方收款账号</div>
               <el-form-item>
                 <el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
-                  <el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
+                  <el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -518,6 +518,11 @@ export default {
       req.settleRepoInit({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          if (this.formobj.loanSettleBankCostVo.topping) {
+            this.formobj.loanSettleCompanyCostVo.topping = '1'
+          } else if (!this.formobj.loanSettleBankCostVo.topping) {
+            this.formobj.loanSettleBankCostVo.topping = '0'
+          }
           fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
             if (res.success) {
               this.bank_list = res.data
@@ -589,6 +594,11 @@ export default {
       this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
       this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
       this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
+      if (this.formobj.loanSettleBankCostVo.topping === '1') {
+        this.formobj.loanSettleCompanyCostVo.topping = true
+      } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
+        this.formobj.loanSettleBankCostVo.topping = false
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -610,6 +620,11 @@ export default {
       this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
       this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
       this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
+      if (this.formobj.loanSettleBankCostVo.topping === '1') {
+        this.formobj.loanSettleCompanyCostVo.topping = true
+      } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
+        this.formobj.loanSettleBankCostVo.topping = false
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
index f5b69a0c7e..f4194c4d9b 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
@@ -182,7 +182,7 @@
               <div class="span-sty">资方收款账号</div>
               <el-form-item>
                 <el-select class="addinputInfo" v-model="formobj.loanSettleBankCostVo.bankAccount" placeholder="请选择" clearable filterable @change="bankAccountChange">
-                  <el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.accountName" :value="item.bankAccount"></el-option>
+                  <el-option v-for="item in bank_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -494,6 +494,11 @@ export default {
         if (res.success) {
           this.formobj = res.data
           this.formobj.instanceId = res.data.procInstId
+          if (this.formobj.loanSettleBankCostVo.topping) {
+            this.formobj.loanSettleCompanyCostVo.topping = '1'
+          } else if (!this.formobj.loanSettleBankCostVo.topping) {
+            this.formobj.loanSettleBankCostVo.topping = '0'
+          }
           fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
             if (res.success) {
               this.bank_list = res.data
@@ -565,6 +570,11 @@ export default {
       this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
       this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
       this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
+      if (this.formobj.loanSettleBankCostVo.topping === '1') {
+        this.formobj.loanSettleCompanyCostVo.topping = true
+      } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
+        this.formobj.loanSettleBankCostVo.topping = false
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -593,6 +603,11 @@ export default {
       this.formobj.loanSettleCompanyCostVo.settleAll = this.calculateSettleAll
       this.formobj.loanSettleCompanyReductionVo.amountTo = this.calculateAmountTo
       this.formobj.loanSettleCompanyReductionVo.profit = this.calculateProfit
+      if (this.formobj.loanSettleBankCostVo.topping === '1') {
+        this.formobj.loanSettleCompanyCostVo.topping = true
+      } else if (this.formobj.loanSettleBankCostVo.topping === '0') {
+        this.formobj.loanSettleBankCostVo.topping = false
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true