Merge branch 'master' of http://git.minpay.cc/SupplyChain/front

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

@@ -317,7 +317,6 @@ import {listCreditLine,getCreditDetail,getAccountsCollection,getAvailableBalance
 import {approveCredit,getCreditSealFile,getContractFile} from "@/api/service/credit/creditHandle";
 import {accAdd} from "@/utils/calculation";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
-import {listCompanyHandler} from "@/api/common/companyHandler";
 import {getToken} from "@/utils/auth";
 import pdfShow from "./pdfShow";
 export default {
@@ -1015,75 +1014,82 @@ export default {
     },
     //确权
     confirmApproval(){
+        //核心确权通过,直接盖章
+        if(this.form.zfiCoreStatus == '01'){
+            //预览文件
+            this.getContractFile();
+        }else{
+                this.$refs["form"].validate(valid => {
+                
+                if(!this.form.zfiCoreQuotaId){
+                        this.$message({
+                            message: '请选择授信额度',
+                            type: 'warning'
+                        });
+                        return;
+                }
 
-         this.$refs["form"].validate(valid => {
-              
-            if(!this.form.zfiCoreQuotaId){
-                    this.$message({
-                        message: '请选择授信额度',
-                        type: 'warning'
-                    });
-                    return;
-            }
-
-            if(!this.form.zfiEffectiveDate){
-                    this.$message({
-                        message: '请选择签发有效期',
-                        type: 'warning'
-                    });
-                    return;
-            }
-
-            if(!this.form.zfiExpireDate){
-                    this.$message({
-                        message: '请选择承诺还款日',
-                        type: 'warning'
-                    });
-                    return;
-            }
+                if(!this.form.zfiEffectiveDate){
+                        this.$message({
+                            message: '请选择签发有效期',
+                            type: 'warning'
+                        });
+                        return;
+                }
 
-            //融信申请
-            if(this.zfiCreateType == '0'){
-                    if(parseFloat(this.form.zfiAmount) < parseFloat(this.zfpMinimumAmount)){
+                if(!this.form.zfiExpireDate){
                         this.$message({
-                                message: '签发金额不可小于产品的最小融资金额',
-                                type: 'warning'
-                            });
-                            return;
-                    }
-                if(parseFloat(this.form.zfiAmount) > parseFloat(this.availableAmt)){
+                            message: '请选择承诺还款日',
+                            type: 'warning'
+                        });
+                        return;
+                }
+
+                //融信申请
+                if(this.zfiCreateType == '0'){
+                        if(parseFloat(this.form.zfiAmount) < parseFloat(this.zfpMinimumAmount)){
                             this.$message({
-                                    message: '签发金额不可大于可用金额',
+                                    message: '签发金额不可小于产品的最小融资金额',
                                     type: 'warning'
                                 });
                                 return;
-                        }   
-            }
-                   
-            if (valid) {
-               const loading = this.$loading({
-                        lock: true,
-                        text: 'Loading',
-                        background: 'rgba(0, 0, 0,0)'
-                    });
-                    this.form.flag = '00';
-                    //产品
-                    this.form.zfpId = this.zfpId;
-                    //利率
-                    this.form.zfiRate = this.zfpcrRate;
-                    //最小融资金额
-                    this.form.zfpMinimumAmount = this.zfpMinimumAmount;
-                    //可用金额
-                    this.form.availableAmt = this.availableAmt;
-                    approveCredit(this.form).then(response => {
-                        loading.close();
-                        //预览文件
-                        this.getContractFile();
-                    }).catch((response)=>{
-                        loading.close();
-                    });
-            }
-        });
+                        }
+                    if(parseFloat(this.form.zfiAmount) > parseFloat(this.availableAmt)){
+                                this.$message({
+                                        message: '签发金额不可大于可用金额',
+                                        type: 'warning'
+                                    });
+                                    return;
+                            }   
+                }
+                    
+                if (valid) {
+                const loading = this.$loading({
+                            lock: true,
+                            text: 'Loading',
+                            background: 'rgba(0, 0, 0,0)'
+                        });
+                        this.form.flag = '00';
+                        //产品
+                        this.form.zfpId = this.zfpId;
+                        //利率
+                        this.form.zfiRate = this.zfpcrRate;
+                        //最小融资金额
+                        this.form.zfpMinimumAmount = this.zfpMinimumAmount;
+                        //可用金额
+                        this.form.availableAmt = this.availableAmt;
+                        approveCredit(this.form).then(response => {
+                            loading.close();
+                            //预览文件
+                            this.getContractFile();
+                        }).catch((response)=>{
+                            loading.close();
+                        });
+                }
+            });
+        }
+
+         
     },
     //获取合同文件
     getContractFile(){

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

@@ -521,6 +521,8 @@ export default {
                     //关闭人脸二维码
                     this.faceIsShow = false;
                 }
+                //关闭文件弹框
+                this.closePdfShow();
                 //确权：状态为待确权
                 if(this.zfiStatus == '00'){
                      this.msgSuccess("确权成功，融信已提交,"+this.receiveName+"签收");
@@ -611,6 +613,11 @@ export default {
     },
     //去融资
     goFinance(){
+        //关闭当前页
+         this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+            );
         //关闭弹框
         this.goShow = false;
         Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)

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

@@ -1096,6 +1096,11 @@ export default {
     },
      //去融资
     goFinance(){
+        //关闭当前页
+         this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+        );
         //关闭弹框
         this.goShow = false;
         Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)