Prechádzať zdrojové kódy

修改还款管理展示等bug

cuixq 3 rokov pred
rodič
commit
b8d47e0ae5

+ 1 - 1
front-vue/src/assets/styles/login.scss

@@ -122,7 +122,7 @@
 
   // 内部供应链
   .zap-tabs {
-    width: 320px;
+    width: 330px;
     margin: 0 auto;
     min-height: 480px;
     box-sizing: border-box;

+ 11 - 10
front-vue/src/views/login.vue

@@ -31,13 +31,14 @@
                             </el-button>
                         </el-form-item>
                         <el-form-item>
-                            <div class="zap-agreement">
+                            <div class="zap-agreement"  style="margin-right: -15px">
                                 <span class="zap-agreement__text">登录视为同意并遵守</span>
+                                <br/> <br/> <br/>
                                 <div class="zap-agreement__link" >
-                                <el-link href="/serviceAgreement" >
+                                <el-link type="primary"  href="/serviceAgreement">
                                     <span>《招采云链服务平台会员注册协议》</span>
                                     </el-link>
-                                <el-link   href="/privacyPolicy">
+                                <el-link type="primary"   href="/privacyPolicy">
                                        《招采云链服务平台隐私政策》
                                     </el-link>
                                 </div>
@@ -78,13 +79,13 @@
                         <el-link style="margin-right:50px; font-size: 16px;margin-bottom: 30px;color: #4280F2;" href="/registerUser">还没账号?立即注册!</el-link>
                      
                         <el-form-item>
-                             <div class="zap-agreement">
+                             <div class="zap-agreement" style="margin-right: -15px">
                                 <span class="zap-agreement__text">登录视为同意并遵守</span>
-                                <div class="zap-agreement__link">
-                                    <el-link href="/serviceAgreement">
+                                <div class="zap-agreement__link" >
+                                    <el-link type="primary" href="/serviceAgreement">
                                     《招采云链服务平台会员注册协议》
                                     </el-link>
-                                         <el-link   href="/privacyPolicy">
+                                         <el-link  type="primary" href="/privacyPolicy">
                                        《招采云链服务平台隐私政策》
                                     </el-link>
                                    
@@ -112,13 +113,13 @@
                         <div class="zap-scanning__text">打开<span class="zap-scanning__color">微信</span>扫码登录</div>
                     </div>
                     <el-form-item>
-                        <div class="zap-agreement" style="padding-top: 32px;">
+                        <div class="zap-agreement" style="margin-right: -15px">
                             <span class="zap-agreement__text">登录视为同意并遵守</span>
                             <div class="zap-agreement__link">
-                            <el-link href="/serviceAgreement">
+                            <el-link type="primary" href="/serviceAgreement">
                                     《招采云链服务平台会员注册协议》
                                     </el-link>
-                                         <el-link   href="/privacyPolicy">
+                                         <el-link  type="primary"  href="/privacyPolicy">
                                        《招采云链服务平台隐私政策》
                                     </el-link>
                             </div>

+ 14 - 4
front-vue/src/views/registerUser.vue

@@ -41,11 +41,15 @@
                                 <span v-else>请 稍 后...</span>
                             </el-button>
                         </el-form-item>
-                        <div class="zap-agreement">
+                        <div class="zap-agreement" style="margin-right: -15px">
                             <span class="zap-agreement__text">登录视为同意并遵守</span>
                             <div class="zap-agreement__link">
-                                <span>《招采云链服务平台会员注册协议》</span>
-                                <span>《招采云链服务平台隐私政策》</span>
+                            <el-link type="primary" href="/serviceAgreement">
+                                    《招采云链服务平台会员注册协议》
+                                    </el-link>
+                                         <el-link  type="primary"  href="/privacyPolicy">
+                                       《招采云链服务平台隐私政策》
+                                    </el-link>
                             </div>
                         </div>
                     </el-tab-pane>
@@ -239,14 +243,20 @@ export default {
                   }
 
                   this.loginForm.type = "2";
+                        const loadings = this.$loading({
+                        lock: true,
+                        text: "Loadings",
+                        background: "rgba(0, 0, 0,0)"
+                    });
                   registerUser(this.loginForm).then((res) => {
                     this.loading = false;
                     this.msgSuccess("注册成功");
                     if (res.data.code == "0") {
                          setTimeout(() => {
                               this.$router.push({ path: "/login" });
-                        }, 5000);
+                        }, 500);
                     }
+                   loadings.close();
                   }).catch(() => {
                     this.loading = false;
                   });

+ 1 - 4
front-vue/src/views/service/company/coreCompanyManage.vue

@@ -191,10 +191,7 @@ export default {
                 scyType: "01" //核心企业
             },
             //筛选按钮的数据列表,与table表头的数据一致 --显示隐藏列用
-            tableList: [{
-                    label: "scyId",
-                    value: "企业编号"
-                },
+            tableList: [
                 {
                     label: "scyName",
                     value: "企业名称"

+ 4 - 4
front-vue/src/views/service/company/supCompanyManage.vue

@@ -320,10 +320,10 @@ export default {
       },
       //筛选按钮的数据列表,与table表头的数据一致 --显示隐藏列用
       tableList: [
-        {
-          label: "scyId",
-          value: "企业编号"
-        },
+        // {
+        //   label: "scyId",
+        //   value: "企业编号"
+        // },
         {
           label: "scyName",
           value: "企业名称"

+ 4 - 3
front-vue/src/views/service/cost/userCostManage.vue

@@ -597,6 +597,7 @@ export default {
       listCost(this.addDateRange(this.queryParams, this.dateRange)).then(
         response => {
           this.costList = response.data.records;
+          console.log(this.costList,"costList")
           this.total = response.data.total;
           this.loading = false;
         }
@@ -715,10 +716,10 @@ export default {
                 };
                 transfer(map)
                   .then(response => {
-                    loading.close();
                     self.msgSuccess("缴费成功");
                     this.accNo = false;
                     this.getList();
+                    loading.close();
                     return changeZfiStatus(zciId);
                   })
                   .catch(() => {
@@ -737,10 +738,10 @@ export default {
                 console.log("缴费")
                 transfer(map)
                   .then(response => {
-                    loading.close();
                     this.accNo = false;
-                    self.msgSuccess("缴费成功");
                     this.getList();
+                    self.msgSuccess("缴费成功");
+                    loading.close();
                     return changeZfiStatus(zciId);
                   })
                   .catch(() => {

+ 17 - 3
front-vue/src/views/service/credit/addCredit.vue

@@ -325,6 +325,8 @@ export default {
             zfpcrRate: "",
             //最小融资额度
             zfpMinimumAmount: "",
+             //最短账期
+            zfpShortestPeriod: "",
             //合同附件
             contractFileList: [],
             //发票附件
@@ -364,6 +366,7 @@ export default {
             }),
             //获取授信额度
             listCreditLine(this.creditParams).then((response) => {
+                console.log(response,"console.log(response)")
                 this.creditLineList = response.data.map((item) => {
                     return {
                         value: item.zfpcrId,
@@ -376,6 +379,7 @@ export default {
                         zfpcrRate: item.zfpcrRate,
                         zfpAuthType: item.zfpAuthType,
                         remaining: item.remaining,
+                        zfpShortestPeriod: item.zfpShortestPeriod,
                         zfpMinimumAmount: item.zfpMinimumAmount
                     };
                 });
@@ -697,6 +701,8 @@ export default {
                 this.zfpAuthType = "";
                 //最小融资额度
                 this.zfpMinimumAmount = "";
+                //最短账期
+                this.zfpShortestPeriod = "";
                 return;
             }
             let obj = {};
@@ -717,6 +723,8 @@ export default {
             this.zfpAuthType = obj.zfpAuthType;
             //最小融资额度
             this.zfpMinimumAmount = obj.zfpMinimumAmount;
+            //最短账期
+            this.zfpShortestPeriod = obj.zfpShortestPeriod;
             //长期
             if ("0" == this.zfpcrDateType) {
                 this.validityDate = "长期";
@@ -882,6 +890,8 @@ export default {
                                 _this.form.ticketList = _this.ticketList;
                                 //可用额度
                                 _this.form.availableAmt = _this.moneyDelete(_this.availableAmt);
+                                //最短账期
+                                _this.form.zfpShortestPeriod = _this.zfpShortestPeriod;
                                 //最小融资金额
                                 _this.form.zfpMinimumAmount = _this.zfpMinimumAmount;
                                 addCredit(_this.form).then((response) => {
@@ -893,12 +903,12 @@ export default {
                                         if (false == response.data) {
                                             //当前用户不是经办人,返回到列表页
                                             _this.msgSuccess("融信资料已提交企业内部审批");
-                                             this.reset();
                                             _this.$store.dispatch(
                                                 "tagsView/delView",
                                                 _this.$route
                                             );
                                             _this.$router.go(-1);
+                                             _this.reset();
                                         } else {
                                             //当前用户是经办人,判断有无核心开立融信的内部审批
                                             //查询有无核心开立内部审批
@@ -909,15 +919,14 @@ export default {
                                                 //有核心开立内部审批
                                                 if (true == result) {
                                                     _this.msgSuccess("融信资料已提交企业内部审批");
-                                                     this.reset();
                                                     _this.$store.dispatch(
                                                         "tagsView/delView",
                                                         _this.$route
                                                     );
                                                     _this.$router.go(-1);
+                                                     _this.reset();
                                                 } else { //无核心开立内部审批
                                                     //关闭当前页面
-                                                     this.reset();
                                                     _this.$store.dispatch(
                                                         "tagsView/delView",
                                                         _this.$route
@@ -927,6 +936,7 @@ export default {
                                                     _this.$router.push({
                                                         path: "/credit/creditSeal/" + zfiId + "/"
                                                     });
+                                                      _this.reset();
                                                 }
                                             });
 
@@ -954,6 +964,8 @@ export default {
                             this.form.ticketList = this.ticketList;
                             //可用额度
                             this.form.availableAmt = this.moneyDelete(this.availableAmt);
+                            //最短账期
+                            this.form.zfpShortestPeriod = this.zfpShortestPeriod;
                             //最小融资金额
                             this.form.zfpMinimumAmount = this.zfpMinimumAmount;
                             addCredit(this.form).then((response) => {
@@ -1023,6 +1035,8 @@ export default {
                         this.form.ticketList = this.ticketList;
                         //可用额度
                         this.form.availableAmt = this.moneyDelete(this.availableAmt);
+                        //最短账期
+                        this.form.zfpShortestPeriod = this.zfpShortestPeriod;
                         //最小融资金额
                         this.form.zfpMinimumAmount = this.zfpMinimumAmount;
                         addCredit(this.form).then((response) => {

+ 3 - 3
front-vue/src/views/service/credit/confirmationAudit.vue

@@ -309,11 +309,11 @@
           </span>
         </el-dialog>
         <!--预览-->
-        <el-dialog :visible.sync="openFile" width="1000px" :append-to-body ="true">
+        <el-dialog :visible.sync="openFile" width="1000px" append-to-body>
           <img :src="wordUrl" v-if="show" width="950px" height="500px" />
           <iframe :src="wordUrl" width="800px" height="600px" frameborder="1" v-if="heid" />
         </el-dialog>
-        <el-dialog :visible.sync="pdfShowDialog" width="70%" height="60%" :append-to-body="fasle">
+        <el-dialog :visible.sync="pdfShowDialog" width="70%" height="60%" append-to-body>
           <pdf-show
             :pdfFileList="pdfFileList"
             :zfiId="this.form.zfiId"
@@ -325,7 +325,7 @@
           :visible.sync="pdfShowDialogs"
           width="70%"
           height="60%"
-          :append-to-body="true"
+          append-to-body
           :show-close="false"
         >
           <pdf-shows :pdfFileLists="pdfFileLists" :zfiId="this.form.zfiId" :parents="parents"></pdf-shows>

+ 4 - 9
front-vue/src/views/service/credit/credit.vue

@@ -276,9 +276,9 @@
         <el-col>
             <div class="zap-credit__content">
                 <div class="zap-credit__buttons">
-                    <el-button class="zap-button-success" type="success" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['credit:credit:add']">开立融信</el-button>
-                    <el-button type="success" icon="el-icon-plus" @click="finanOpening" v-hasPermi="['finanOpening:finanOpening:add']">融资开立</el-button>
-                    <el-button type="primary" icon="el-icon-tickets" @click="apply" v-hasPermi="['finanOpening:finanOpening:apply']">融申请</el-button>
+                    <el-button class="zap-button-success" type="success" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['credit:credit:add']">融信开立</el-button>
+                    <el-button type="success" icon="el-icon-plus" @click="finanOpening" v-hasPermi="['finanOpening:finanOpening:add']">融证申请</el-button>
+                    <el-button type="primary" icon="el-icon-tickets" @click="apply" v-hasPermi="['finanOpening:finanOpening:apply']">融申请</el-button>
                 </div>
                 <el-tabs v-model="activeIndex">
                     <!-- 全部-->
@@ -1330,7 +1330,6 @@ export default {
                 }
             })
             listStatisticalAmount(this.queryParams).then(response => {
-                debugger
                 this.allAmount = response.data.allAmount;
                 this.klzAllAmount = response.data.klzAmount;
                 this.ysxAllAmount = response.data.ysxAmount;
@@ -1479,7 +1478,6 @@ export default {
                 }
             })
             listStatisticalAmount(this.queryParams).then(response => {
-                debugger
                 this.allAmount = response.data.allAmount;
                 this.klzAllAmount = response.data.klzAmount;
                 this.ysxAllAmount = response.data.ysxAmount;
@@ -1600,7 +1598,6 @@ export default {
     methods: {
         listStatisticalAmount(queryParamsMoney) {
             // listStatisticalAmount(queryParamsMoney).then(response => {
-            //   debugger
             //   this.allAmount = response.data.allAmount;
             //   this.klzAmount = response.data.klzAmount;
             //   this.ysxAmount = response.data.ysxAmount;
@@ -1614,7 +1611,6 @@ export default {
         //获取操作员Id
         getUser() {
             getUser().then(response => {
-                debugger
                 this.companyId = response.data;
             })
         },
@@ -1622,7 +1618,6 @@ export default {
         getList() {
             this.loading = true;
             return listCredit(this.queryParams).then(response => {
-                debugger
                 this.infList = response.data.records;
                 if (this.infList) {
                     if (this.infList.length > 0) {
@@ -1633,7 +1628,6 @@ export default {
                 this.total = response.data.total;
                 this.loading = false;
                 listStatisticalAmount(this.queryParams).then(response => {
-                    debugger
                     this.allAmount = response.data.allAmount;
                     this.klzAllAmount = response.data.klzAmount;
                     this.ysxAllAmount = response.data.ysxAmount;
@@ -1656,6 +1650,7 @@ export default {
             this.loading = true;
             return listCredit(this.queryParamsSign).then(response => {
                 this.infSignList = response.data.records;
+                console.log(infSignList)
                 this.totalSign = response.data.total;
                 this.loading = false;
                 listStatisticalAmount(this.queryParams).then(response => {

+ 1 - 1
front-vue/src/views/service/credit/creditSeal.vue

@@ -194,7 +194,7 @@
         <!-- pdf -->
         <el-dialog
             :visible.sync="pdfShowDialog"
-            width="70%" height = "60%" :append-to-body ="true"  >
+            width="70%" height = "60%" append-to-body  >
             <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent" @PDFData="PDFData">
             </pdf-show>
         </el-dialog>

+ 25 - 6
front-vue/src/views/service/credit/financeOpen.vue

@@ -393,6 +393,8 @@ export default {
       zfpcrLoanType: "",
       //额度id
       zfsqId: "",
+      zfpShortestPeriod:"",
+      zfpPlatform:"",
       //产品编号
       zfpId: "",
       //利率
@@ -428,6 +430,7 @@ export default {
     }),
       //获取授信额度
       listSupplierCreditLine(this.creditParams).then(response => {
+        console.log(response,"response")
         this.creditLineList = response.data.map(item => {
           return {
             value: item.zfsqId,
@@ -438,6 +441,8 @@ export default {
             zfpcrLoanType: item.zfpcrLoanType,
             zfpSplit: item.zfpSplit,
             zfpId: item.zfpId,
+            zfpShortestPeriod: item.zfpShortestPeriod,
+            zfpPlatform: item.zfpPlatform,
             zfpcrRate: item.zfpcrRate,
             remaining: item.remaining,
             zfpMinimumAmount: item.zfpMinimumAmount
@@ -466,6 +471,8 @@ export default {
             zfpcrLoanType: item.zfpcrLoanType,
             zfpSplit: item.zfpSplit,
             zfpId: item.zfpId,
+            zfpShortestPeriod: item.zfpShortestPeriod,
+            zfpPlatform: item.zfpPlatform,
             zfpcrRate: item.zfpcrRate,
             remaining: item.remaining,
             zfpMinimumAmount: item.zfpMinimumAmount
@@ -741,6 +748,10 @@ export default {
         this.zfpcrDateType = "";
         //最小融资金额
         this.zfpMinimumAmount = "";
+        //最短账期
+        this.zfpShortestPeriod = "";
+        //是否平台审核
+        this.zfpPlatform ="";
         return;
       }
       let obj = {};
@@ -759,6 +770,10 @@ export default {
       this.zfpcrRate = obj.zfpcrRate;
       //最小融资金额
       this.zfpMinimumAmount = obj.zfpMinimumAmount;
+       //最短账期
+      this.zfpShortestPeriod = obj.zfpShortestPeriod;
+      //是否平台审核
+      this.zfpPlatform = obj.zfpPlatform;
       //长期
       if ("0" == this.zfpcrDateType) {
         this.validityDate = "长期";
@@ -767,10 +782,8 @@ export default {
       }
       var lineQueryParam = {};
       lineQueryParam.zfsqId = val;
-      console.log(val,'val');
       //额度id
       this.zfsqId =val;
-      console.log(this.zfsqId,'this.zfsqId');
       //获取可用额度
       getSupplierAvailableBalance(lineQueryParam).then(response => {
         this.availableAmt = response.data.remaining;
@@ -972,6 +985,8 @@ export default {
                 _this.form.zfpId = _this.zfpId;
                 //可用额度
                 _this.form.availableAmt = _this.availableAmt;
+                  //最短账期
+                _this.form.zfpShortestPeriod = _this.zfpShortestPeriod;
                 //最小融资金额
                 _this.form.zfpMinimumAmount = _this.zfpMinimumAmount;
                 //合计金额
@@ -1023,7 +1038,8 @@ export default {
                             //查询有无平台审批
                             var platParam = {};
                             platParam.menuId = "1000000004";
-                            var zfpPlatform = _this.creditLineList.zfpPlatform;
+                            debugger
+                            var zfpPlatform = _this.zfpPlatform;
                             console.log(zfpPlatform, "zfpPlatform");
                             isOpenApproval(platParam).then(response => {
                               var platResult = response.data.isOpen;
@@ -1035,12 +1051,12 @@ export default {
                                 );
                                  console.log(_this,"this====>");
                                 console.log(_this.$store,"this====>")
-                                _this.reset();
                                 _this.$store.dispatch(
                                   "tagsView/delView",
                                   _this.$route
                                 );
                                 _this.$router.push("/Bill/credit")
+                                 _this.reset();
                               } else {
                                 //未开启平台审批
                                 //关闭当前页面
@@ -1088,6 +1104,8 @@ export default {
             this.form.zfpId = this.zfpId;
             //可用额度
             this.form.availableAmt = this.availableAmt;
+            //最短账期
+            this.form.zfpShortestPeriod = this.zfpShortestPeriod;
             //最小融资金额
             this.form.zfpMinimumAmount = this.zfpMinimumAmount;
             //合计金额
@@ -1127,7 +1145,8 @@ export default {
                         //查询有无平台审批
                         var platParam = {};
                         platParam.menuId = "1000000004";
-                        var zfpPlatform = self.creditLineList.zfpPlatform;
+                        debugger
+                        var zfpPlatform = this.zfpPlatform;
                         console.log(zfpPlatform, "zfpPlatform");
                         isOpenApproval(platParam).then(response => {
                           var platResult = response.data.isOpen;
@@ -1137,12 +1156,12 @@ export default {
                             this.msgSuccess(
                               "融信资料已提交平台审核,平台审核时间为工作日:9:00—18:00;当日16:00之前提交资料,预计2小时内完成,请留意站内信息"
                             );
-                              this.reset();
                             this.$store.dispatch(
                               "tagsView/delView",
                               this.$route
                             );
                             this.$router.go(-1);
+                             this.reset();
                           
                           } else {
                             //未开启平台审批

+ 176 - 16
front-vue/src/views/service/creditLine/creditLine.vue

@@ -1,6 +1,7 @@
 <template>
 <div class="app-container zap-main">
     <search-bar
+     v-if="activeName === 'first'"
         :checkList="checkList"
         :tableList="tableList"
         :selfDom="selfDom"
@@ -57,6 +58,64 @@
             </el-row>
         </el-form>
     </search-bar>
+       <search-bar
+       v-if="activeName === 'second'" 
+        :checkList="checkListOne"
+        :tableList="tableListOne"
+        :selfDom="selfDom"
+        :companyType="companyType"
+        :tableId="tableIdOne"
+        @query="handleQuery"
+        @reset="resetQuery">
+        <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="80px">
+            <el-row type="flex" style="flex-wrap:wrap;">
+                <el-form-item class="zap-flex-1 mr24" label="授信类型" prop="zfpType" v-if="companyType != '02'" size="medium">
+                    <el-select class="zap-form-input--small" v-model="queryParams.zfpType" placeholder="请选择类型" clearable>
+                        <el-option v-for="dict in queryTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="zap-flex-1" label="类型" prop="zfpcrQuery" size="medium">
+                    <el-select class="zap-form-input--medium" v-model="queryParams.zfpcrQuery" clearable>
+                        <el-option v-for="dict in queryTypesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" v-if="dict.dictValue == '02' && companyType  == '00'" />
+                        <el-option v-for="dict in queryTypesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" v-if="dict.dictValue != '02'" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="zap-flex-1 ml24" prop="zfpcrValue" v-if="this.queryParams.zfpcrQuery" size="medium" label-width="0">
+                    <el-input class="zap-form-input--default" v-model="queryParams.zfpcrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
+                </el-form-item>
+            </el-row>
+            <el-row type="flex" style="flex-wrap:wrap;">
+                <el-form-item class="zap-flex-1 mr24" label="授信状态" prop="zfpcrStatus" size="medium">
+                    <el-select class="zap-form-input--small" v-model="queryParams.zfpcrStatus" placeholder="请选择状态" clearable>
+                        <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+                    </el-select>
+                </el-form-item>
+                <!-- <el-form-item class="zap-flex-1" label="生效日期" prop="startTime" size="medium">
+                    <el-date-picker
+                        v-model="queryParams.startTime"
+                        unlink-panels
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                    </el-date-picker>
+                </el-form-item> -->
+                <el-form-item class="zap-flex-1" label="到期日期" prop="endTime" size="medium">
+                    <el-date-picker
+                        class="zap-form-input--medium"
+                        v-model="queryParams.endTime"
+                        unlink-panels
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-row>
+        </el-form>
+    </search-bar>
     <div class="zap-content zap-margin-top">
         <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['credit:line:add']">新增</el-button>
     </div>
@@ -68,22 +127,23 @@
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="核心企业" align="center" prop="scyName" show-overflow-tooltip />
-        <el-table-column label="融资产品" align="center" prop="zfpName" show-overflow-tooltip />
+        <el-table-column label="核心企业" align="center" v-if="uncheckListOne.scyName" prop="scyName" show-overflow-tooltip />
+        <el-table-column label="融资产品" align="center" v-if="uncheckListOne.zfpName" prop="zfpName" show-overflow-tooltip />
         <el-table-column
             label="授信额度"
             :formatter="moneyFormat"
             align="center"
+            v-if="uncheckListOne.zfsqAmount"
             prop="zfsqAmount"
             show-overflow-tooltip
             />
-        <el-table-column label="利率(%)" align="center" prop="zfpcrRate" width="120" />
-        <el-table-column label="已使用额度" :formatter="moneyFormat" align="center" prop="zfiAmount" width="120" />
-        <el-table-column label="可用额度" :formatter="moneyFormat" align="center" prop="usableAmount" width="120" />
-        <el-table-column label="生效日期" align="center" prop="zfpcrStartDate" show-overflow-tooltip />
-        <el-table-column label="到期日期" align="center" prop="zfpcrEndDate" show-overflow-tooltip />
-        <el-table-column label="授信状态" :formatter="statuFormat" align="center" prop="zfsqStatus" show-overflow-tooltip />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250" fixed="right">
+        <el-table-column label="利率(%)" align="center"  v-if="uncheckListOne.zfpcrRate" prop="zfpcrRate" width="120" />
+        <el-table-column label="已使用额度" :formatter="moneyFormat" align="center" v-if="uncheckListOne.zfiAmount" prop="zfiAmount" width="120" />
+        <el-table-column label="可用额度" :formatter="moneyFormat" align="center" v-if="uncheckListOne.usableAmount" prop="usableAmount" width="120" />
+        <el-table-column label="生效日期" align="center" prop="zfpcrStartDate" v-if="uncheckListOne.zfpcrStartDate" show-overflow-tooltip />
+        <el-table-column label="到期日期" align="center" prop="zfpcrEndDate" v-if="uncheckListOne.zfpcrEndDate" show-overflow-tooltip />
+        <el-table-column label="授信状态" :formatter="statuFormat" align="center"  v-if="uncheckListOne.zfsqStatus" prop="zfsqStatus" show-overflow-tooltip />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  width="250" fixed="right">
             <template slot-scope="scope">
                 <plain-button size="mini" type="text" @click="handleRows(scope.row)" v-hasPermi="['credit:line:query']">详情</plain-button>
             </template>
@@ -297,6 +357,7 @@ export default {
                 zfpcrValue: null,
             },
             options: [],
+            activeName: "first",
             // 表单参数
             form: {},
             //筛选按钮的数据列表,与table表头的数据一致 --显示隐藏列用
@@ -361,6 +422,48 @@ export default {
             uncheckList: {}, //控制筛选列显示隐藏--显示隐藏列用
             selfDom: this,
             tableId: "/sc-service/creditLine/list",
+            tableListOne: [
+                {
+                    label: 'scyName',
+                    value: '核心企业'
+                },
+                {
+                    label: "zfpName",
+                    value: "融资产品"
+                },
+                {
+                    label: "zfsqAmount",
+                    value: "授信额度"
+                },
+                {
+                    label: "zfpcrRate",
+                    value: "利率"
+                },
+                {
+                    label: "zfiAmount",
+                    value: "已使用额度"
+                },
+                {
+                    label: "usableAmount",
+                    value: "可用额度"
+                },
+                {
+                    label: "zfpcrStartDate",
+                    value: "生效日期"
+                },
+                {
+                    label: "zfpcrEndDate",
+                    value: "到期日期"
+                },
+                {
+                    label: "zfsqStatus",
+                    value: "授信状态"
+                }
+            ],
+            checkListOne: [], //筛选列选中的数据列表--显示隐藏列用
+            uncheckListOne: {}, //控制筛选列显示隐藏--显示隐藏列用
+            selfDom: this,
+            tableIdOne: "/sc-service/creditLine/list/one",
             // 表单校验
             rules: {
                 zfpcrProductId: [{
@@ -426,6 +529,7 @@ export default {
         this.getList().then(() => {
             this.queryParams.zfpcrQuery = "00";
         });
+
     },
     activated() {
         // this.getContractList();
@@ -452,18 +556,22 @@ export default {
         });
     },
     mounted() {
-        this.columnQuery();
+        this.getList();
+        
     },
     methods: {
         /** 查询授信信息列表 */
         getList() {
             this.loading = true;
             return listCreditLine(this.queryParams).then(response => {
-                debugger
                 this.creditLineList = response.data.records;
                 if (response.data.records[0]) {
                     this.companyType = response.data.records[0].companyType
                     console.log(this.companyType, "企业类型")
+                    if(this.companyType == '02'){
+                        this.activeName='second';
+                    }
+                    this.columnQuery();
                 }
                 this.total = response.data.total;
                 this.loading = false;
@@ -482,7 +590,11 @@ export default {
             //获取页面路径
             var psfPagePath = window.location.pathname;
             //用请求后台的url作为唯一标识
-            var psfTableName = this.tableId;
+             if (this.activeName == "first") {
+                var psfTableName = this.tableId;
+             }else{
+                var psfTableName = this.tableIdOne;     
+             }
             var columnForm = {};
             columnForm.psfPagePath = psfPagePath;
             columnForm.psfTableName = psfTableName;
@@ -490,15 +602,63 @@ export default {
                 if (response.data && response.data.psfShowData) {
                     this.checkList = response.data.psfShowData;
                 }
-                this.filter();
+                this.filter(this.checkList);
             });
         },
         //控制隐藏显示的函数
         filter(checkList) {
-            if (!!checkList) {
-                this.checkList = checkList;
+            // if(this.companyType == '02'){
+                
+            // }else{
+               
+            // }
+            debugger
+         if (this.activeName == "first") {
+             if (!!checkList) {
+                    this.checkList = checkList;
+                }
+               this.columnfilter( 
+                    this.checkList,
+                    this.tableList,
+                    this.uncheckList
+                );
+                
+            } else if (this.activeName == "second") {
+                if (!!checkList) {
+                    this.checkListOne = checkList;
+                }
+              this.columnfilter( 
+                    this.checkListOne,
+                    this.tableListOne,
+                    this.uncheckListOne
+                    );
+            }
+        },
+         columnfilter( checkList, tableList, uncheckList) {
+            //初始化数据
+            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;
+                }
             }
-            columnfilter(this.selfDom);
+            this.$forceUpdate();
         },
         // 取消按钮
         cancel() {

+ 1 - 0
front-vue/src/views/service/financeRecord/addFinanceRecord.vue

@@ -971,6 +971,7 @@ export default {
                                                                     recvAccNm: "",
                                                                     tranAmt: self.needPay,
                                                                     businessId: self.zciId,
+                                                                    type: "00"
                                                                 };
                                                                 transfer(map)
                                                                     .then((response) => {

+ 2 - 2
front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -917,7 +917,7 @@ export default {
             return listRecord(this.queryParamsEnd)
                 .then(response => {
                     this.recordEndList = response.data.records;
-                    this.totalIng = response.data.total;
+                    this.totalEnd = response.data.total;
                     this.loadingEnd = false;
                     return Promise.resolve(response);
                 })
@@ -933,7 +933,7 @@ export default {
             return listRecord(this.queryParamsLose)
                 .then(response => {
                     this.recordLoseList = response.data.records;
-                    this.totalEnd = response.data.total;
+                    this.totalLose = response.data.total;
                     this.loadingLose = false;
                     return Promise.resolve(response);
                 })

+ 5 - 3
front-vue/src/views/service/rel/companyRelManage.vue

@@ -131,15 +131,15 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="发起方" align="center" prop="scyName" show-overflow-tooltip />
-                    <el-table-column label="链属关系(发起方)" align="center" width="113px" prop="lanchScpType">
+                    <el-table-column label="链属关系(发起方)" align="center"  prop="lanchScpType">
                         <template slot-scope="scope">
                             <span v-if="scope.row.scpType == '00'">{{lanchScpTypeFormat("01")}}</span>
                             <span v-if="scope.row.scpType == '01'">{{lanchScpTypeFormat("00")}}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="接收方" align="center" prop="scpName" show-overflow-tooltip />
-                    <el-table-column label="社会统一代码(接收方)" align="center" width="150px" prop="scpSocialCode" show-overflow-tooltip />
-                    <el-table-column label="链属关系(接收方)" align="center" width="113px" prop="scpType" :formatter="scpTypeFormat" />
+                    <el-table-column label="社会统一代码(接收方)" align="center" prop="scpSocialCode" show-overflow-tooltip />
+                    <el-table-column label="链属关系(接收方)" align="center" prop="scpType" :formatter="scpTypeFormat" />
                     <!-- <el-table-column
      label="联系人"
      align="center"
@@ -592,6 +592,7 @@ export default {
             this.loading = true;
             getListRel(this.queryParams).then(response => {
                 let list = response.data.records;
+                console.log(list,"list")
                 for (let i = 0; i < list.length; i++) {
                     if (list[i].scpRelId != "" && list[i].scpRelId != null) {
                         list[i].rel = true;
@@ -602,6 +603,7 @@ export default {
                     }
                 }
                 this.companyRelList = list;
+                console.log(this.companyRelList,"companyRelList")
                 this.total = response.data.total;
                 this.loading = false;
             });

+ 1 - 4
front-vue/src/views/service/repayment/repayment.vue

@@ -1061,7 +1061,6 @@ export default {
     getList() {
       this.loading = true;
       listAmount().then(response => {
-        debugger;
         this.allAmount = response.data.allAmount;
         this.dhkAmount = response.data.dhkAmount;
         this.yhkAmount = response.data.yhkAmount;
@@ -1087,7 +1086,6 @@ export default {
       this.loading = true;
       this.unRepayment.status = "00";
       listAmount().then(response => {
-        debugger;
         this.allAmount = response.data.allAmount;
         this.dhkAmount = response.data.dhkAmount;
         this.yhkAmount = response.data.yhkAmount;
@@ -1113,7 +1111,6 @@ export default {
       this.loading = true;
       this.repayment.status = "01";
       listAmount().then(response => {
-        debugger;
         this.allAmount = response.data.allAmount;
         this.dhkAmount = response.data.dhkAmount;
         this.yhkAmount = response.data.yhkAmount;
@@ -1123,6 +1120,7 @@ export default {
         this.company = response.data;
         return listRepayment(this.repayment)
           .then(response => {
+            console.log(response,"response")
             this.repaymentList = response.data.records;
             this.total2 = response.data.total;
             this.loading = false;
@@ -1139,7 +1137,6 @@ export default {
       this.loading = true;
       this.overdue.status = "02";
       listAmount().then(response => {
-        debugger;
         this.allAmount = response.data.allAmount;
         this.dhkAmount = response.data.dhkAmount;
         this.yhkAmount = response.data.yhkAmount;