Bladeren bron

Merge branch 'master' of http://git.keao.tech/SupplyChain/front

zhanglb 3 jaren geleden
bovenliggende
commit
56abef7889
28 gewijzigde bestanden met toevoegingen van 859 en 132 verwijderingen
  1. 1 1
      front-vue/.env.development
  2. 3 3
      front-vue/src/views/service/bill/bill.vue
  3. 7 7
      front-vue/src/views/service/bill/billAdd.vue
  4. 7 7
      front-vue/src/views/service/bill/billEdit.vue
  5. 1 1
      front-vue/src/views/service/company/coreCompanyManage.vue
  6. 2 2
      front-vue/src/views/service/company/supCompanyManage.vue
  7. 3 3
      front-vue/src/views/service/contract/contract.vue
  8. 2 2
      front-vue/src/views/service/cost/costManage.vue
  9. 1 1
      front-vue/src/views/service/cost/userCostManage.vue
  10. 2 1
      front-vue/src/views/service/credit/addCredit.vue
  11. 48 9
      front-vue/src/views/service/credit/addInformation.vue
  12. 7 35
      front-vue/src/views/service/credit/confirmationAudit.vue
  13. 62 4
      front-vue/src/views/service/credit/credit.vue
  14. 5 3
      front-vue/src/views/service/credit/creditSeal.vue
  15. 4 2
      front-vue/src/views/service/credit/financeOpen.vue
  16. 16 21
      front-vue/src/views/service/credit/pdfShow.vue
  17. 15 0
      front-vue/src/views/service/credit/signFor.vue
  18. 6 6
      front-vue/src/views/service/creditLine/creditLine.vue
  19. 3 3
      front-vue/src/views/service/financeProduct/financeProduct.vue
  20. 12 3
      front-vue/src/views/service/financeRecord/financeRecord.vue
  21. 628 0
      front-vue/src/views/service/financeRecord/pdfShow.vue
  22. 8 3
      front-vue/src/views/service/financeRecord/recordSeal.vue
  23. 0 1
      front-vue/src/views/service/invoice/invoice.vue
  24. 2 2
      front-vue/src/views/service/rel/companyRel.vue
  25. 2 2
      front-vue/src/views/service/rel/companyRelManage.vue
  26. 5 3
      front-vue/src/views/service/repayment/repayment.vue
  27. 4 4
      front-vue/src/views/system/company/certification.vue
  28. 3 3
      front-vue/src/views/system/user/index.vue

+ 1 - 1
front-vue/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/prod-api'
 
 VUE_APP_FACE_AUTH = '/face'
 

+ 3 - 3
front-vue/src/views/service/bill/bill.vue

@@ -316,7 +316,7 @@ export default {
         },
         /** 新增按钮操作 */
         handleAdd(row) {
-            this.resetQuery();
+            this.resetForm("queryForm");
             Cookies.set("/bill/billAdd", this.$route.fullPath)
             this.$router.push({
                 path: "/bill/billAdd"
@@ -324,7 +324,7 @@ export default {
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
-            this.resetQuery();
+            this.resetForm("queryForm");
             Cookies.set("/bill/billEdit/" + row.zbiId, this.$route.fullPath)
             this.$router.push({
                 path: "/bill/billEdit/" + row.zbiId
@@ -332,7 +332,7 @@ export default {
         },
         /** 详情按钮操作 */
         handleDetail(row) {
-            this.resetQuery();
+            this.resetForm("queryForm");
             Cookies.set("/bill/billDetail/" + row.zbiId, this.$route.fullPath)
             this.$router.push({
                 path: "/bill/billDetail/" + row.zbiId

+ 7 - 7
front-vue/src/views/service/bill/billAdd.vue

@@ -265,8 +265,8 @@
                     <div class="zap-upload__text">上传文件</div>
                 </div>
                 <div slot="tip" class="zap-contract-add__tip">
-                    支持格式:.docx </br>
-                    单个文件不能超过20MB
+                    支持格式:JPG/PNG </br>
+                    单个文件不能超过2MB
                 </div>
                 <!-- 设置缩略图模板 -->
                 <div slot="file" slot-scope="{file}" class="zap-contract-add__thumbnail">
@@ -291,8 +291,8 @@
                     <div class="zap-upload__text">上传文件</div>
                 </div>
                 <div slot="tip" class="zap-contract-add__tip">
-                    支持格式:.docx </br>
-                    单个文件不能超过20MB
+                    支持格式:JPG/PNG </br>
+                    单个文件不能超过2MB
                 </div>
                 <!-- 设置缩略图模板 -->
                 <div slot="file" slot-scope="{file}" class="zap-contract-add__thumbnail">
@@ -317,8 +317,8 @@
                     <div class="zap-upload__text">上传文件</div>
                 </div>
                 <div slot="tip" class="zap-contract-add__tip">
-                    支持格式:.docx </br>
-                    单个文件不能超过20MB
+                    支持格式:JPG/PNG </br>
+                    单个文件不能超过2MB
                 </div>
                 <!-- 设置缩略图模板 -->
                 <div slot="file" slot-scope="{file}" class="zap-contract-add__thumbnail">
@@ -1246,7 +1246,7 @@ export default {
 }
 
 ::v-deep .el-icon-error {
-    font-size: 26px;
+    font-size: 20px;
     color: #f41d27;
 }
 

+ 7 - 7
front-vue/src/views/service/bill/billEdit.vue

@@ -312,8 +312,8 @@
                     <div class="zap-upload__text">上传文件</div>
                 </div>
                 <div slot="tip" class="zap-contract-add__tip">
-                    支持格式:.docx </br>
-                    单个文件不能超过20MB
+                    支持格式:JPG/PNG </br>
+                    单个文件不能超过2MB
                 </div>
             </el-upload>
         </div>
@@ -330,8 +330,8 @@
                     <div class="zap-upload__text">上传文件</div>
                 </div>
                 <div slot="tip" class="zap-contract-add__tip">
-                    支持格式:.docx </br>
-                    单个文件不能超过20MB
+                    支持格式:JPG/PNG </br>
+                    单个文件不能超过2MB
                 </div>
             </el-upload>
         </div>
@@ -348,8 +348,8 @@
                     <div class="zap-upload__text">上传文件</div>
                 </div>
                 <div slot="tip" class="zap-contract-add__tip">
-                    支持格式:.docx </br>
-                    单个文件不能超过20MB
+                    支持格式:JPG/PNG </br>
+                    单个文件不能超过2MB
                 </div>
             </el-upload>
         </div>
@@ -1320,7 +1320,7 @@ export default {
 }
 
 ::v-deep .el-icon-error {
-    font-size: 26px;
+    font-size: 20px;
     color: #f41d27;
 }
 

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

@@ -449,7 +449,7 @@ export default {
     /* 企业详情 */
     handleDetail(row) {
       this.reset();
-      this.resetQuery();
+      this.resetForm("queryForm");
       let scyId = row.scyId || this.ids;
       let scyAuthStatus = row.scyAuthStatus || this.ids;
       let scyStatus = row.scyStatus || this.ids;

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

@@ -412,7 +412,7 @@ export default {
     /* 企业详情 */
     handleDetail(row) {
       this.reset();
-      this.resetQuery();
+      this.resetForm("queryForm");
       let scyId = row.scyId || this.ids;
       let scyAuthStatus = row.scyAuthStatus || this.ids;
       let scyStatus = row.scyStatus || this.ids;
@@ -481,7 +481,7 @@ export default {
     //四要素审核
     handleExamine(row){
       this.reset();
-      this.resetQuery();
+      this.resetForm("queryForm");
       const scyId = row.scyId || this.ids;
       Cookies.set("/company/detailComPanyExam/" + scyId + '/', this.$route.fullPath)
       this.$router.push("/company/detailComPanyExam/" + scyId + '/');

+ 3 - 3
front-vue/src/views/service/contract/contract.vue

@@ -265,21 +265,21 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.resetQuery();
+      ththis.resetForm("queryForm");
       Cookies.set("/contract/addContract/", this.$route.fullPath);
       this.$router.push({path:"/contract/addContract/"});
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       const zfcId = row.zfcId
-      this.resetQuery();
+      this.resetForm("queryForm");
       Cookies.set("/contract/editContract/"+zfcId+"/", this.$route.fullPath);
       this.$router.push({path:"/contract/editContract/"+zfcId+"/"});
     },
     /** 详情按钮操作 */
     handleInfo(row) {
       const zfcId = row.zfcId
-      this.resetQuery();
+      this.resetForm("queryForm");
       Cookies.set("/contract/detailContract/"+zfcId+"/", this.$route.fullPath);
       this.$router.push({path:"/contract/detailContract/"+zfcId+"/"});
     },

+ 2 - 2
front-vue/src/views/service/cost/costManage.vue

@@ -902,7 +902,7 @@ export default {
     
     /** 导出按钮操作 */
     handleExport() {
-      this.getList();
+      // this.getList();
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
@@ -919,7 +919,7 @@ export default {
 
     /** 导出按钮操作 */
     handleExportInvoice() {
-      this.getList();
+      // this.getList();
       const loading = this.$loading({
         lock: true,
         text: 'Loading',

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

@@ -573,7 +573,7 @@ export default {
     
     /** 导出按钮操作 */
     handleExport() {
-      this.getList();
+      // this.getList();
       const loading = this.$loading({
         lock: true,
         text: 'Loading',

+ 2 - 1
front-vue/src/views/service/credit/addCredit.vue

@@ -545,7 +545,8 @@ export default {
                     //更新附件信息
                     this.getFile(this.ticketList);
                     if(new Date(this.ticketList[0].zbiPayDate) >= new Date()){
-                        this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
+                        // this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
+                        this.$set(this.form, "zfiExpireDate", this.ticketList[0].zbiPayDate);
                     }
                     this.open = false;
                 }

+ 48 - 9
front-vue/src/views/service/credit/addInformation.vue

@@ -125,8 +125,9 @@
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.$index, ticketList)"
                             >删除</el-button>
-                            </template>
                             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.$index, ticketList)">修改</el-button>
+                            </template>
+                            
                         </el-table-column>
                     </el-table>
                 </el-form-item>
@@ -295,6 +296,14 @@
                 <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
                 </pdf-show>
             </el-dialog>
+              <!--去融资-->
+            <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
+                    <p>恭喜您成功签收一笔融信</p>
+                    <div slot="footer" class="dialog-footer">
+                        <el-button type="primary" @click="goFinance">去融资</el-button>
+                        <el-button @click="cancelGo">取 消</el-button>
+                    </div>    
+            </el-dialog> 
         </el-tab-pane>
         <el-tab-pane label="签署合同">
             <el-table :data="creditSealList"  style="width: 100%">
@@ -337,6 +346,7 @@ import AddBill from "@/views/service/bill/addBill";
 import EditBill from "@/views/service/bill/editBill";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import pdfShow from "./pdfShow";
+import Cookies from 'js-cookie';
 export default {
     name: "addCredit",
     components: {AddBill,pdfShow,EditBill},
@@ -427,7 +437,9 @@ export default {
           pdfShowDialog : false,
           parent : this,
           //平台审批状态
-          zfiPlatformStatus:""
+          zfiPlatformStatus:"",
+           //显示去融资框
+          goShow:false
         };
     },
     /* watch:{
@@ -512,6 +524,15 @@ export default {
             this.resetForm("formQuery");
             this.handleQuerys();
         },
+        //回到父页
+        cancelGo(){
+            this.goShow = false;
+            this.$store.dispatch(
+                "tagsView/delView",
+                this.$route
+            );
+            this.$router.go(-1);
+        },
         handleQuerys() {
             this.queryParamsPay.pageNum = 1;
             this.getAccountsCollection();
@@ -996,7 +1017,7 @@ export default {
         },
     //判断有无补充资料内部审批
     isOpenApproval(){
-        debugger
+        console.log("1111");
         // 平台审批通过
         if (this.form.zfiPlatformStatus == '01') {
             this.signButton = true;
@@ -1204,16 +1225,34 @@ export default {
                     });
             contractSigning(this.form).then((response) => {
                 loading.close();
-                this.msgSuccess("确权成功,融信已提交"+this.form.receiveName+"签收");
-                this.$store.dispatch(
-                    "tagsView/delView",
-                    this.$route
-                );
-                this.$router.go(-1);
+                this.goShow = true;
             }).catch((response) => {
                 loading.close();
             });
     },
+      //去融资
+    goFinance(){
+        //关闭当前页
+         this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+        );
+        //关闭弹框
+        this.goShow = false;
+        Cookies.set("/credit/goFinance/"+this.form.zfiId + "/", this.$route.fullPath)
+        this.$router.push({ path: "/credit/goFinance/"+this.form.zfiId + "/" });
+    },
+    //返回到列表页
+    goParent(){
+         var self = this
+        this.pdfShowDialog = false;
+        self.$store.dispatch(
+            "tagsView/delView",
+            self.$route
+            );
+         //self.$router.push("/Bill/credit")
+         self.$router.push("/Bill/finance/credit")
+    },
     
   }
 };

+ 7 - 35
front-vue/src/views/service/credit/confirmationAudit.vue

@@ -277,15 +277,6 @@
                 <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
                 </pdf-show>
             </el-dialog>
-             <!--去融资-->
-            <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
-                    <p>恭喜您成功签收一笔融信</p>
-                    <div slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="goFinance">去融资</el-button>
-                        <el-button @click="cancelGo">取 消</el-button>
-                    </div>    
-            </el-dialog>
-           
         </el-tab-pane>
         <!-- 签署合同-->
         <el-tab-pane label="签署合同">
@@ -327,7 +318,6 @@ import {accAdd} from "@/utils/calculation";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import {getToken} from "@/utils/auth";
 import pdfShow from "./pdfShow";
-import Cookies from 'js-cookie';
 export default {
     name: "addCredit",
     components: {pdfShow},
@@ -457,8 +447,6 @@ export default {
             pdfFileList : [],
             pdfShowDialog : false,
             parent : this,
-            //显示去融资框
-            goShow:false
         };
     },
     watch:{
@@ -1151,34 +1139,18 @@ export default {
                     );
                     this.$router.go(-1);
                 }else if(this.zfiCreateType == '2'){//供应商开立,盖章后改为已生效
-                        this.goShow = true;
+                    this.msgSuccess("确权成功,融信已生效");
+                    this.$store.dispatch(
+                        "tagsView/delView",
+                        this.$route
+                    );
+                    this.$router.go(-1);
                 }
             }).catch((response) => {
                 loading.close();
             });
     },
-    //回到父页
-    cancelGo(){
-        this.goShow = false;
-        this.$store.dispatch(
-            "tagsView/delView",
-            this.$route
-        );
-        this.$router.go(-1);
-    },
-    //去融资
-    goFinance(){
-        //关闭当前页
-         this.$store.dispatch(
-            "tagsView/delView",
-            this.$route
-        );
-        //关闭弹框
-        this.goShow = false;
-        Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
-        this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });
-    }
-       
+
     }
 };
 </script>

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

@@ -2392,12 +2392,24 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
         this.reset();
+        this.resetForm("queryForm");
+        this.resetForm("queryFormSign");
+        this.resetForm("queryFormFinancing");
+        this.resetForm("queryFormOpening");
+        this.resetForm("queryFormFinanced");
+        this.resetForm("queryFormInvalid");
         Cookies.set("/credit/addCredit/", this.$route.fullPath);
         this.$router.push({ path: "/credit/addCredit/" });
     },
     //详情
     handleDetail(row){
           const zfiId = row.zfiId || this.ids
+          this.resetForm("queryForm");
+          this.resetForm("queryFormSign");
+          this.resetForm("queryFormFinancing");
+          this.resetForm("queryFormOpening");
+          this.resetForm("queryFormFinanced");
+          this.resetForm("queryFormInvalid");
           Cookies.set("/credit/creditDetail/"+zfiId + "/", this.$route.fullPath)
           this.$router.push({ path: "/credit/creditDetail/"+zfiId + "/" });
     },
@@ -2406,6 +2418,12 @@ export default {
           const zfiId = row.zfiId || this.ids;
           //获取融信类型
           const zfiCreateType = row.zfiCreateType;
+          this.resetForm("queryForm");
+          this.resetForm("queryFormSign");
+          this.resetForm("queryFormFinancing");
+          this.resetForm("queryFormOpening");
+          this.resetForm("queryFormFinanced");
+          this.resetForm("queryFormInvalid");
           //核心开立
           if(zfiCreateType == '1'){
               Cookies.set("/credit/creditUpdate/"+zfiId + "/", this.$route.fullPath)
@@ -2440,10 +2458,15 @@ export default {
                 return false;
             }else{
                 const zfiId = row.zfiId || this.ids
+                this.resetForm("queryForm");
+                this.resetForm("queryFormSign");
+                this.resetForm("queryFormFinancing");
+                this.resetForm("queryFormOpening");
+                this.resetForm("queryFormFinanced");
+                this.resetForm("queryFormInvalid");
                 Cookies.set("/credit/confirmationAudit/"+zfiId + "/", this.$route.fullPath)
                 this.$router.push({ path: "/credit/confirmationAudit/"+zfiId + "/" });
             }
-
         }); 
           
     },
@@ -2474,6 +2497,12 @@ export default {
                 return false;
             }else{
                   const zfiId = row.zfiId || this.ids
+                  this.resetForm("queryForm");
+                  this.resetForm("queryFormSign");
+                  this.resetForm("queryFormFinancing");
+                  this.resetForm("queryFormOpening");
+                  this.resetForm("queryFormFinanced");
+                  this.resetForm("queryFormInvalid");
                   Cookies.set("/credit/addInformation/"+zfiId + "/", this.$route.fullPath)
                   this.$router.push({ path: "/credit/addInformation/"+zfiId + "/" });
             }
@@ -2501,6 +2530,12 @@ export default {
               return false;
            }else{
               const zfiId = row.zfiId || this.ids
+              this.resetForm("queryForm");
+              this.resetForm("queryFormSign");
+              this.resetForm("queryFormFinancing");
+              this.resetForm("queryFormOpening");
+              this.resetForm("queryFormFinanced");
+              this.resetForm("queryFormInvalid");
               Cookies.set("/credit/signFor/"+zfiId + "/", this.$route.fullPath)
               this.$router.push({ path: "/credit/signFor/"+zfiId + "/" });
            }
@@ -2510,12 +2545,17 @@ export default {
     //去融资
     handleGoFinance(row){
         const zfiId = row.zfiId || this.ids
+        this.resetForm("queryForm");
+        this.resetForm("queryFormSign");
+        this.resetForm("queryFormFinancing");
+        this.resetForm("queryFormOpening");
+        this.resetForm("queryFormFinanced");
+        this.resetForm("queryFormInvalid");
         Cookies.set("/credit/goFinance/"+zfiId + "/", this.$route.fullPath)
         this.$router.push({ path: "/credit/goFinance/"+zfiId + "/" });
     },
     //盖章
     seal(row){
-
         //获取融信类型
         if(row.zfiCreateType == '1'){//核心开立
             if(row.zfiCoreStatus != "01"){
@@ -2550,6 +2590,12 @@ export default {
               return false;
            }else{
               const zfiId = row.zfiId || this.ids
+              this.resetForm("queryForm");
+              this.resetForm("queryFormSign");
+              this.resetForm("queryFormFinancing");
+              this.resetForm("queryFormOpening");
+              this.resetForm("queryFormFinanced");
+              this.resetForm("queryFormInvalid");
               Cookies.set("/credit/creditSeal/"+zfiId + "/", this.$route.fullPath)
               this.$router.push({ path: "/credit/creditSeal/"+zfiId + "/" });
            }
@@ -2622,7 +2668,7 @@ export default {
           return approval(row);
         })
         .then(() => {
-          this.getList();
+          this.getList();
           this.getListSign();
           this.getListFinancing();
           this.getListOpening();
@@ -2654,7 +2700,7 @@ export default {
           return openApproval(row);
         })
         .then(() => {
-          this.getList();
+          this.getList();
           this.getListSign();
           this.getListFinancing();
           this.getListOpening();
@@ -2719,12 +2765,24 @@ export default {
     //融资开立
     finanOpening(){
         this.reset();
+        this.resetForm("queryForm");
+        this.resetForm("queryFormSign");
+        this.resetForm("queryFormFinancing");
+        this.resetForm("queryFormOpening");
+        this.resetForm("queryFormFinanced");
+        this.resetForm("queryFormInvalid");
         Cookies.set("/credit/financeOpen/", this.$route.fullPath);
         this.$router.push({ path: "/credit/financeOpen/" });
     },
     //融资申请
     apply(){
         this.reset();
+        this.resetForm("queryForm");
+        this.resetForm("queryFormSign");
+        this.resetForm("queryFormFinancing");
+        this.resetForm("queryFormOpening");
+        this.resetForm("queryFormFinanced");
+        this.resetForm("queryFormInvalid");
         Cookies.set("/credit/creditApply/", this.$route.fullPath);
         this.$router.push({ path: "/credit/creditApply/" });
     },

+ 5 - 3
front-vue/src/views/service/credit/creditSeal.vue

@@ -958,12 +958,14 @@ export default {
     },
     //返回到列表页
      goParent(){
+         var self = this
         this.pdfShowDialog = false;
-        this.$store.dispatch(
+        self.$store.dispatch(
             "tagsView/delView",
-            this.$route
+            self.$route
             );
-        this.$router.go(-1);
+         //self.$router.push("/Bill/credit")
+         self.$router.push("/Bill/finance/credit")
     },
 
     

+ 4 - 2
front-vue/src/views/service/credit/financeOpen.vue

@@ -453,7 +453,8 @@ export default {
                     //开立方赋值
                     this.$set(this.form, "openName", this.chooseTicket[0].payName);
                     if(new Date(this.ticketList[0].zbiPayDate) >= new Date()){
-                        this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
+                        // this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
+                        this.$set(this.form, "zfiExpireDate", this.ticketList[0].zbiPayDate);
                     }
                     this.open = false;
                 }
@@ -681,6 +682,7 @@ export default {
         },
         //新增
         submitForm() {
+            debugger;
             if (this.ticketList.length < 1) {
                 this.$message({
                     message: '请选择应收账款',
@@ -863,7 +865,7 @@ export default {
                                             this.msgSuccess("融信资料已提交企业内部审批");
                                             this.$store.dispatch(
                                                 "tagsView/delView",
-                                                _this.$route
+                                                 this.$route
                                             );
                                             this.$router.go(-1);
                                         } else {

+ 16 - 21
front-vue/src/views/service/credit/pdfShow.vue

@@ -85,7 +85,7 @@
                 </div>
             </el-dialog>
             <!--授权编号的短信框-->
-            <el-dialog  :title="授权短信验证"  :visible.sync="projectIsShow" width="800px"  append-to-body :before-close = "cancelProject" center>
+            <el-dialog  title="授权短信验证"  :visible.sync="projectIsShow" width="800px"  append-to-body :before-close = "cancelProject" center>
                 <el-form ref="projectForm"  :disabled="false" :model="projectForm"  v-if="projectIsShow" label-width="150px"  class="demo-form-inline" :inline="true">
                         <el-form-item label="验证码" prop="code">
                             <el-input v-model="projectForm.code" style="width: 200px" maxlength="6"  oninput="value=value.replace(/[^\d]/g,'')"/>
@@ -197,7 +197,9 @@ export default {
             //开立方
             openName:"",
             //显示去融资框
-            goShow:false
+            goShow:false,
+            //融信类型
+            zfiCreateType:""
 
         };
     },
@@ -221,6 +223,8 @@ export default {
                 this.receiveName = response.data.receiveName;
                 //开立方
                 this.openName = response.data.openName;
+                //融信类型
+                this.zfiCreateType = response.data.financeInf.zfiCreateType;
              }
         })
         this.dialogVisible = true;
@@ -262,11 +266,7 @@ export default {
     //回到父页
     cancelGo(){
         this.goShow = false;
-        this.$store.dispatch(
-            "tagsView/delView",
-            this.$route
-            );
-        this.$router.go(-1);
+        this.goParent();
     },
     resetUpdate() {
         this.updateForm = {
@@ -508,10 +508,10 @@ export default {
     //盖章
     contractSigning(){
             const loading = this.$loading({
-                        lock: true,
-                        text: 'Loading',
-                        background: 'rgba(0, 0, 0,0)'
-                    });
+                lock: true,
+                text: 'Loading',
+                background: 'rgba(0, 0, 0,0)'
+             });
             contractSigning(this.financeData).then((response) => {
                 loading.close();
                 if(this.zfpAuthType == '02'){
@@ -529,7 +529,8 @@ export default {
                          this.msgSuccess("确权成功,融信已提交,"+this.receiveName+"签收");
                          this.goParent();
                     }else if(this.zfiCreateType == '2'){//供应商开立
-                          this.goShow = true;
+                        this.msgSuccess("确权成功,融信已生效");
+                        this.goParent();
                     }
                 }else if(this.zfiStatus == '01' && this.zfiCreateType == '0'){//签收
                      this.goShow = true;
@@ -540,13 +541,13 @@ export default {
                     //融资开立盖章
                     this.msgSuccess("开立成功,待:"+this.openName+"确权;确权结果请留意待办事项与站内消息");
                     this.goParent();
-                }else if(scope.row.zfiCreateType == '1' && this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01'){//补充资料
+                }else if(this.zfiCreateType == '1' && this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01'){//补充资料
                      this.goShow = true;
                 }
                 
             }).catch((response) => {
                 loading.close();
-            });
+            }); 
     },
     //校验授权编号验证码
     checkProCode(){
@@ -609,15 +610,9 @@ export default {
     },
     //去融资
     goFinance(){
-        //关闭当前页
-         this.$store.dispatch(
-            "tagsView/delView",
-            this.$route
-            );
         //关闭弹框
         this.goShow = false;
-        //关闭文件弹框
-        this.closePdfShow();
+        this.goParent();
         Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
         this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });
     }

+ 15 - 0
front-vue/src/views/service/credit/signFor.vue

@@ -5,6 +5,9 @@
             <!-- <div class="app-container"> -->
             <el-form ref="form" :model="form" :rules="rules" :inline="true" style="margin-top: 20px" label-width="auto" >
                 <el-divider content-position="left">签收</el-divider>
+                 <el-form-item label="融信利率:"> 
+                            <span>{{this.zfiRate}}</span>%
+                 </el-form-item>
                 <table class="gridtable" style="width:80%;text-align:center" align="center">
                     <tr>
                         <td rowspan="4">开立方</td>
@@ -450,6 +453,7 @@ export default {
                this.receiverBank = response.data.receiverBank;
                this.receiverAccount = response.data.receiverAccount;
                this.stopDate = response.data.stopDate;
+               this.zfiRate = response.data.financeInf.zfiRate;
                
              }
              if(response.data.payList){
@@ -1142,6 +1146,17 @@ export default {
         this.goShow = false;
         Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
         this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });
+    },
+    //返回到列表页
+    goParent(){
+         var self = this
+        this.pdfShowDialog = false;
+        self.$store.dispatch(
+            "tagsView/delView",
+            self.$route
+            );
+         //self.$router.push("/Bill/credit")
+         self.$router.push("/Bill/finance/credit")
     }
   }
 };

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

@@ -40,9 +40,9 @@
           style="width: 190px"
         /> 
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         -
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item prop="AmountB">
         <el-input
           v-model="queryParams.AmountB"
@@ -521,7 +521,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.resetQuery();
+      this.resetForm("queryForm");
       Cookies.set("/creditLine/addCreditLine/", this.$route.fullPath)
       this.$router.push("/creditLine/addCreditLine/");
     },
@@ -530,7 +530,7 @@ export default {
       const zfpcrId = row.zfpcrId || this.ids;
       const zfiAmount = row.zfiAmount;
       const usableAmount = row.usableAmount;
-      this.resetQuery();
+      this.resetForm("queryForm");
       Cookies.set("/creditLine/editCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/', this.$route.fullPath)
       this.$router.push("/creditLine/editCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/');
     },
@@ -540,7 +540,7 @@ export default {
       const zfiAmount = row.zfiAmount;
       const usableAmount = row.usableAmount;
       const companyType = this.companyType;
-      this.resetQuery();
+      this.resetForm("queryForm");
       Cookies.set("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/' + companyType + '/', this.$route.fullPath)
       this.$router.push("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/' + companyType + '/',);
     },
@@ -569,7 +569,7 @@ export default {
     handleSupplier(row){
       const zfpcrId = row.zfpcrId || this.ids;
       const zfpcrCompanyId = row.zfpcrCompanyId;
-      this.resetQuery();
+      this.resetForm("queryForm");
       Cookies.set("/creditLine/supplierCreditLine/" + zfpcrId + '/' + zfpcrCompanyId, this.$route.fullPath)
       this.$router.push("/creditLine/supplierCreditLine/" + zfpcrId + '/' + zfpcrCompanyId);
     },

+ 3 - 3
front-vue/src/views/service/financeProduct/financeProduct.vue

@@ -246,7 +246,7 @@ export default {
         /** 新增按钮操作 */
         handleAdd() {
             this.reset();
-            this.resetQuery();
+            this.resetForm("queryForm");
             Cookies.set("/financeProduct/addFinanceProduct/", this.$route.fullPath);
             this.$router.push({
                 path: "/financeProduct/addFinanceProduct/"
@@ -255,7 +255,7 @@ export default {
         /** 修改按钮操作 */
         handleUpdate(row) {
             const zfpId = row.zfpId
-            this.resetQuery();
+            this.resetForm("queryForm");
             Cookies.set("/financeProduct/editFinanceProduct/" + zfpId + "/", this.$route.fullPath);
             this.$router.push({
                 path: "/financeProduct/editFinanceProduct/" + zfpId + "/"
@@ -264,7 +264,7 @@ export default {
         /** 修改按钮操作 */
         handleInfo(row) {
             const zfpId = row.zfpId
-            this.resetQuery();
+            this.resetForm("queryForm");
             Cookies.set("/financeProduct/detailFinanceProduct/" + zfpId + "/", this.$route.fullPath);
             this.$router.push({
                 path: "/financeProduct/detailFinanceProduct/" + zfpId + "/"

+ 12 - 3
front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -985,7 +985,10 @@ export default {
         },
         /** 新增按钮操作 */
         handleAdd() {
-            this.resetQuery();
+            this.resetForm("queryForm");
+            this.resetForm("queryFormIng");
+            this.resetForm("queryFormEnd");
+            this.resetForm("queryFormLose");
             Cookies.set("/financeRecord/addFinanceRecord/", this.$route.fullPath);
             this.$router.push("/financeRecord/addFinanceRecord/");
             // this.reset();
@@ -1015,7 +1018,10 @@ export default {
         handleDetail(row) {
             this.reset();
             const zfrId = row.zfrId || this.ids;
-            this.resetQuery();
+            this.resetForm("queryForm");
+            this.resetForm("queryFormIng");
+            this.resetForm("queryFormEnd");
+            this.resetForm("queryFormLose");
             Cookies.set(
                 "/financeRecord/detailFinanceRecord/" + zfrId,
                 this.$route.fullPath
@@ -1025,7 +1031,10 @@ export default {
         //盖章
         seal(row) {
             const zfrId = row.zfrId || this.ids
-            this.resetQuery();
+            this.resetForm("queryForm");
+            this.resetForm("queryFormIng");
+            this.resetForm("queryFormEnd");
+            this.resetForm("queryFormLose");
             Cookies.set("/financeRecord/recordSeal/" + zfrId + "/", this.$route.fullPath)
             this.$router.push({
                 path: "/financeRecord/recordSeal/" + zfrId + "/"

+ 628 - 0
front-vue/src/views/service/financeRecord/pdfShow.vue

@@ -0,0 +1,628 @@
+<template>
+    <div>
+        <!-- <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button> -->
+
+      <!--   <el-dialog  :visible.sync="dialogVisible" width="80%" height="1080px;" :before-close="handleClose" append-to-body	> -->
+            <el-tabs v-model="activeName" type="card">
+                <el-tab-pane v-for="item in pdfFileList" :key="item.value" label="合同信息" name="first"  style="height:500px;">
+                    <embed :src="'data:application/pdf;base64,' + item.base64"  type="application/pdf" title="Embedded PDF" style="overflow: auto; width: 100%; height: 100%;"/>
+                </el-tab-pane>
+                <!-- <el-tab-pane label="申请协议" name="first"  style="height:780px;">
+                    招采融信申请协议
+                    编号:ZCRXKL-20210712001
+                    本《供应链金融服务平台融信转让协议》(以下简称为“本协议”、“《融信转让
+                    协议》”)由融信转让人、融信受让人于本协议约定的时间在北京市东城区签署:
+                    融信转让人:B 供应商 2_TSCF 培训专用
+                    住所:成都市高新区新园南二路一号
+                    法定代表人:张健
+                    融信受让人:B 供应商 1_TSCF 培训专用
+                    住所:成都市高新区新园南二路一号
+                    法定代表人:张健 鉴于:
+                    (A) 融信反向保理平台由中粮资本科技有限责任公司建设并运营,向用户提供
+                    应收账款管理、转让、融资等服务。
+                    (B) 融信转让人与融信受让人(以下简称为“双方”)均为融信反向保理平台的
+                    用户。
+                    (C) 融信转让人现持有融信,享有融信项下的应收账款债权。
+                    (D) 双方均同意使用融信反向保理平台的服务,现融信转让人拟将融信项下应
+                    收账款债权全部或部分通过融信反向保理平台转让给融信受让人,融信受
+                    因此,经双方协商一致,签订本协议,约定如下:
+                </el-tab-pane>
+                <el-tab-pane label="配置管理" name="second" style="height:780px;">
+                    住所:成都市高新区新园南二路一号
+                    法定代表人:张健
+                    融信受让人:B 供应商 1_TSCF 培训专用
+                    住所:成都市高新区新园南二路一号
+                    法定代表人:张健 鉴于:
+                    (A) 融信反向保理平台由中粮资本科技有限责任公司建设并运营,向用户提供
+                    应收账款管理、转让、融资等服务。
+                    (B) 融信转让人与融信受让人(以下简称为“双方”)均为融信反向保理平台的
+                    用户。
+                    (C) 融信转让人现持有融信,享有融信项下的应收账款债权。
+                    (D) 双方均同意使用融信反向保理平台的服务,现融信转让人拟将融信项下应
+                    收账款债权全部或部分通过融信反向保理平台转让给融信受让人,融信受
+                    因此,经双方协商一致,签订本协议,约定如下:</el-tab-pane> -->
+
+            </el-tabs>
+            <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>
+            </span>
+            
+            <!-- <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+            </span> -->
+        <!-- </el-dialog> -->
+        <div>
+             <!--选择签署意愿类型-->
+            <el-dialog  :visible.sync="confirmIsShow" width="600px"  append-to-body :before-close = "cancelUpdate" center>
+                <el-form ref="updateForm"  :disabled="false" :model="updateForm"  v-if="confirmIsShow" label-width="150px"  class="demo-form-inline" :inline="true">
+                    <el-radio-group v-model="updateForm.radio">
+                        <el-radio label="01">人脸</el-radio>
+                        <el-radio label="02">短信</el-radio>
+                    </el-radio-group>
+                </el-form>
+
+                <div slot="footer" class="dialog-footer">
+                    <el-button type="primary" @click="confirmSelect">确 定</el-button>
+                    <el-button @click="cancelUpdate">取 消</el-button>
+                </div>
+            </el-dialog>
+            <!--短信-->
+            <el-dialog  :visible.sync="messageIsShow" width="800px"  append-to-body :before-close = "cancelMessage" center>
+                <el-form ref="messageForm"  :disabled="false" :model="messageForm"  v-if="messageIsShow" label-width="150px"  class="demo-form-inline" :inline="true" @submit.native.prevent>
+                        <el-form-item label="验证码" prop="validCode">
+                            <el-input v-model="messageForm.validCode" style="width: 200px" maxlength="6"  oninput="value=value.replace(/[^\d]/g,'')"/>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button  v-show="messShow"  type="success" @click="send">点击获取验证码</el-button>
+                            <el-button v-show="!messShow" type="success" disabled><span>{{timer}}</span>秒后重新获取</el-button>
+                        </el-form-item>
+
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <el-button type="primary" @click="checkCode">确定</el-button>
+                    <el-button @click="cancelMessage">取 消</el-button>
+                </div>
+            </el-dialog>
+            <!--授权编号的短信框-->
+            <el-dialog  :title="授权短信验证"  :visible.sync="projectIsShow" width="800px"  append-to-body :before-close = "cancelProject" center>
+                <el-form ref="projectForm"  :disabled="false" :model="projectForm"  v-if="projectIsShow" label-width="150px"  class="demo-form-inline" :inline="true">
+                        <el-form-item label="验证码" prop="code">
+                            <el-input v-model="projectForm.code" style="width: 200px" maxlength="6"  oninput="value=value.replace(/[^\d]/g,'')"/>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button  v-show="proShow"  type="success" @click="proSend">点击获取验证码</el-button>
+                            <el-button v-show="!proShow" type="success" disabled><span>{{proTimer}}</span>秒后重新获取</el-button>
+                        </el-form-item>
+
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <el-button type="primary" @click="checkProCode">确定</el-button>
+                    <el-button @click="cancelProject">取 消</el-button>
+                </div>
+            </el-dialog>
+            <!--人脸二维码-->
+            <el-dialog  :visible.sync="faceIsShow" width="500px"  append-to-body :before-close = "cancelFace" center>
+                <img :src="'data:image/jpeg;base64,' + this.fileUrl" style="overflow: auto; width: 100%; height: 100%;"/>
+            </el-dialog>
+            <!--去融资-->
+            <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
+                    <p>恭喜您成功签收一笔融信</p>
+                    <div slot="footer" class="dialog-footer">
+                        <el-button type="primary" @click="goFinance">去融资</el-button>
+                        <el-button @click="cancelGo">取 消</el-button>
+                    </div>    
+            </el-dialog>
+        </div>
+    </div>
+    
+</template>
+
+
+<script>
+import {sendMessage,checkCode,faceAuth,checkFaceAuth,contractSigning} from "@/api/service/credit/message";
+import {cfcaProjectNo,projectSendMessage,checkProCode} from "@/api/service/credit/cfcaProject";
+import {getCreditDetail} from "@/api/service/credit/credit";
+import Cookies from 'js-cookie';
+export default {
+    props : ['pdfFileList','zfiId', 'parent'],
+    data() {
+        return {
+            activeName: "first",
+            dialogVisible: false,
+            dialogTableVisible: false,
+            dialogFormVisible: false,
+            form: {
+                name: "",
+                region: "",
+                date1: "",
+                date2: "",
+                delivery: false,
+                type: [],
+                resource: "",
+                desc: "",
+            },
+            formLabelWidth: "120px",
+             //展示选择意愿
+            confirmIsShow:false,
+            //意愿
+            updateForm:{},
+            //意愿类型
+            zfpAuthTypeInit:'',
+            zfpAuthType:'',
+            //短信展示
+            messageIsShow:false,
+            //短信
+            messageForm:{validCode:""},
+            //人脸二维码
+            fileUrl:"",
+            //控制人脸二维码是否展示
+            faceIsShow:false,
+            //人脸验证结果
+            faceResult:"",
+            //人脸识别结果传参
+            authForm:{},
+            //控制短信验证码倒计时是否展示
+            messShow:true,
+            timer:60,
+            openFile:false,
+            wordUrl: "",
+            show:false,
+            heid:false,
+            auth_timer : null,
+            //融资方审批状态
+            zfiSupplierStatus:'',
+            //核心审批状态
+            zfiCoreStatus:'',
+            //平台审批状态
+            zfiPlatformStatus:'',
+            //融信状态
+            zfiStatus:'',
+            //盖章文件
+            creditSealList:[],
+            //生成授权编号的短信框
+            projectIsShow:false,
+            //短信
+            projectForm:{code:""},
+            //控制倒计时是否展示
+            proShow:true,
+            //时间
+            proTimer:60,
+            //项目编号
+            projectCode:"",
+            //融信信息
+            financeData:{},
+            //接收方
+            receiveName:"",
+            //开立方
+            openName:"",
+            //显示去融资框
+            goShow:false
+
+        };
+    },
+    created() {
+        //  getCreditDetail(this.zfiId).then((response) => {
+        //      if(response.data){
+        //         //融信状态
+        //          this.zfiStatus = response.data.financeInf.zfiStatus;
+        //          //融资方审批状态
+        //          this.zfiSupplierStatus =  response.data.financeInf.zfiSupplierStatus;
+        //          //平台审批状态
+        //          this.zfiPlatformStatus =  response.data.financeInf.zfiPlatformStatus;
+        //          //核心审批状态
+        //          this.zfiCoreStatus = response.data.financeInf.zfiCoreStatus;
+        //         //意愿类型
+        //         this.zfpAuthType = response.data.zfpAuthType;
+        //         this.zfpAuthTypeInit = response.data.zfpAuthType;
+        //         //融信信息
+        //         this.financeData = response.data.financeInf;
+        //         //接收方
+        //         this.receiveName = response.data.receiveName;
+        //         //开立方
+        //         this.openName = response.data.openName;
+        //      }
+        // })
+        this.dialogVisible = true;
+        for(var i = 0 ; i < this.pdfFileList.length; i++){
+            var base64 = this.pdfFileList[i].base64;
+            <embed src="data:application/pdf;base64,"  type="application/pdf" title="Embedded PDF" style="overflow: auto; width: 100%; height: 100%;"/>
+        } 
+    },
+    methods: {
+        handleClose(done) {
+            this.$confirm("确认关闭?")
+                .then((_) => {
+                    done();
+                })
+                .catch((_) => {});
+        },
+        selectChildType(){
+            this.$parent.selectType();
+        },
+    //取消选择意愿
+    cancelUpdate(){
+        this.confirmIsShow = false;
+        this.resetUpdate();
+    },
+    //关闭短信
+    cancelMessage(){
+        this.messageIsShow = false;
+        this.resetMessage();
+    },
+    //关闭短信
+    cancelProject(){
+        this.projectIsShow = false;
+        this.resetProject();
+    },
+    //关闭二维码
+    cancelFace(){
+        this.faceIsShow = false;
+    },
+    //回到父页
+    cancelGo(){
+        this.goShow = false;
+        this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+            );
+        this.$router.go(-1);
+    },
+    resetUpdate() {
+        this.updateForm = {
+            radio:""
+        };
+        //意愿类型还原为全部
+        this.zfpAuthType = this.zfpAuthTypeInit;
+        this.resetForm("updateForm");
+
+        this.messShow = true;
+        clearInterval(this.auth_timer);
+        this.timer = 60;
+
+        this.proShow = true;
+        clearInterval(this.auth_pro_timer);
+        this.proTimer = 60;
+    },
+    resetMessage() {
+        this.messageForm = {
+            validCode:""
+        };
+        this.resetForm("messageForm");
+    },
+    resetProject(){
+         this.projectForm = {
+            code:""
+        };
+        this.resetForm("projectForm");
+    },
+    //选择类型
+    selectType(){
+        //查询当前企业是否存在企业授权编号
+        cfcaProjectNo().then((response) => {
+            //存在授权编号
+            if(response.data.scyCfcaAuthNumber){
+                 /**
+                 * 申请确权:融资审批通过+核心通过+平台通过+融信待确权||
+                 * 核心开立:核心审批通过+其余状态为空
+                 * 融资开立:融资通过+平台通过+其余状态为空
+                 * 
+                 */
+                this.resetUpdate();
+                //调用人脸
+                if( (this.zfiSupplierStatus == '01' && this.zfiCoreStatus == '01' && this.zfiPlatformStatus == '01' && this.zfiStatus == '00') ||
+                    (this.zfiCoreStatus == '01' && (this.zfiSupplierStatus == '' || this.zfiSupplierStatus == null || this.zfiSupplierStatus == 'null') && (this.zfiPlatformStatus == '' || this.zfiPlatformStatus == null || this.zfiPlatformStatus == 'null') && (this.zfiStatus == '' || this.zfiStatus == null || this.zfiStatus == 'null'))||
+                    (this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01' && (this.zfiCoreStatus == '' || this.zfiCoreStatus == null || this.zfiCoreStatus == 'null') && (this.zfiStatus == '' || this.zfiStatus == null || this.zfiStatus == 'null'))){
+                    //选择签署意愿
+                    if(this.zfpAuthType == "00"){
+                            this.confirmIsShow = true;
+                        }else{
+                            this.checking();
+                        }
+
+                }else{
+                    //直接盖章
+                    this.contractSigning();     
+                }
+            }else{
+               //不存在授权编号
+               //发送短信验证码认证
+                this.projectIsShow = true;
+
+            }
+        });
+       
+    },
+    //确认选择
+    confirmSelect(){
+            if(!this.updateForm.radio){
+                this.$message({
+                    message: '请选择签署意愿类型',
+                    type: 'warning'
+                });
+                return;
+            }
+
+            this.confirmIsShow = false;
+            this.zfpAuthType = this.updateForm.radio;
+            //调用人脸识别或者短信验证
+            this.checking();
+    },
+    //去签署
+    checking(){
+        //人脸
+        if(this.zfpAuthType == '01'){
+          //调用人脸识别生成二维码
+          faceAuth().then((response) => {
+                if(response.data){
+                    //获取二维码
+                    this.fileUrl = response.data.fileUrl;
+                    //获取源流水号
+                    var originalTxSN = response.data.originalTxSN;
+                    this.faceIsShow = true;
+                    //每10秒查证人脸识别结果
+                    var timeInterval = window.setInterval(() => {
+                            setTimeout(() => {
+                               //源流水不为空并且结果为空
+                               if(originalTxSN && !this.faceResult){
+                                    this.authForm.originalTxSN = originalTxSN;
+                                    //调用查证方法
+                                    checkFaceAuth(this.authForm).then((res) => {
+                                        //认证结果
+                                        this.faceResult = res.data.Verification;
+                                        //成功
+                                        if(this.faceResult == '20'){
+                                            this.msgSuccess("验证成功");
+                                            //关闭验证码
+                                            this.faceIsShow = false;
+                                            //关闭定时
+                                            window.clearInterval(timeInterval);
+                                            //调用盖章
+                                            this.contractSigning();
+                                        }else if(this.faceResult == '30'){
+                                            this.$message({
+                                                message: "验证失败",
+                                                type: 'warning'
+                                            });
+                                            //关闭验证码
+                                            this.faceIsShow = false;
+                                            window.clearInterval(timeInterval);
+                                        }
+                                    });
+                               }
+                            }, 0)
+                         },10000)
+                }
+            });
+
+        }else if(this.zfpAuthType == '02'){//短信
+            this.messageIsShow = true;
+        }
+
+    },
+    //发送短信验证码
+    send(){
+
+            //发送
+            sendMessage().then((response) => {
+                if(response.data){
+                    //手机号
+                    var newIphone = response.data.newIphone;
+                    //结果
+                    var result = response.data.result;
+                    this.messShow = false;
+                    this.auth_timer = window.setInterval(() => {
+                        this.messShow = false;
+                        setTimeout(() => {
+                                this.timer--;
+                                if(this.timer <= 0 ){
+                                    this.messShow = true;
+                                    clearInterval(this.auth_timer);
+                                }
+                            }, 0)
+                        },1000)
+                    //成功
+                    if("20" == result){
+                        this.$message({
+                            message: "已向经办人手机号为"+newIphone+"发送短信验证码,请注意查收",
+                            type: 'warning'
+                        });
+                    }else if("10" == result){//失败
+                        this.$message({
+                            message: "短信发送失败",
+                            type: 'warning'
+                        });
+                    }
+
+                }
+            });
+
+    },
+
+    //生成项目授权编号发送短信
+    proSend(){
+        //发送
+        projectSendMessage().then((response) => {
+            if(response.data){
+                //手机号
+                var newIphone = response.data.newIphone;
+                //结果
+                var result = response.data.result;
+                //项目编号
+                this.projectCode = response.data.projectCode;
+                this.proShow = false;
+                this.auth_pro_timer = window.setInterval(() => {
+                    this.proShow = false;
+                    setTimeout(() => {
+                            this.timer--;
+                            if(this.timer <= 0 ){
+                                this.proShow = true;
+                                clearInterval(this.auth_pro_timer);
+                            }
+                        }, 0)
+                    },1000)
+                //成功
+                if("60000000" == result){
+                    this.$message({
+                        message: "已向经办人手机号为"+newIphone+"发送短信验证码,请注意查收",
+                        type: 'warning'
+                    });
+                }else{//失败
+                    this.$message({
+                        message: "短信发送失败",
+                        type: 'warning'
+                    });
+                }
+
+            }
+        });
+    },
+    //校验验证码是否正确
+    checkCode(){
+            if(!this.messageForm.validCode){
+                     this.$message({
+                        message: "请输入验证码",
+                        type: 'warning'
+                    });
+                    return;
+            }
+            //校验验证码
+            checkCode(this.messageForm).then((response) => {
+                if(response.data){
+                    //结果
+                    var verification = response.data.verification;
+                    //匹配
+                    if("20" == verification){
+                        //进行下一步-- 盖章
+                         this.contractSigning();
+                    }else if("30" == verification){//不匹配
+                         this.$message({
+                            message: "验证有误,请重新输入",
+                            type: 'warning'
+                        });
+                    }
+
+                }
+        });
+    },
+    //盖章
+    contractSigning(){
+            const loading = this.$loading({
+                        lock: true,
+                        text: 'Loading',
+                        background: 'rgba(0, 0, 0,0)'
+                    });
+            contractSigning(this.financeData).then((response) => {
+                loading.close();
+                if(this.zfpAuthType == '02'){
+                    //关闭短信验证
+                    this.messageIsShow = false;
+                }else if(this.zfpAuthType == '01'){
+                    //关闭人脸二维码
+                    this.faceIsShow = false;
+                }
+                //关闭文件弹框
+                this.closePdfShow();
+                //确权:状态为待确权
+                if(this.zfiStatus == '00'){
+                    if(this.zfiCreateType == '0'){//申请
+                         this.msgSuccess("确权成功,融信已提交,"+this.receiveName+"签收");
+                         this.goParent();
+                    }else if(this.zfiCreateType == '2'){//供应商开立
+                          this.goShow = true;
+                    }
+                }else if(this.zfiStatus == '01' && this.zfiCreateType == '0'){//签收
+                     this.goShow = true;
+                }else if(this.zfiCreateType == '1' && this.zfiCoreStatus == '01' && !this.zfiStatus){//核心开立
+                    this.msgSuccess("开立成功,融信已提交"+this.receiveName+"签收");
+                    this.goParent();
+                }else if(this.zfiCreateType == '2' && this.zfiPlatformStatus == '01' && this.zfiSupplierStatus == '01' && !this.zfiStatus){
+                    //融资开立盖章
+                    this.msgSuccess("开立成功,待:"+this.openName+"确权;确权结果请留意待办事项与站内消息");
+                    this.goParent();
+                }else if(scope.row.zfiCreateType == '1' && this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01'){//补充资料
+                     this.goShow = true;
+                }
+                
+            }).catch((response) => {
+                loading.close();
+            });
+    },
+    //校验授权编号验证码
+    checkProCode(){
+            if(!this.projectForm.code){
+                     this.$message({
+                        message: "请输入验证码",
+                        type: 'warning'
+                    });
+                    return;
+            }
+            //项目编号
+            this.projectForm.projectCode = this.projectCode;
+            //校验验证码
+            checkProCode(this.projectForm).then((response) => {
+                if(response.data){
+                    //结果
+                    var verification = response.data.verification;
+                    //匹配
+                    if("60000000" == verification){
+                        //关闭弹框
+                        this.projectIsShow = false;
+                        /**
+                         * 申请确权:融资审批通过+核心通过+平台通过+融信待确权||
+                         * 核心开立:核心审批通过+其余状态为空
+                         * 融资开立:融资通过+平台通过+其余状态为空
+                         * 
+                         */
+                        this.resetUpdate();
+                        //调用人脸
+                        if( (this.zfiSupplierStatus == '01' && this.zfiCoreStatus == '01' && this.zfiPlatformStatus == '01' && this.zfiStatus == '00') ||
+                            (this.zfiCoreStatus == '01' && (this.zfiSupplierStatus == '' || this.zfiSupplierStatus == null || this.zfiSupplierStatus == 'null') && (this.zfiPlatformStatus == '' || this.zfiPlatformStatus == null || this.zfiPlatformStatus == 'null') && (this.zfiStatus == '' || this.zfiStatus == null || this.zfiStatus == 'null'))||
+                            (this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01' && (this.zfiCoreStatus == '' || this.zfiCoreStatus == null || this.zfiCoreStatus == 'null') && (this.zfiStatus == '' || this.zfiStatus == null || this.zfiStatus == 'null'))){
+                            //选择签署意愿
+                            if(this.zfpAuthType == "00"){
+                                    this.confirmIsShow = true;
+                                }else{
+                                    this.checking();
+                                }
+
+                        }else{
+                            //直接盖章
+                            this.contractSigning();     
+                        }
+                    }else {//不匹配
+                         this.$message({
+                            message: "验证有误,请重新输入",
+                            type: 'warning'
+                        });
+                    }
+
+                }
+        });
+    },
+    closePdfShow(){
+        this.parent.closePdfShow();
+    },
+    //返回到列表页
+    goParent(){
+       this.parent.goParent();
+    },
+    //去融资
+    goFinance(){
+        //关闭当前页
+         this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+            );
+        //关闭弹框
+        this.goShow = false;
+        //关闭文件弹框
+        this.closePdfShow();
+        Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
+        this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });
+    }
+    
+
+    },
+};
+</script>

+ 8 - 3
front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -136,7 +136,7 @@
             title="预览"
             :visible.sync="pdfShowDialog"
             width="30%">
-            <pdf-show :pdfFileList="pdfFileList">
+            <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
             </pdf-show>
         </el-dialog>
          <!--选择签署意愿类型-->
@@ -209,17 +209,19 @@ import { getRecord,updateRecord ,listBillInf,getContractFile,
          listAccInf,getRecordSealFile} from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
 import { listCompanyHandler } from "@/api/common/companyHandler";
-import {getCreditDetail,getFile} from "@/api/service/credit/credit";
+import {getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
 import {sendMessage,checkCode,faceAuth,checkFaceAuth} from "@/api/service/credit/message";
 import {cfcaProjectNo,projectSendMessage,checkProCode} from "@/api/service/credit/cfcaProject";
-import pdfShow from "../credit/pdfShow";
+import pdfShow from "../financeRecord/pdfShow";
 import {getToken} from "@/utils/auth";
 export default {
     name: "RecordSeal",
     components: {pdfShow},
     data() {
         return {
+            //盖章预览
+            parent : this,
             //盖章短信验证码倒计时
             show: true,
             count: '',
@@ -570,6 +572,9 @@ export default {
     cancelFace(){
         this.faceIsShow = false;
     },
+    closePdfShow(){
+        this.pdfShowDialog = false;
+    },
     resetUpdate() {
         this.updateForm = {
             radio:""

+ 0 - 1
front-vue/src/views/service/invoice/invoice.vue

@@ -303,7 +303,6 @@ export default {
     },
     //文件下载
     handleDownload(row){
-      this.resetQuery();
         const pfiUrl = row.pfiUrl;
         if(pfiUrl != null && pfiUrl != ''){
         window.open(pfiUrl +"/"+ getToken());

+ 2 - 2
front-vue/src/views/service/rel/companyRel.vue

@@ -912,8 +912,8 @@ export default {
     },
     //查询企业详情
     handleCompanyQuery(row){
-      this.resetQuery();
-      this.resetSpareQuery();
+      this.resetForm("queryForm");
+      this.resetForm("querySpareForm");
       if(row.receive == true){
       const scyId = row.launchCompanyId;
       listCompanyQuery(scyId).then(response => {

+ 2 - 2
front-vue/src/views/service/rel/companyRelManage.vue

@@ -529,8 +529,8 @@ export default {
     //查询企业详情
     handleCompanyQuery(row){
       this.reset();
-      this.resetQuery();
-      this.resetSpareQuery();
+      this.resetForm("queryForm");
+      this.resetForm("querySpareForm");
       if(row.receive == true){
       const scyId = row.launchCompanyId;
       listCompanyQuery(scyId).then(response => {

+ 5 - 3
front-vue/src/views/service/repayment/repayment.vue

@@ -540,7 +540,10 @@ export default {
         /** 详情按钮操作 */
         handleInfo(row) {
             const zfrId = row.zfrId;
-            this.resetQuery();
+            this.resetForm("queryForm");
+            this.resetForm("queryForm1");
+            this.resetForm("queryForm2");
+            this.resetForm("queryForm3");
             Cookies.set("/repayment/detailRepayment/"+zfrId+"/", this.$route.fullPath);
             this.$router.push({path:"/repayment/detailRepayment/"+zfrId+"/"});
         },
@@ -555,7 +558,7 @@ export default {
           });
           this.download('sc-service/repayment/export/'+zfrId, {
 
-        }, `还款明细.docx`);
+        }, `还款明细.doc`);
         setTimeout(() => {
           loading.close();
           this.create = false;
@@ -569,7 +572,6 @@ export default {
             this.form.zfrId = row.zfrId || this.ids;
             this.showBtnImg = true;
             this.noneBtnImg = this.fileList.length >= this.limitCountImg;
-            debugger
             this.open = true;
             this.title = "还款登记";
         },

+ 4 - 4
front-vue/src/views/system/company/certification.vue

@@ -537,8 +537,8 @@
                 <div class="zap-upload__text">上传文件</div>
               </div>
               <div slot="tip" class="zap-enclosure__tip">
-                支持格式:.doc .docx .pdf</br>
-                单个文件不能超过20MB
+                支持格式:.jpg .jpeg .png</br>
+                单个文件不能超过3MB
               </div>
             </el-upload>
             </el-row>
@@ -614,8 +614,8 @@
                   <div class="zap-upload__text">上传文件</div>
                 </div>
                 <div slot="tip" class="zap-enclosure__tip">
-                  支持格式:.doc .docx .pdf</br>
-                  单个文件不能超过20MB
+                   支持格式:.jpg .jpeg .png</br>
+                 单个文件不能超过3MB
                 </div>
               </el-upload>
             </el-row>

+ 3 - 3
front-vue/src/views/system/user/index.vue

@@ -226,7 +226,7 @@
             label="创建时间"
             align="center"
             prop="createTime"
-            width="160"
+            width="150"
             v-if="uncheckList.createTime"
           >
             <template slot-scope="scope">
@@ -236,7 +236,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="500"
+            width="200"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -1208,7 +1208,7 @@ export default {
     /** 确认变更经办人*/
     confirmHandler(row) {
       console.log(row);
-      this.resetQuery();
+      this.resetForm("queryForm");
       Cookies.set(
         "/user/detail/" + row.userId + "/" + row.scyId,
         this.$route.fullPath