完善车辆结清管理

anrui-riskcenter-ui/src/api/Common/dictcommons.js

@@ -228,3 +228,12 @@ export function getLegalStaffS(data) {
   })
 }
 
+// 根据资方sid获取开户行信息
+export function fetchListByBankSid(data) {
+  return request({
+    url: '/riskcenter/v1/loanfinopenbank/fetchListByBankSid',
+    method: 'get',
+    params: data
+  })
+}
+

anrui-riskcenter-ui/src/views/settle/settle.vue

@@ -88,11 +88,16 @@
             <el-table-column prop="createByName" label="申请人" align="center" width="100" />
             <el-table-column prop="createTime" label="申请日期" align="center" width="100" />
             <el-table-column prop="closeDate" label="办结日期" align="center" width="100" />
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
+            <el-table-column label="客户结清确认" align="center" width="140">
+              <template slot-scope="scope">
+                <span>{{ scope.row.state == '1' ? '是' : scope.row.state == '0' ? '否' : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="190" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
             <el-table-column prop="vehMark" label="车牌号" align="center" width="120" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="190" />
             <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
             <el-table-column prop="loanName" label="贷款人" align="center" min-width="100" />
             <el-table-column prop="typeStateValue" label="结清类型" align="center" width="100" />
@@ -133,6 +138,9 @@
           <el-form-item label="车牌号">
             <el-input v-model="carList.params.vehMark" clearable style="width: 150px;" placeholder=""/>
           </el-form-item>
+          <el-form-item label="车架号">
+            <el-input v-model="carList.params.vinNo" clearable style="width: 150px;" placeholder=""/>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="selectCar">查询</el-button>
           </el-form-item>
@@ -255,6 +263,7 @@ export default {
           customer: '',
           orgPath: '',
           vehMark: '',
+          vinNo: '',
           type: ''
         }
       },

anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@@ -83,6 +83,14 @@
               <el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row v-if="formobj.showHg">
             <el-col :span="16">
               <div class="span-sty">回购申请</div>
@@ -92,7 +100,22 @@
               <el-form-item><span class="addinputInfo">{{ formobj.settingDateBe }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">资方结清费用</div>
+          <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+            <div>资方结清费用</div>
+            <div>
+              <div>
+                <span>贷款保证金:</span>
+                <el-input v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
+              </div>
+              <div>
+                <span>是否抵顶:</span>
+                <el-radio-group v-model="formobj.loanSettleBankCostVo.topping ">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </div>
+            </div>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">资方逾期月还</div>
@@ -156,10 +179,22 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="span-sty">资方结清金额</div>
               <el-form-item><span class="addinputInfo">{{ calculateBankSettlePrice }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账号</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.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-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.accountName }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -299,6 +334,7 @@ import req from '@/api/settle/settle'
 import uploadImg from '@/components/uploadFile/uploadImg'
 import vehiclecollectionrecords from '../overduevehicle/vehiclecollectionrecords'
 import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
+import { fetchListByBankSid } from '@/api/Common/dictcommons'
 
 export default {
   name: 'SettleAdd',
@@ -310,12 +346,20 @@ export default {
   computed: {
     // 资方结清费用模块--资方结清金额计算
     calculateBankSettlePrice() {
-      return parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) || 0
+      let bankSettlePrice = '0'
+      // 是否抵顶为是，资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收 - 贷款保证金
+      if (this.formobj.loanSettleBankCostVo.topping !== '' && this.formobj.loanSettleBankCostVo.topping === '1') {
+        bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) - parseFloat(this.formobj.loanSettleBankCostVo.loanDeposit !== '' ? this.formobj.loanSettleBankCostVo.loanDeposit : '0')) * 100) / 100
+      } else {
+        // 是否抵顶为否，资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收
+        bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable)) * 100) / 100
+      }
+      return bankSettlePrice
     },
     // 公司结清费用模块--公司正常结清合计计算
     calculateSettleAll() {
       if (!this.formobj.showHg) {
-        return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice)  + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) || 0
+        return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) || 0
       } else {
         return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney) || 0
       }
@@ -341,9 +385,11 @@ export default {
       tableKey: 1,
       index: 0,
       image_list: [],
+      bank_list: [],
       formobj: {
         bankContractNo: '',
         bankName: '',
+        bankSid: '',
         busSid: '',
         busVinSid: '',
         createByName: '',
@@ -365,7 +411,11 @@ export default {
           filesList: [],
           notDuePrice: '',
           otherReceivableRemarks: '',
-          price: ''
+          price: '',
+          topping: '',
+          loanDeposit: '',
+          bankAccount: '',
+          accountName: ''
         },
         loanSettleCompanyCostVo: {
           bankNotPrice: '',
@@ -405,7 +455,8 @@ export default {
         useOrgSid: '',
         userSid: '',
         vehMark: '',
-        vinNo: ''
+        vinNo: '',
+        remarks: ''
       },
       rules: {}
     }
@@ -430,6 +481,11 @@ export default {
       req.fetchBySid({ busVinSid: row.busVinSid, orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: '', userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
+            if (res.success) {
+              this.bank_list = res.data
+            }
+          })
         }
       })
     },
@@ -442,6 +498,11 @@ export default {
         if (res.success) {
           this.formobj = res.data
           this.formobj.instanceId = res.data.procInstId
+          fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
+            if (res.success) {
+              this.bank_list = res.data
+            }
+          })
           if (this.formobj.showHg && this.formobj.loanSettleBankCostVo.filesList.length > 0) {
             const aa = []
             this.formobj.loanSettleBankCostVo.filesList.forEach((e) => {
@@ -495,6 +556,14 @@ export default {
     resetState() {
       this.viewState = 1
     },
+    bankAccountChange(value) {
+      const choose = this.bank_list.filter((item) => item.bankAccount === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.loanSettleBankCostVo.accountName = choose[0].accountName
+      } else {
+        this.formobj.loanSettleBankCostVo.accountName = ''
+      }
+    },
     notDuePriceInput(val) {
       this.formobj.loanSettleCompanyCostVo.bankNotPrice = val
     },
@@ -561,6 +630,7 @@ export default {
       this.formobj = {
         bankContractNo: '',
         bankName: '',
+        bankSid: '',
         busSid: '',
         busVinSid: '',
         createByName: '',
@@ -582,7 +652,11 @@ export default {
           filesList: [],
           notDuePrice: '',
           otherReceivableRemarks: '',
-          price: ''
+          price: '',
+          topping: '',
+          loanDeposit: '',
+          bankAccount: '',
+          accountName: ''
         },
         loanSettleCompanyCostVo: {
           bankNotPrice: '',
@@ -622,7 +696,8 @@ export default {
         useOrgSid: '',
         userSid: '',
         vehMark: '',
-        vinNo: ''
+        vinNo: '',
+        remarks: ''
       }
       this.image_list = []
       this.submitdisabled = false

anrui-riskcenter-ui/src/views/settle/settleInfo.vue

@@ -82,6 +82,12 @@
               <el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row v-if="formobj.showHg">
             <el-col :span="16">
               <div class="span-sty">回购申请</div>
@@ -91,7 +97,13 @@
               <el-form-item><span class="addinputInfo">{{ formobj.settingDateBe }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">资方结清费用</div>
+          <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+            <div>资方结清费用</div>
+            <div>
+              <span>贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
+              <span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}</span>
+            </div>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">资方逾期月还</div>
@@ -131,10 +143,18 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="span-sty">资方结清金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.bankSettlePrice }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.bankAccount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.accountName }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -271,6 +291,7 @@ export default {
       formobj: {
         bankContractNo: '',
         bankName: '',
+        bankSid: '',
         busSid: '',
         busVinSid: '',
         createByName: '',
@@ -292,7 +313,11 @@ export default {
           filesList: [],
           notDuePrice: '',
           otherReceivableRemarks: '',
-          price: ''
+          price: '',
+          topping: '',
+          loanDeposit: '',
+          bankAccount: '',
+          accountName: ''
         },
         loanSettleCompanyCostVo: {
           bankNotPrice: '',
@@ -332,7 +357,8 @@ export default {
         useOrgSid: '',
         userSid: '',
         vehMark: '',
-        vinNo: ''
+        vinNo: '',
+        remarks: ''
       },
       rules: {}
     }
@@ -409,6 +435,7 @@ export default {
       this.formobj = {
         bankContractNo: '',
         bankName: '',
+        bankSid: '',
         busSid: '',
         busVinSid: '',
         createByName: '',
@@ -430,7 +457,11 @@ export default {
           filesList: [],
           notDuePrice: '',
           otherReceivableRemarks: '',
-          price: ''
+          price: '',
+          topping: '',
+          loanDeposit: '',
+          bankAccount: '',
+          accountName: ''
         },
         loanSettleCompanyCostVo: {
           bankNotPrice: '',
@@ -470,7 +501,8 @@ export default {
         useOrgSid: '',
         userSid: '',
         vehMark: '',
-        vinNo: ''
+        vinNo: '',
+        remarks: ''
       }
       this.$emit('doback')
     }

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue

@@ -84,6 +84,12 @@
               <el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row v-if="formobj.showHg">
             <el-col :span="16">
               <div class="span-sty">回购申请</div>
@@ -93,7 +99,13 @@
               <el-form-item><span class="addinputInfo">{{ formobj.settingDateBe }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">资方结清费用</div>
+          <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+            <div>资方结清费用</div>
+            <div>
+              <span>贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
+              <span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}</span>
+            </div>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">资方逾期月还</div>
@@ -133,10 +145,18 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="span-sty">资方结清金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.bankSettlePrice }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.bankAccount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.accountName }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -312,6 +332,7 @@ export default {
       formobj: {
         bankContractNo: '',
         bankName: '',
+        bankSid: '',
         busSid: '',
         busVinSid: '',
         createByName: '',
@@ -333,7 +354,11 @@ export default {
           filesList: [],
           notDuePrice: '',
           otherReceivableRemarks: '',
-          price: ''
+          price: '',
+          topping: '',
+          loanDeposit: '',
+          bankAccount: '',
+          accountName: ''
         },
         loanSettleCompanyCostVo: {
           bankNotPrice: '',
@@ -373,7 +398,8 @@ export default {
         useOrgSid: '',
         userSid: '',
         vehMark: '',
-        vinNo: ''
+        vinNo: '',
+        remarks: ''
       },
       rules: {},
       options: [],

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue

@@ -82,6 +82,14 @@
               <el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row v-if="formobj.showHg">
             <el-col :span="16">
               <div class="span-sty">回购申请</div>
@@ -91,7 +99,22 @@
               <el-form-item><span class="addinputInfo">{{ formobj.settingDateBe }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">资方结清费用</div>
+          <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+            <div>资方结清费用</div>
+            <div>
+              <div>
+                <span>贷款保证金:</span>
+                <el-input v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
+              </div>
+              <div>
+                <span>是否抵顶:</span>
+                <el-radio-group v-model="formobj.loanSettleBankCostVo.topping ">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </div>
+            </div>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">资方逾期月还</div>
@@ -155,10 +178,22 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="span-sty">资方结清金额</div>
               <el-form-item><span class="addinputInfo">{{ calculateBankSettlePrice }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账号</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.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-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.accountName }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -298,6 +333,7 @@ import req from '@/api/settle/settle'
 import uploadImg from '@/components/uploadFile/uploadImg'
 import vehiclecollectionrecords from '../cuishoucuoshiFlow/relation/vehiclecollectionrecords'
 import financialschemeInfo from '../publicPage/financialschemeInfo'
+import { fetchListByBankSid } from '@/api/Common/dictcommons'
 
 export default {
   name: 'SettleEdit',
@@ -309,12 +345,20 @@ export default {
   computed: {
     // 资方结清费用模块--资方结清金额计算
     calculateBankSettlePrice() {
-      return parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) || 0
+      let bankSettlePrice = '0'
+      // 是否抵顶为是，资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收 - 贷款保证金
+      if (this.formobj.loanSettleBankCostVo.topping !== '' && this.formobj.loanSettleBankCostVo.topping === '1') {
+        bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) - parseFloat(this.formobj.loanSettleBankCostVo.loanDeposit !== '' ? this.formobj.loanSettleBankCostVo.loanDeposit : '0')) * 100) / 100
+      } else {
+        // 是否抵顶为否，资方结清金额 = 资方逾期月还 + 资方当期未到期月还 + 资方未到期金额 + 资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收
+        bankSettlePrice = Math.round((parseFloat(this.formobj.loanSettleBankCostVo.price === '' ? 0 : this.formobj.loanSettleBankCostVo.price) + parseFloat(this.formobj.loanSettleBankCostVo.currentNotDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.currentNotDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable)) * 100) / 100
+      }
+      return bankSettlePrice
     },
     // 公司结清费用模块--公司正常结清合计计算
     calculateSettleAll() {
       if (!this.formobj.showHg) {
-        return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice)  + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) || 0
+        return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) || 0
       } else {
         return parseFloat(this.formobj.loanSettleCompanyCostVo.overduePrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.overduePrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.funfCost === '' ? 0 : this.formobj.loanSettleCompanyCostVo.funfCost) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.deductionAmount === '' ? 0 : this.formobj.loanSettleCompanyCostVo.deductionAmount) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice) - parseFloat(this.formobj.loanSettleCompanyCostVo.loanDeposit === '' ? 0 : this.formobj.loanSettleCompanyCostVo.loanDeposit) - parseFloat(this.formobj.buyBackMoney === '' ? 0 : this.formobj.buyBackMoney) || 0
       }
@@ -340,9 +384,11 @@ export default {
       tableKey: 1,
       index: 0,
       image_list: [],
+      bank_list: [],
       formobj: {
         bankContractNo: '',
         bankName: '',
+        bankSid: '',
         busSid: '',
         busVinSid: '',
         createByName: '',
@@ -364,7 +410,11 @@ export default {
           filesList: [],
           notDuePrice: '',
           otherReceivableRemarks: '',
-          price: ''
+          price: '',
+          topping: '',
+          loanDeposit: '',
+          bankAccount: '',
+          accountName: ''
         },
         loanSettleCompanyCostVo: {
           bankNotPrice: '',
@@ -404,7 +454,8 @@ export default {
         useOrgSid: '',
         userSid: '',
         vehMark: '',
-        vinNo: ''
+        vinNo: '',
+        remarks: ''
       },
       rules: {}
     }
@@ -447,6 +498,11 @@ export default {
         if (res.success) {
           this.formobj = res.data
           this.formobj.instanceId = res.data.procInstId
+          fetchListByBankSid({ bankSid: this.formobj.bankSid }).then((res) => {
+            if (res.success) {
+              this.bank_list = res.data
+            }
+          })
           if (this.formobj.showHg && this.formobj.loanSettleBankCostVo.filesList.length > 0) {
             const aa = []
             this.formobj.loanSettleBankCostVo.filesList.forEach((e) => {
@@ -481,6 +537,14 @@ export default {
     resetState() {
       this.viewState = 1
     },
+    bankAccountChange(value) {
+      const choose = this.bank_list.filter((item) => item.bankAccount === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.loanSettleBankCostVo.accountName = choose[0].accountName
+      } else {
+        this.formobj.loanSettleBankCostVo.accountName = ''
+      }
+    },
     notDuePriceInput(val) {
       this.formobj.loanSettleCompanyCostVo.bankNotPrice = val
     },

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue

@@ -81,6 +81,12 @@
               <el-form-item><span class="addinputInfo">{{ formobj.notDuePrice }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row v-if="formobj.showHg">
             <el-col :span="16">
               <div class="span-sty">回购申请</div>
@@ -90,7 +96,13 @@
               <el-form-item><span class="addinputInfo">{{ formobj.settingDateBe }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">资方结清费用</div>
+          <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+            <div>资方结清费用</div>
+            <div>
+              <span>贷款保证金: {{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
+              <span>是否抵顶: {{ formobj.loanSettleBankCostVo.topping == '1' ? '是' : formobj.loanSettleBankCostVo.topping == '0' ? '否' : '' }}</span>
+            </div>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">资方逾期月还</div>
@@ -130,10 +142,18 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="span-sty">资方结清金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.bankSettlePrice }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.bankAccount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">资方收款账户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanSettleBankCostVo.accountName }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -270,6 +290,7 @@ export default {
       formobj: {
         bankContractNo: '',
         bankName: '',
+        bankSid: '',
         busSid: '',
         busVinSid: '',
         createByName: '',
@@ -291,7 +312,11 @@ export default {
           filesList: [],
           notDuePrice: '',
           otherReceivableRemarks: '',
-          price: ''
+          price: '',
+          topping: '',
+          loanDeposit: '',
+          bankAccount: '',
+          accountName: ''
         },
         loanSettleCompanyCostVo: {
           bankNotPrice: '',
@@ -331,7 +356,8 @@ export default {
         useOrgSid: '',
         userSid: '',
         vehMark: '',
-        vinNo: ''
+        vinNo: '',
+        remarks: ''
       },
       // 环节所需参数
       linkByParameter: {