修改融资开立等bug

front-vue/src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '管理系统',
+  title: '招采云链',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

front-vue/src/views/home.vue

@@ -1442,12 +1442,12 @@ export default {
             myChart.setOption(option)
         },
         iniEchartBarCore(series, dateList) {
-            if (this.financeDateType === '00') {
-                dateList = dateList.map(item => {
-                    let arr = item.split('-').slice(1)
-                    return arr.join('.')
-                })
-            }
+            // if (this.financeDateType === '00') {
+            //     dateList = dateList.map(item => {
+            //         let arr = item.split('-').slice(1)
+            //         return arr.join('.')
+            //     })
+            // }
             var barCore = document.getElementById('echarBarCore');
             var myChart = echarts.init(barCore);
             let _series = series.map(item => {

front-vue/src/views/service/cost/userCostManage.vue

@@ -785,7 +785,8 @@ export default {
         this.accNo = row.accNo;
         balance(row.accNo)
           .then(response => {
-            this.KYAMT = response.data.list.row.KYAMT;
+            console.log(response,"KYAMT")
+            this.KYAMT = response.data.kyAmt;
             loading.close();
           })
           .catch(() => {

front-vue/src/views/service/credit/financeOpen.vue

@@ -391,6 +391,8 @@ export default {
       zfpSplit: "",
       //融资放款方式
       zfpcrLoanType: "",
+      //额度id
+      zfsqId: "",
       //产品编号
       zfpId: "",
       //利率
@@ -417,6 +419,7 @@ export default {
     };
   },
   created() {
+
     //获取当前公司
     getRandom().then(response => {
       if (response.data) {
@@ -428,6 +431,35 @@ export default {
         this.creditLineList = response.data.map(item => {
           return {
             value: item.zfsqId,
+            zfsqId: item.zfsqId,
+            label: item.zfpName,
+            zfpcrDateType: item.zfpcrDateType,
+            zfpcrEndDate: item.zfpcrEndDate,
+            zfpcrLoanType: item.zfpcrLoanType,
+            zfpSplit: item.zfpSplit,
+            zfpId: item.zfpId,
+            zfpcrRate: item.zfpcrRate,
+            remaining: item.remaining,
+            zfpMinimumAmount: item.zfpMinimumAmount
+          };
+        });
+      });
+    //签发金额
+    this.$set(this.form, "zfiAmount", "0.00");
+  },
+    activated() {
+       //获取当前公司
+    getRandom().then(response => {
+      if (response.data) {
+        this.$set(this.form, "receiveName", response.data.companyName);
+      }
+    }),
+      //获取授信额度
+      listSupplierCreditLine(this.creditParams).then(response => {
+        this.creditLineList = response.data.map(item => {
+          return {
+            value: item.zfsqId,
+            zfsqId: item.zfsqId,
             label: item.zfpName,
             zfpcrDateType: item.zfpcrDateType,
             zfpcrEndDate: item.zfpcrEndDate,
@@ -720,6 +752,10 @@ 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;
@@ -907,6 +943,8 @@ export default {
               .then(function() {
                 //应收账款
                 _this.form.ticketList = _this.ticketList;
+                   //额度id
+                _this.form.zfsqId = _this.zfsqId;
                 //产品是否可拆分
                 _this.form.zfpSplit = _this.zfpSplit;
                 //放款方式
@@ -925,6 +963,7 @@ export default {
                 _this.form.checkTotalAmt = _this.moneyDelete(
                   _this.checkTotalAmt
                 );
+                console.log(_this.form,"this.form2");
                 addCredit(_this.form)
                   .then(response => {
                     //获取融信编号
@@ -934,9 +973,16 @@ export default {
                     listCompanyHandler().then(response => {
                       if (false == response.data) {
                         //当前用户不是经办人，返回到列表页
+                        console.log(_this,"this====>");
+                        console.log(_this.$store,"this====>")
                         _this.msgSuccess("融信资料已提交企业内部审批");
-                        _this.$store.dispatch("tagsView/delView", _this.$route);
-                        _this.$router.go(-1);
+                          _this.$store.dispatch(
+                              "tagsView/delView",
+                              _this.$route
+                              );
+                          _this.$router.push("/Bill/credit")
+                        // _this.$store.dispatch("tagsView/delView", _this.$route);
+                        // _this.$router.go(-1);
                       } else {
                         //当前用户是经办人，判断有无融信开立融信的内部审批
                         //查询有无融信开立内部审批
@@ -946,12 +992,15 @@ export default {
                           var result = response.data.isOpen;
                           //有融信开立内部审批
                           if (true == result) {
+                             debugger;
+                              console.log(_this,"this====>");
+                              console.log(_this.$store,"this====>")
                             _this.msgSuccess("融信资料已提交企业内部审批");
-                            _this.$store.dispatch(
+                             _this.$store.dispatch(
                               "tagsView/delView",
                               _this.$route
-                            );
-                            _this.$router.go(-1);
+                              );
+                          _this.$router.push("/Bill/credit")
                           } else {
                             //无融信开立内部审批
                             //查询有无平台审批
@@ -967,11 +1016,13 @@ export default {
                                 _this.msgSuccess(
                                   "融信资料已提交平台审核，平台审核时间为工作日：9：00—18：00；当日16：00之前提交资料，预计2小时内完成，请留意站内信息"
                                 );
+                                 console.log(_this,"this====>");
+                                console.log(_this.$store,"this====>")
                                 _this.$store.dispatch(
                                   "tagsView/delView",
                                   _this.$route
                                 );
-                                _this.$router.go(-1);
+                                _this.$router.push("/Bill/credit")
                               } else {
                                 //未开启平台审批
                                 //关闭当前页面
@@ -1004,6 +1055,8 @@ export default {
           } else {
             //应收账款
             this.form.ticketList = this.ticketList;
+               //额度id
+            this.form.zfsqId = this.zfsqId;
             //产品是否可拆分
             this.form.zfpSplit = this.zfpSplit;
             //放款方式
@@ -1020,6 +1073,7 @@ export default {
             this.form.zfpMinimumAmount = this.zfpMinimumAmount;
             //合计金额
             this.form.checkTotalAmt = this.moneyDelete(this.checkTotalAmt);
+            console.log(this.form,"this.form2")
             addCredit(this.form)
               .then(response => {
                 loading.close();
@@ -1028,6 +1082,7 @@ export default {
                 //查询当前用户是否为经办人
                 listCompanyHandler().then(response => {
                   if (false == response.data) {
+                    debugger;
                     //当前用户不是经办人，返回到列表页
                     this.msgSuccess("融信资料已提交企业内部审批");
                     this.$store.dispatch("tagsView/delView", this.$route);
@@ -1041,6 +1096,7 @@ export default {
                       var result = response.data.isOpen;
                       //有融信开立内部审批
                       if (true == result) {
+                         debugger;
                         this.msgSuccess("融信资料已提交企业内部审批");
                         this.$store.dispatch("tagsView/delView", this.$route);
                         this.$router.go(-1);

front-vue/src/views/service/credit/showStampedPdf.vue

@@ -56,7 +56,7 @@
     <span slot="footer" class="dialog-footer" style="float: right;">
       <!-- <el-button type="primary" @click="selectType" size="mini">签署</el-button> -->
       <!-- <el-button @click="closePdfShow" size="mini">取 消</el-button> -->
-      <el-button @click="submit" size="mini">确 定</el-button>
+      <el-button type="primary" @click="submit" size="mini">确 定</el-button>
     </span>
 
     <!-- <span slot="footer" class="dialog-footer">

front-vue/src/views/service/financeRecord/addFinanceRecord.vue

@@ -292,7 +292,7 @@ import {
 import pdfShow from "@/views/service/financeRecord/pdfShow";
 import ZapBill from "@/components/ZapBill/index.vue"
 export default {
-    name: "financeRecord",
+    name: "addFinanceRecord",
     components: {
         DetailBill,
         pdfShow,
@@ -837,8 +837,6 @@ export default {
                 if (true == result) {
                     this.msgSuccess("已提交内部审批，请内部审批通过后签署融资协议");
                     this.cancel();
-                    this.$store.dispatch("tagsView/delView", this.$route);
-                    this.$router.go(-1);
                 } else {
                     //无融资内部审批,显示融资合同预览页面
                     // this.zfrId = '2c83a92dc238468aabd9cd3261748ae0'
@@ -847,6 +845,7 @@ export default {
                         this.needPay = response.data.needPay;
                         //意愿类型
                         this.zfpAuthType = response.data.zfpAuthType;
+                        console.log("跳转无审批")
                         this.selectPayment();
                     });
                 }
@@ -981,6 +980,7 @@ export default {
                                                                             if (response.data.status == "AAAAAAA") {
                                                                                 updateChargeStatus(zfrId).then(
                                                                                     (res) => {
+                                                                                        console.log("缴费成功")
                                                                                         self.getContractFile();
                                                                                     }
                                                                                 );
@@ -1307,9 +1307,9 @@ export default {
                 });
         },
         closePDF() {
-            this.cancel();
             //关闭预览合同
             this.closePdfShow();
+            this.cancel();
         }
     },
 };

front-vue/src/views/service/repayment/repayment.vue

@@ -476,6 +476,7 @@
           <el-table-column
             label="操作"
             align="center"
+             width="200"
             class-name="small-padding fixed-width"
             fixed="right"
           >
@@ -616,6 +617,7 @@
           <el-table-column
             label="操作"
             align="center"
+             width="200"
             class-name="small-padding fixed-width"
             fixed="right"
           >
@@ -747,6 +749,7 @@
           <el-table-column
             label="操作"
             align="center"
+             width="200"
             class-name="small-padding fixed-width"
             fixed="right"
           >