Parcourir la source

融资管理 授信管理

peixh il y a 3 ans
Parent
commit
866daf720c

+ 5 - 2
front-vue/src/api/common/companyAcc.js

@@ -1,12 +1,15 @@
 import request from '@/utils/request'
 
 // 查询核心企业还款账户
-export function listCompanyAcc(zfpcrAccount) {
+export function listCompanyAcc(zfpcrAccount,scyId) {
   if(!zfpcrAccount){
     zfpcrAccount = null
   }
+  if(!scyId){
+    scyId = null
+  }
   return request({
-    url: '/sc-service/companyAcc/list/' + zfpcrAccount,
+    url: '/sc-service/companyAcc/list/' + zfpcrAccount + '/' + scyId,
     method: 'get',
   })
 }

+ 15 - 0
front-vue/src/api/service/financeRecord/record.js

@@ -76,3 +76,18 @@ export function contractSigning(query) {
     data: query
   })
 }
+
+// 查询融资费用表状态
+export function listChargeStatus(zfrId) {
+  return request({
+    url: '/sc-service/recordSeal/listChargeStatus/' + zfrId,
+    method: 'get'
+  })
+}
+// 修改融资费用表状态
+export function updateChargeStatus(zfrId) {
+  return request({
+    url: '/sc-service/recordSeal/updateChargeStatus/' + zfrId,
+    method: 'post'
+  })
+}

+ 24 - 9
front-vue/src/views/service/creditLine/addCreditLine.vue

@@ -30,12 +30,13 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="授信企业名称:" prop="zfpcrCompanyId">
-            <el-select v-model="form.zfpcrCompanyId" style="width : 284px" clearable>
+            <el-select v-model="form.zfpcrCompanyId" style="width : 284px" clearable @change ="changeAccount">
               <el-option
                 v-for="(item,index) in hxCompanyList"
                 :key="index"
                 :label="item.scyName"
                 :value="item.scyId"
+                @click.native="account(item)"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -46,7 +47,7 @@
           <el-form-item label="授信额度:" prop="zfpcrAmount">
             <!-- <el-tooltip class="item" effect="light" :content= "zfpcrAmountFormat" placement="top-start"> -->
             <el-input v-model="form.zfpcrAmount" placeholder="请输入授信额度"  style="width:284px" maxlength="12">
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
             <!-- </el-tooltip> -->
           </el-form-item>
@@ -60,7 +61,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="有效期:" prop="zfpcrDateType">
-            <el-radio-group v-model="form.zfpcrDateType" size="medium">
+            <el-radio-group v-model="form.zfpcrDateType" size="medium" @change="changeDate">
               <el-radio-button  v-for="(dict,index) in dateTypeOptions" :key="index" :label="dict.dictValue" border>{{dict.dictLabel}}</el-radio-button>
             </el-radio-group>
           </el-form-item>
@@ -417,7 +418,7 @@ export default {
     this.getZfCompany();
     // this.getFinanceProduct();
     this.getHxCompany();
-    this.getCompanyAcc();
+    // this.getCompanyAcc();
     this.getDicts("zc_zfpcr_date_type").then(response => {
       this.dateTypeOptions = response.data;
     });
@@ -474,8 +475,15 @@ export default {
       })
     },
     /* 核心企业还款账户账号 */
-    getCompanyAcc(){
-      listCompanyAcc().then((response) =>{
+    // getCompanyAcc(){
+    //   listCompanyAcc().then((response) =>{
+    //     this.accList  = response.data
+    //     this.restaurants = response.data;
+    //   })
+    // },
+    //选择授信企业选择核心企业还款账户账号
+    account(item){
+      listCompanyAcc(null,item.scyId).then((response) =>{
         this.accList  = response.data
         this.restaurants = response.data;
       })
@@ -487,19 +495,26 @@ export default {
         // 调用 callback 返回建议列表的数据
         cb(results);
     },
+    changeAccount(){
+      this.$set(this.form,"zfpcrAccount",null)
+    },
     //选择核心企业还款账户账号 赋值还款银行
     accountBank(item){
       this.$set(this.form,"zfpcrAccountBank",item.address)
     },
     clearBoth(){
-      this.form.zfpcrAccountBank = null;
-      this.getCompanyAcc();
+      this.$set(this.form,"zfpcrAccountBank",null)
+      this.account();
     },
     changeNull(){
       // if(!this.form.zfpcrAccount){
-        this.form.zfpcrAccountBank = null;
+        this.$set(this.form,"zfpcrAccountBank",null)
       // }
     },
+    //清空时间范围
+    changeDate(){
+      this.$set(this.form,"dateTime",[])
+    },
     createFilter(queryString) {
       return (restaurant) => {
         return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);

+ 4 - 4
front-vue/src/views/service/creditLine/creditLine.vue

@@ -103,11 +103,11 @@
       <el-table-column label="融资产品" align="center" prop="zfpName" v-if="uncheckList.zfpName" show-overflow-tooltip/>
       <el-table-column label="企业名称" align="center" prop="scyName" v-if="uncheckList.scyName" show-overflow-tooltip/>
       <el-table-column label="企业代码" align="center" prop="scySocialCode" v-if="uncheckList.scySocialCode" show-overflow-tooltip/>
-      <el-table-column label="授信额度" :formatter="moneyFormat"  align="center" prop="zfpcrAmount" show-overflow-tooltip v-if="uncheckList.zfpcrAmount" width="120"/>
+      <el-table-column label="授信额度(万元)" :formatter="moneyFormat"  align="center" prop="zfpcrAmount" show-overflow-tooltip v-if="uncheckList.zfpcrAmount" width="120"/>
       <el-table-column label="利率(%)" align="center" prop="zfpcrRate" v-if="uncheckList.zfpcrRate" width="120" />
-      <el-table-column label="已分割额度" :formatter="moneyFormat"  align="center" prop="zfpcrDivisionAmount" v-if="uncheckList.zfpcrDivisionAmount" width="120"/>
-      <el-table-column label="已使用额度" :formatter="moneyFormat"  align="center" prop="zfiAmount" v-if="uncheckList.zfiAmount" width="120"/>
-      <el-table-column label="可用额度" :formatter="moneyFormat"  align="center" prop="usableAmount" v-if="uncheckList.usableAmount" width="120"/>
+      <el-table-column label="已分割额度(万元)" :formatter="moneyFormat"  align="center" prop="zfpcrDivisionAmount" v-if="uncheckList.zfpcrDivisionAmount" width="120"/>
+      <el-table-column label="已使用额度(万元)" :formatter="moneyFormat"  align="center" prop="zfiAmount" v-if="uncheckList.zfiAmount" width="120"/>
+      <el-table-column label="可用额度(万元)" :formatter="moneyFormat"  align="center" prop="usableAmount" v-if="uncheckList.usableAmount" width="120"/>
       <el-table-column label="开始日期" align="center" prop="zfpcrStartDate" v-if="uncheckList.zfpcrStartDate" show-overflow-tooltip/>
       <el-table-column label="结束日期" align="center" prop="zfpcrEndDate" v-if="uncheckList.zfpcrEndDate" show-overflow-tooltip/>
       <el-table-column label="授信状态" :formatter="statusFormat" align="center" prop="zfpcrStatus" v-if="uncheckList.zfpcrStatus" show-overflow-tooltip/>

+ 6 - 3
front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -51,14 +51,14 @@
         <el-col :span="8">
           <el-form-item label="已用授信额度:" prop="zfiAmount" >
             <el-input v-model="form.zfiAmount"   style="width:284px" disabled>
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="剩余授信额度:" prop="usableAmount" >
             <el-input v-model="form.usableAmount"   style="width:284px" disabled>
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
@@ -68,7 +68,7 @@
           <el-form-item label="授信额度:" prop="zfpcrAmount">
             <!-- <el-tooltip class="item" effect="light" :content= "zfpcrAmountFormat" placement="top-start"> -->
             <el-input v-model="form.zfpcrAmount" placeholder="请输入授信额度"  style="width:284px">
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
             <!-- </el-tooltip> -->
           </el-form-item>
@@ -402,6 +402,9 @@ export default {
         zfpcrAccount: [
           { required: true, message: "核心企业还款账户账号", trigger: ["blur", "change"] }
         ],
+        zfpcrAccountBank: [ 
+          { required: true, message: "核心企业还款账户开户行", trigger: ["blur", "change"] }
+        ],
         zfpcrLoanType: [
           { required: true, message: "融资放款方式不能为空", trigger: ["blur", "change"] }
         ],

+ 26 - 11
front-vue/src/views/service/creditLine/editCreditLine.vue

@@ -30,12 +30,13 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="授信企业名称:" prop="zfpcrCompanyId">
-            <el-select v-model="form.zfpcrCompanyId" style="width : 284px" clearable>
+            <el-select v-model="form.zfpcrCompanyId" style="width : 284px" clearable @change ="changeAccount">
               <el-option
                 v-for="(item,index) in hxCompanyList"
                 :key="index"
                 :label="item.scyName"
                 :value="item.scyId"
+                @click.native="account(item)"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -45,21 +46,21 @@
         <el-col :span="8">
           <el-form-item label="原授信额度:" prop="zfpcrOldAmount" >
             <el-input v-model="form.zfpcrOldAmount"   style="width:284px" disabled>
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="已用授信额度:" prop="zfiAmount" >
             <el-input v-model="form.zfiAmount"   style="width:284px" disabled>
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="剩余授信额度:" prop="usableAmount" >
             <el-input v-model="form.usableAmount"   style="width:284px" disabled>
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
@@ -69,7 +70,7 @@
           <el-form-item label="授信额度:" prop="zfpcrAmount">
             <!-- <el-tooltip class="item" effect="light" :content= "zfpcrAmountFormat" placement="top-start"> -->
             <el-input v-model="form.zfpcrAmount" placeholder="请输入授信额度"  style="width:284px">
-              <template slot="append">元</template>
+              <template slot="append">元</template>
             </el-input>
             <!-- </el-tooltip> -->
           </el-form-item>
@@ -425,6 +426,9 @@ export default {
         zfpcrAccount: [
           { required: true, message: "核心企业还款账户账号", trigger: ["blur", "change"] }
         ],
+        zfpcrAccountBank: [ 
+          { required: true, message: "核心企业还款账户开户行", trigger: ["blur", "change"] }
+        ],
         zfpcrLoanType: [
           { required: true, message: "融资放款方式不能为空", trigger: ["blur", "change"] }
         ],
@@ -439,6 +443,7 @@ export default {
     const zfiAmount = this.$route.params && this.$route.params.zfiAmount;
     const usableAmount = this.$route.params && this.$route.params.usableAmount;
     getCreditLine(zfpcrId).then((response) => {
+      debugger
       this.ticketList = response.data.ticketList;
                    /* 查询资方 */
       //公司类型
@@ -466,7 +471,7 @@ export default {
                   /* 查询还款账户 */
       //银行卡号
       const zfpcrAccount = response.data.list[0].zfpcrAccount;
-      listCompanyAcc(zfpcrAccount).then((response) =>{
+      listCompanyAcc(zfpcrAccount,null).then((response) =>{
         this.accList  = response.data
         this.restaurants = response.data;
       }).then(()=>{
@@ -533,8 +538,15 @@ export default {
       })
     },
     /* 核心企业还款账户账号 */
-    getCompanyAcc(){
-      listCompanyAcc().then((response) =>{
+    // getCompanyAcc(){
+    //   listCompanyAcc().then((response) =>{
+    //     this.accList  = response.data
+    //     this.restaurants = response.data;
+    //   })
+    // },
+    //选择授信企业选择核心企业还款账户账号
+    account(item){
+      listCompanyAcc(null,item.scyId).then((response) =>{
         this.accList  = response.data
         this.restaurants = response.data;
       })
@@ -546,17 +558,20 @@ export default {
       // 调用 callback 返回建议列表的数据
       cb(results);
     },
+    changeAccount(){
+      this.$set(this.form,"zfpcrAccount",null)
+    },
     //选择核心企业还款账户账号 赋值还款银行
     accountBank(item){
       this.$set(this.form,"zfpcrAccountBank",item.address)
     },
     clearBoth(){
-      this.form.zfpcrAccountBank = null;
-      this.getCompanyAcc();
+      this.$set(this.form,"zfpcrAccountBank",null)
+      this.account();
     },
     changeNull(){
       // if(!this.form.zfpcrAccount){
-        this.form.zfpcrAccountBank = null;
+        this.$set(this.form,"zfpcrAccountBank",null)
       // }
     },
     createFilter(queryString) {

+ 12 - 10
front-vue/src/views/service/financeRecord/addFinanceRecord.vue

@@ -19,11 +19,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="融资金额:" prop="zfrAmount">
-              <el-input v-model="form.zfrAmount" placeholder="请输入融资金额"  style="width: 284px;" readonly/>
+              <el-input v-model="form.zfrAmount" placeholder="请输入融资金额"  style="width: 284px;" readonly>
+              <template slot="append">万元</template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="融资账户:" prop="zfrCollectionAccount" v-if="this.form.zfpcrLoantype != '0'">
+            <el-form-item label="融资账户:" prop="zfrCollectionAccount" v-if="this.form.zfpcrLoanType != '0'">
               <el-input v-model="form.zfrCollectionAccount" placeholder="请输入融资账户" style="width: 284px;" maxlength="25"/>
             </el-form-item>
           </el-col>
@@ -40,8 +42,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="融资放款方式" prop="zfpcrLoantype" label-width="90px" v-if="false">
-              <el-input v-model="form.zfpcrLoantype" placeholder="请输入融资账户" style="width: 284px;"/>
+            <el-form-item label="融资放款方式" prop="zfpcrLoanType" label-width="90px" v-if="false">
+              <el-input v-model="form.zfpcrLoanType" placeholder="请输入融资账户" style="width: 284px;"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,7 +74,7 @@
           <el-table-column label="应收企业" align="center" prop="payee" />
           <el-table-column label="应付企业" align="center" prop="payer" />
           <el-table-column label="还款时间" align="center" prop="zbiPayDate" />
-          <el-table-column label="金额" align="center" prop="zbiAmount" />
+          <el-table-column label="金额(万元)" align="center" prop="zbiAmount" />
         </el-table>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
@@ -127,7 +129,7 @@
 </template>
 
 <script>
-import { listRecord, getRecord, delRecord, addRecord, updateRecord ,listBillInf} from "@/api/service/financeRecord/record";
+import {addRecord,listBillInf} from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
 import { getFile } from "@/api/service/credit/credit";
 export default {
@@ -181,7 +183,7 @@ export default {
         zfrApplyType: null,
         zfrStatus: null,
         zfrApproveStt: null,
-        zfpcrLoantype: null,
+        zfpcrLoanType: null,
         zfiProductId: null
       },
       // 表单参数
@@ -267,7 +269,7 @@ export default {
       this.$set(this.form, "zfrAmount", item.zfiAmount);
       this.$set(this.form, "zfrRepaymentDate", item.zfiExpireDate);
       this.$set(this.form, "zfrRate", item.zfpcrRate);
-      this.$set(this.form, "zfpcrLoantype", item.zfpcrLoantype);
+      this.$set(this.form, "zfpcrLoanType", item.zfpcrLoanType);
       this.$set(this.form, "zfiProductId", item.zfiProductId);
       this.$set(this.form, "zfpcrChargeRate", item.zfpcrChargeRate);
       if(item.zfiId){
@@ -318,7 +320,7 @@ export default {
       this.form.zfrAmount = '';
       this.form,zfrRepaymentDate = '';
       this.form.zfrRate = '';
-      this.form.zfpcrLoantype = '';
+      this.form.zfpcrLoanType = '';
       this.billInfList = [];
       this.contractFileList = [];
       this.invoiceFileList = [];
@@ -328,7 +330,7 @@ export default {
     allAmount() {
       var strarr = [0.00];
       for (let i in this.billInfList) {
-        strarr.push(this.billInfList[i]["zbiAmount"]);
+        strarr.push((this.billInfList[i]["zbiAmount"] * '10000'));
       }
       return Math.floor(eval(strarr.join("+")) * 100) / 100; //结果
     },

+ 6 - 4
front-vue/src/views/service/financeRecord/detailFinanceRecord.vue

@@ -22,7 +22,9 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="融资金额" prop="zfrAmount" >
-              <el-input v-model="form.zfrAmount" placeholder="请输入融资金额"  style="width: 284px;" disabled/>
+              <el-input v-model="form.zfrAmount" placeholder="请输入融资金额"  style="width: 284px;" readonly>
+              <template slot="append">万元</template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -70,7 +72,7 @@
           <el-table-column label="应收企业" align="center" prop="payee" />
           <el-table-column label="应付企业" align="center" prop="payer" />
           <el-table-column label="还款时间" align="center" prop="zbiPayDate" />
-          <el-table-column label="金额" align="center" prop="zbiAmount" />
+          <el-table-column label="金额(万元)" align="center" prop="zbiAmount" />
         </el-table>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
@@ -125,7 +127,7 @@
 </template>
 
 <script>
-import { listRecord, getRecord, delRecord, addRecord, updateRecord ,listBillInf} from "@/api/service/financeRecord/record";
+import { getRecord,listBillInf} from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
 import { getFile } from "@/api/service/credit/credit";
 export default {
@@ -361,7 +363,7 @@ export default {
     allAmount() {
       var strarr = [0.00];
       for (let i in this.billInfList) {
-        strarr.push(this.billInfList[i]["zbiAmount"]);
+        strarr.push((this.billInfList[i]["zbiAmount"] * '10000'));
       }
       return Math.floor(eval(strarr.join("+")) * 100) / 100; //结果
     },

+ 291 - 68
front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -1,13 +1,14 @@
 <template>
-  <el-tabs type="border-card">
+  <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
     <!-- 全部table页 -->
-    <el-tab-pane label="全部">
+    <el-tab-pane label="全部" name = "first">
       <el-card class="fiche">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
         <span style="margin-bottom: 10px;color: #333333;font: 14px Helvetica Neue, Helvetica, PingFang SC, Tahoma, Arial,sans-serif;">所选条件:</span>
         <div style="float: right; margin-right: 1%">
           <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" style="float: ">重置</el-button>
+          <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" style="margin-left:5px"></column-setting>
         </div>
         <hr style="margin-top: 16px" />
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
@@ -60,16 +61,17 @@
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="开立方" align="center" prop="coreScyName" />
-        <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" />
-        <el-table-column label="融资利率" align="center" prop="zfrRate" />
-        <el-table-column label="经办人" align="center" prop="nickName" />
-        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" />
-        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus"/>
+        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner"/>
+        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber"/>
+        <el-table-column label="开立方" align="center" prop="coreScyName" v-if="uncheckList.coreScyName"/>
+        <el-table-column label="融资金额(万元)" :formatter="moneyFormat" align="center" prop="zfrAmount" v-if="uncheckList.zfrAmount"/>
+        <el-table-column label="融资利率(%)" align="center" prop="zfrRate" v-if="uncheckList.zfrRate"/>
+        <el-table-column label="经办人" align="center" prop="nickName" v-if="uncheckList.nickName"/>
+        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate"/>
+        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate"/>
+        <el-table-column label="实际放款金额(万元)" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" v-if="uncheckList.zfrLoanAmount"/>
+        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate"/>
+        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus" v-if="uncheckList.zfrStatus"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template slot-scope="scope">
             <el-button
@@ -127,13 +129,14 @@
     </el-tab-pane>
 
     <!-- 融资中table页 -->
-    <el-tab-pane label="融资中">
+    <el-tab-pane label="融资中" name = "second">
       <el-card class="fiche">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
         <span style="margin-bottom: 10px;color: #333333; font: 14px Helvetica Neue, Helvetica, PingFang SC, Tahoma, Arial,sans-serif;">所选条件:</span>
         <div style="float: right; margin-right: 1%">
           <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQueryIng" >搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQueryIng" style="float: ">重置</el-button>
+          <column-setting :checkList="checkListOne" :tableList="tableListOne" :selfDom="selfDom" :tableId="tableIdOne" style="margin-left:5px"></column-setting>
         </div>
         <hr style="margin-top: 16px" />
         <el-form
@@ -180,16 +183,17 @@
             <span>{{(queryParamsIng.pageNum - 1) * queryParamsIng.pageSize +scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="开立方" align="center" prop="coreScyName" />
-        <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" />
-        <el-table-column label="融资利率" align="center" prop="zfrRate" />
-        <el-table-column label="经办人" align="center" prop="nickName" />
-        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" />
-        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus"/>
+        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner"/>
+        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber"/>
+        <el-table-column label="开立方" align="center" prop="coreScyName" v-if="uncheckList.coreScyName"/>
+        <el-table-column label="融资金额(万元)" :formatter="moneyFormat" align="center" prop="zfrAmount" v-if="uncheckList.zfrAmount"/>
+        <el-table-column label="融资利率(%)" align="center" prop="zfrRate" v-if="uncheckList.zfrRate"/>
+        <el-table-column label="经办人" align="center" prop="nickName" v-if="uncheckList.nickName"/>
+        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate"/>
+        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate"/>
+        <el-table-column label="实际放款金额(万元)" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" v-if="uncheckList.zfrLoanAmount"/>
+        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate"/>
+        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus" v-if="uncheckList.zfrStatus"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template slot-scope="scope">
             <el-button
@@ -239,13 +243,14 @@
     </el-tab-pane>
 
     <!-- 已放款table页 -->
-    <el-tab-pane label="已放款">
+    <el-tab-pane label="已放款" name = "third">
       <el-card class="fiche">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
         <span style="margin-bottom: 10px; color: #333333; font: 14px Helvetica Neue, Helvetica, PingFang SC, Tahoma, Arial, sans-serif;">所选条件:</span>
         <div style="float: right; margin-right: 1%">
           <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQueryEnd" >搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQueryEnd" style="float: " >重置</el-button>
+          <column-setting :checkList="checkListTwo" :tableList="tableListTwo" :selfDom="selfDom" :tableId="tableIdTwo" style="margin-left:5px"></column-setting>
         </div>
         <hr style="margin-top: 16px" />
         <el-form
@@ -298,16 +303,17 @@
             <span>{{ (queryParamsEnd.pageNum - 1) * queryParamsEnd.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="开立方" align="center" prop="coreScyName" />
-        <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" />
-        <el-table-column label="融资利率" align="center" prop="zfrRate" />
-        <el-table-column label="经办人" align="center" prop="nickName" />
-        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" />
-        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus"/>
+        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner"/>
+        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber"/>
+        <el-table-column label="开立方" align="center" prop="coreScyName" v-if="uncheckList.coreScyName"/>
+        <el-table-column label="融资金额(万元)" :formatter="moneyFormat" align="center" prop="zfrAmount" v-if="uncheckList.zfrAmount"/>
+        <el-table-column label="融资利率(%)" align="center" prop="zfrRate" v-if="uncheckList.zfrRate"/>
+        <el-table-column label="经办人" align="center" prop="nickName" v-if="uncheckList.nickName"/>
+        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate"/>
+        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate"/>
+        <el-table-column label="实际放款金额(万元)" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" v-if="uncheckList.zfrLoanAmount"/>
+        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate"/>
+        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus" v-if="uncheckList.zfrStatus"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template slot-scope="scope">
             <el-button
@@ -348,13 +354,14 @@
       />
     </el-tab-pane>
     <!-- 融资失败table页 -->
-    <el-tab-pane label="融资失败">
+    <el-tab-pane label="融资失败" name = "fourth">
       <el-card class="fiche">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
         <span style="margin-bottom: 10px; color: #333333; font: 14px Helvetica Neue, Helvetica, PingFang SC, Tahoma, Arial, sans-serif;">所选条件:</span>
         <div style="float: right; margin-right: 1%">
           <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQueryLose" >搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQueryLose" style="float: " >重置</el-button>
+          <column-setting :checkList="checkListThree" :tableList="tableListThree" :selfDom="selfDom" :tableId="tableIdThree" style="margin-left:5px"></column-setting>
         </div>
         <hr style="margin-top: 16px" />
         <el-form
@@ -401,16 +408,17 @@
             <span>{{ (queryParamsLose.pageNum - 1) * queryParamsLose.pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="开立方" align="center" prop="coreScyName" />
-        <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" />
-        <el-table-column label="融资利率" align="center" prop="zfrRate" />
-        <el-table-column label="经办人" align="center" prop="nickName" />
-        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" />
-        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus"/>
+        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner"/>
+        <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber"/>
+        <el-table-column label="开立方" align="center" prop="coreScyName" v-if="uncheckList.coreScyName"/>
+        <el-table-column label="融资金额(万元)" :formatter="moneyFormat" align="center" prop="zfrAmount" v-if="uncheckList.zfrAmount"/>
+        <el-table-column label="融资利率(%)" align="center" prop="zfrRate" v-if="uncheckList.zfrRate"/>
+        <el-table-column label="经办人" align="center" prop="nickName" v-if="uncheckList.nickName"/>
+        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate"/>
+        <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate"/>
+        <el-table-column label="实际放款金额(万元)" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" v-if="uncheckList.zfrLoanAmount"/>
+        <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate"/>
+        <el-table-column label="融资状态" :formatter="statusFormat" align="center"  prop="zfrStatus" v-if="uncheckList.zfrStatus"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template slot-scope="scope">
             <el-button
@@ -453,16 +461,10 @@
     <!-- 添加或修改融资记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item
-          label="实际放款金额"
-          prop="zfrLoanAmount"
-          label-width="100px"
-        >
-          <el-input
-            v-model="form.zfrLoanAmount"
-            placeholder="实际放款金额"
-            style="width: 284px"
-          />
+        <el-form-item label="实际放款金额" prop="zfrLoanAmount" label-width="100px" >
+          <el-input v-model="form.zfrLoanAmount" placeholder="实际放款金额" style="width: 284px">
+            <template slot="append">万元</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="上传附件">
           <el-upload
@@ -494,20 +496,10 @@
             >
           </el-upload>
         </el-form-item>
-        <el-form-item
-          label="融资id"
-          prop="zfrId"
-          label-width="90px"
-          v-if="false"
-        >
+        <el-form-item label="融资id" prop="zfrId" label-width="90px" v-if="false">
           <el-input v-model="form.zfrId" style="width: 284px" />
         </el-form-item>
-        <el-form-item
-          label="融信id"
-          prop="zfrFinanceId"
-          label-width="90px"
-          v-if="false"
-        >
+        <el-form-item label="融信id" prop="zfrFinanceId" label-width="90px" v-if="false">
           <el-input v-model="form.zfrFinanceId" style="width: 284px" />
         </el-form-item>
       </el-form>
@@ -534,9 +526,11 @@ import {
 import { uploadFileNew } from "@/api/common/file";
 import Cookies from "js-cookie";
 import { getToken } from "@/utils/auth";
+import { columnQuery } from "@/api/common/columnSetting";
+import ColumnSetting from "../../../components/Table/columnSetting.vue";
 export default {
   name: "finaceRecord",
-  components: {},
+  components: {ColumnSetting},
   data() {
     return {
       //上传使用
@@ -662,12 +656,86 @@ export default {
       },
       // 表单参数
       form: {},
+      //筛选按钮的数据列表,与table表头的数据一致 --显示隐藏列用--全部
+      tableList: [
+        {label: "zfiNumner",          value: "融信编号"},
+        {label: "zfrNumber",          value: "融资编号"},
+        {label: 'coreScyName',        value: '开立方'},
+        {label: 'zfrAmount',          value: '融资金额'},
+        {label: "zfrRate",            value: "融资利率"},
+        {label: "nickName",           value: "经办人"},
+        {label: "zfrExpireDate",      value: "承诺还款时间"},
+        {label: "zfrApplyDate",       value: "融资申请日期"},
+        {label: 'zfrLoanAmount',      value: '实际放款金额'},
+        {label: "zfrLoanDate",        value: "融资放款日期"},
+        {label: "zfrStatus",          value: "融资状态"},
+      ],
+      checkList: [], //筛选列选中的数据列表--显示隐藏列用
+      uncheckList: {}, //控制筛选列显示隐藏--显示隐藏列用
+      firstSet : false,
+      tableId: "/sc-service/financeRecord/list/all",
+      //融资中
+      tableListOne: [
+        {label: "zfiNumner",          value: "融信编号"},
+        {label: "zfrNumber",          value: "融资编号"},
+        {label: 'coreScyName',        value: '开立方'},
+        {label: 'zfrAmount',          value: '融资金额'},
+        {label: "zfrRate",            value: "融资利率"},
+        {label: "nickName",           value: "经办人"},
+        {label: "zfrExpireDate",      value: "承诺还款时间"},
+        {label: "zfrApplyDate",       value: "融资申请日期"},
+        {label: 'zfrLoanAmount',      value: '实际放款金额'},
+        {label: "zfrLoanDate",        value: "融资放款日期"},
+        {label: "zfrStatus",          value: "融资状态"},
+      ],
+      checkListOne: [], //筛选列选中的数据列表--显示隐藏列用
+      uncheckListOne: {}, //控制筛选列显示隐藏--显示隐藏列用
+      firstSetOne: false,
+      tableIdOne: "/sc-service/financeRecord/list/one",
+      //已放款
+      tableListTwo: [
+        {label: "zfiNumner",          value: "融信编号"},
+        {label: "zfrNumber",          value: "融资编号"},
+        {label: 'coreScyName',        value: '开立方'},
+        {label: 'zfrAmount',          value: '融资金额'},
+        {label: "zfrRate",            value: "融资利率"},
+        {label: "nickName",           value: "经办人"},
+        {label: "zfrExpireDate",      value: "承诺还款时间"},
+        {label: "zfrApplyDate",       value: "融资申请日期"},
+        {label: 'zfrLoanAmount',      value: '实际放款金额'},
+        {label: "zfrLoanDate",        value: "融资放款日期"},
+        {label: "zfrStatus",          value: "融资状态"},
+      ],
+      checkListTwo: [], //筛选列选中的数据列表--显示隐藏列用
+      uncheckListTwo: {}, //控制筛选列显示隐藏--显示隐藏列用
+      firstSetTwo: false,
+      tableIdTwo: "/sc-service/financeRecord/list/two",
+      //放款失败
+      tableListThree: [
+        {label: "zfiNumner",          value: "融信编号"},
+        {label: "zfrNumber",          value: "融资编号"},
+        {label: 'coreScyName',        value: '开立方'},
+        {label: 'zfrAmount',          value: '融资金额'},
+        {label: "zfrRate",            value: "融资利率"},
+        {label: "nickName",           value: "经办人"},
+        {label: "zfrExpireDate",      value: "承诺还款时间"},
+        {label: "zfrApplyDate",       value: "融资申请日期"},
+        {label: 'zfrLoanAmount',      value: '实际放款金额'},
+        {label: "zfrLoanDate",        value: "融资放款日期"},
+        {label: "zfrStatus",          value: "融资状态"},
+      ],
+      checkListThree: [], //筛选列选中的数据列表--显示隐藏列用
+      uncheckListThree: {}, //控制筛选列显示隐藏--显示隐藏列用
+      firstSetThree: false,
+      tableIdThree: "/sc-service/financeRecord/list/three",
       // 表单校验
       rules: {
         zfrloanAmount: [
           { required: true, message: "放款金额不能为空", trigger: "blur" },
         ],
       },
+      selfDom : this,
+      activeName : "first"
     };
   },
   created() {
@@ -694,6 +762,9 @@ export default {
       this.statusOptions = response.data;
     });
   },
+  mounted() {
+    this.columnQuery();
+  },
   methods: {
     /** 查询全部融资记录列表 */
     getList() {
@@ -1001,6 +1072,98 @@ export default {
           .replace(/\.$/, "");
       }
     },
+    //获取当前客户是否之前设置过列展示隐藏
+    columnQuery() {
+      //获取页面路径
+      var psfPagePath = window.location.pathname;
+      //用请求后台的url作为唯一标识
+      var psfTableName = this.tableId;
+      var columnForm = {};
+      columnForm.psfPagePath = psfPagePath;
+      columnForm.psfTableName = psfTableName;
+      columnQuery(columnForm).then(response => {
+        if (response.data && response.data.psfShowData) {
+          this.checkList = response.data.psfShowData;
+        }
+        this.filter();
+      });
+    },
+    //控制隐藏显示的函数
+    filter(checkList) {
+      if (this.activeName == "first") {
+        if (!!checkList) {
+          this.checkList = checkList;
+        }
+        this.columnfilter(this.firstSet, this.checkList, this.tableList, this.uncheckList);
+      } else if (this.activeName == "second") {
+        if (!!checkList) {
+          this.checkListOne = checkList;
+        }
+        this.columnfilter(this.firstSetOne, this.checkListOne, this.tableListOne, this.uncheckListOne);
+      } else if (this.activeName == "third") {
+        if (!!checkList) {
+          this.checkListTwo = checkList;
+        }
+        this.columnfilter(this.firstSetTwo, this.checkListTwo, this.tableListTwo, this.uncheckListTwo);
+      } else if (this.activeName == "fourth") {
+        if (!!checkList) {
+          this.checkListThree = checkList;
+        }
+        this.columnfilter(this.firstSetThree, this.checkListThree, this.tableListThree, this.uncheckListThree);
+      }
+
+    },
+
+    //获取当前客户是否之前设置过列展示隐藏
+    columnQueryOne() {
+      //获取页面路径
+      var psfPagePath = window.location.pathname;
+      //用请求后台的url作为唯一标识
+      var psfTableName = this.tableIdOne;
+      var columnForm = {};
+      columnForm.psfPagePath = psfPagePath;
+      columnForm.psfTableName = psfTableName;
+      columnQuery(columnForm).then(response => {
+        if (response.data && response.data.psfShowData) {
+          this.checkListOne = response.data.psfShowData;
+        }
+        this.filter();
+      });
+    },
+
+    //获取当前客户是否之前设置过列展示隐藏
+    columnQueryTwo() {
+      //获取页面路径
+      var psfPagePath = window.location.pathname;
+      //用请求后台的url作为唯一标识
+      var psfTableName = this.tableIdTwo;
+      var columnForm = {};
+      columnForm.psfPagePath = psfPagePath;
+      columnForm.psfTableName = psfTableName;
+      columnQuery(columnForm).then(response => {
+        if (response.data && response.data.psfShowData) {
+          this.checkListTwo = response.data.psfShowData;
+        }
+        this.filter();
+      });
+    },
+
+    //获取当前客户是否之前设置过列展示隐藏
+    columnQueryThree() {
+      //获取页面路径
+      var psfPagePath = window.location.pathname;
+      //用请求后台的url作为唯一标识
+      var psfTableName = this.tableIdThree;
+      var columnForm = {};
+      columnForm.psfPagePath = psfPagePath;
+      columnForm.psfTableName = psfTableName;
+      columnQuery(columnForm).then(response => {
+        if (response.data && response.data.psfShowData) {
+          this.checkListThree = response.data.psfShowData;
+        }
+        this.filter();
+      });
+    },
     /** 导出按钮操作 */
     handleExport(row) {
       const zfrFinanceId = row.zfrFinanceId || this.ids;
@@ -1010,6 +1173,66 @@ export default {
         `融资管理附件${this.parseTime(new Date(),'{y}{m}{d}{h}{m}{s}')}.zip`
       );
     },
+
+    columnfilter(firstSet, checkList, tableList, uncheckList){
+        if (this.activeName == "first") {
+          firstSet = this.firstSet;
+        } else if (this.activeName == "second") {
+          firstSet = this.firstSetOne;
+        } else if (this.activeName == "third") {
+          firstSet = this.firstSetTwo;
+        } else if (this.activeName == "fourth") {
+          firstSet = this.firstSetThree;
+        }
+        if (firstSet && checkList.length == 0) {
+          this.$message.warning("配置显示列不能为空!");
+          return;
+        }
+        if (this.activeName == "first") {
+          this.firstSet = true;
+        } else if (this.activeName == "second") {
+          this.firstSetOne = true;
+        } else if (this.activeName == "third") {
+          this.firstSetTwo = true;
+        } else if (this.activeName == "fourth") {
+          this.firstSetThree = true;
+        }
+          //初始化数据
+        if (checkList.length == 0) {
+              for (let index in tableList) {
+                  let table = tableList[index];
+                  checkList.push(table.label);
+              }
+          }
+          for (let index in tableList) {
+              let table = tableList[index];
+              uncheckList[table.label] = true;
+          }
+          
+          //数据准备
+          for (let item in uncheckList) {
+            uncheckList[item] = false;
+          }
+          //数据处理
+          for (let index in checkList) {
+              let name = checkList[index];
+              if (name in uncheckList) {
+                uncheckList[name] = true;
+              }
+          }
+          this.$forceUpdate();
+    },
+    handleClick (tab, event) {
+      if (this.activeName == "first") {
+        this.columnQuery();
+      } else if (this.activeName == "second") {
+        this.columnQueryOne();
+      } else if (this.activeName == "third") {
+        this.columnQueryTwo();
+      } else if (this.activeName == "fourth") {
+        this.columnQueryThree();
+      }
+    }
   },
 };
 </script>

+ 44 - 13
front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -69,7 +69,7 @@
           <el-table-column label="应收企业" align="center" prop="payee" />
           <el-table-column label="应付企业" align="center" prop="payer" />
           <el-table-column label="还款时间" align="center" prop="zbiPayDate" />
-          <el-table-column label="金额" align="center" prop="zbiAmount" />
+          <el-table-column label="金额(万元)" align="center" prop="zbiAmount" />
         </el-table>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
@@ -167,7 +167,7 @@
   </div>
 </template>
 <script>
-import { listRecord, getRecord, delRecord, addRecord, updateRecord ,listBillInf,getContractFile,contractSigning} from "@/api/service/financeRecord/record";
+import {getRecord,updateRecord ,listBillInf,getContractFile,contractSigning,updateChargeStatus,listChargeStatus} from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
 import {getCreditDetail,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
@@ -179,6 +179,10 @@ export default {
     components: {pdfShow},
     data() {
         return {
+            //融资id
+            zfrId: '',
+            //需要缴纳的费用
+            needPay: '',
             //融信信息
             zcFinanceInf:{},
             //融资编号
@@ -262,11 +266,11 @@ export default {
         };
     },
     activated() {
-        const zfrId = this.$route.params && this.$route.params.zfrId;
-        getRecord(zfrId).then((response) => {
-            debugger
+        this.zfrId = this.$route.params && this.$route.params.zfrId;
+        getRecord(this.zfrId).then((response) => {
             this.zcFinanceInf = response.data.zcFinanceInf;
             this.number = response.data.zfrNumber;
+            this.needPay = response.data.needPay;
             //意愿类型
             this.zfpAuthType = response.data.zfpAuthType;
             this.time = this.parseTime(new Date(response.data.createTime),'{y}-{m}-{d} {h}:{m}:{s}');
@@ -350,7 +354,7 @@ export default {
     allAmount() {
       var strarr = [0.00];
       for (let i in this.billInfList) {
-        strarr.push(this.billInfList[i]["zbiAmount"]);
+        strarr.push((this.billInfList[i]["zbiAmount"] * '10000'));
       }
       return Math.floor(eval(strarr.join("+")) * 100) / 100; //结果
     },
@@ -473,13 +477,40 @@ export default {
     },
     //选择类型
     selectType(){
-        //选择签署意愿
-        if(this.zfpAuthType == "00"){
-                this.confirmIsShow = true;
-        }else{
-            this.checking();
-        }
-
+        var zfrId= this.zfrId
+        listChargeStatus(zfrId).then((response) => {
+            const zciStatus = response.data[0].zciStatus;
+            if(response.data){
+                if(response.data[0].zciStatus == '00'){
+                    this.$confirm(
+                        '请缴纳手续费'+ this.needPay + '万元',
+                        "警告",
+                        {
+                        confirmButtonText: "去缴费",
+                        cancelButtonText: "取消",
+                        type: "warning",
+                        }
+                    ).then(function () {
+                        return updateChargeStatus(zfrId);
+                        }).then(() =>{
+                        //选择签署意愿
+                        if(this.zfpAuthType == "00"){
+                                this.confirmIsShow = true;
+                        }else{
+                            this.checking();
+                        }
+                    })
+                }else{
+                    //选择签署意愿
+                        if(this.zfpAuthType == "00"){
+                                this.confirmIsShow = true;
+                        }else{
+                            this.checking();
+                        }
+                }
+            }
+        });
+        
     },
     //文件下载
     handleDownload(row){