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

front-vue/src/api/service/credit/message.js

@@ -45,4 +45,13 @@ export function contractSigning(query) {
     method: 'post',
     data: query
   })
+}
+
+//查询企业当前融信已盖章合同
+export function listStamped(query) {
+  return request({
+    url: '/sc-service/ownMessage/listStamped',
+    method: 'get',
+    params: query
+  })
 }

front-vue/src/api/service/financeRecord/record.js

@@ -116,4 +116,13 @@ export function cancelContract(data) {
     method: 'put',
     data: data
   })
+}
+
+//查询企业当前融信已盖章合同
+export function listStamped(query) {
+  return request({
+    url: '/sc-service/recordSeal/listStamped',
+    method: 'get',
+    params: query
+  })
 }

front-vue/src/views/forgetUser.vue

@@ -120,8 +120,9 @@ export default {
                 phone: [
                     {
                         required: true,
+                        pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
                         trigger: "blur",
-                        message: "手机号不能为空",
+                        message: "请输入正确的手机号",
                     },
                 ],
                 shortMessageCode: [

front-vue/src/views/registerUser.vue

@@ -26,25 +26,25 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="password">
-                            <el-input v-model="loginForm.password" type="text" auto-complete="off" placeholder="密码" maxlength="20">
+                            <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" maxlength="12">
                                 <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="again">
-                            <el-input v-model="loginForm.again" type="text" auto-complete="off" placeholder="确认密码" maxlength="20">
+                            <el-input v-model="loginForm.again" type="password" auto-complete="off" placeholder="确认密码" maxlength="12">
                                 <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
                             </el-input>
                         </el-form-item>
                         <el-form-item>
-                            <el-checkbox v-model="loginForm.checked">
-                                <div class="zap-agreement">
-                                    <span class="zap-agreement__text">我已阅读</span>
-                                    <div class="zap-agreement__link">
-                                        <span>《招采云链服务平台会员注册协议》</span>
-                                        <span>《招采云链服务平台隐私政策》</span>
-                                    </div>
-                                </div>
+                            <el-checkbox v-model="loginForm.checked" style="margin-bottom: 10px;margin-right: 10px;">
                             </el-checkbox>
+                            <div class="zap-agreement">
+                                <span class="zap-agreement__text">我已阅读</span>
+                                <div class="zap-agreement__link">
+                                    <span>《招采云链服务平台会员注册协议》</span>
+                                    <span>《招采云链服务平台隐私政策》</span>
+                                </div>
+                            </div>
                         </el-form-item>
                         <el-form-item style="width:100%;">
                             <el-button :loading="loading"  class="zap-button" size="medium" type="primary" @click.native.prevent="handleLogin">
@@ -106,6 +106,13 @@ export default {
   },
     name: "Login",
     data() {
+        const equalToPassword = (rule, value, callback) => {
+            if (this.loginForm.password !== value) {
+                callback(new Error("两次输入的密码不一致"));
+            } else {
+                callback();
+            }
+        };
         return {
             //默认背景图
             activeName: "login_shortMessage",
@@ -146,8 +153,9 @@ export default {
                 phone: [
                     {
                         required: true,
+                        pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
                         trigger: "blur",
-                        message: "手机号不能为空",
+                        message: "请输入正确的手机号",
                     },
                 ],
                 shortMessageCode: [
@@ -160,8 +168,9 @@ export default {
                 password: [
                     {
                         required: true,
+                        pattern: /^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9]{6,12}$/,
                         trigger: "blur",
-                        message: "密码不能为空",
+                        message: "密码必须由字母、数字组成，区分大小写",
                     },
                 ],
                 again: [
@@ -170,6 +179,7 @@ export default {
                         trigger: "blur",
                         message: "确认密码不能为空",
                     },
+                    { required: true, validator: equalToPassword, trigger: "blur" }
                 ],
             },
             loading: false,

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

@@ -1045,7 +1045,7 @@ export default {
                 strarr.push(this.fileList[i]["ziiAmount"]);
                 }
             }
-            return (Math.floor(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
+            return (Math.round(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
             // return this.handleInput(eval(strarr.join("+"))); //结果
         },
         // 结束

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

@@ -300,9 +300,15 @@
             width="70%"
             height = "60%"
             append-to-body>
-                <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
+                <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent" @PDFData="PDFData">
                 </pdf-show>
             </el-dialog>
+            <el-dialog
+            :visible.sync="pdfShowDialogs"
+            width="70%" height = "60%" append-to-body :show-close="false" >
+            <pdf-shows :pdfFileLists="pdfFileLists" :zfiId="this.form.zfiId" :parents="parents">
+            </pdf-shows>
+        </el-dialog>
         </el-tab-pane>
         <!-- 签署合同-->
         <el-tab-pane label="签署合同">
@@ -345,9 +351,10 @@ import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import {getToken} from "@/utils/auth";
 import {contractSigning} from "@/api/service/credit/message";
 import pdfShow from "./pdfShow";
+import pdfShows from "./showStampedPdf";
 export default {
     name: "addCredit",
-    components: {pdfShow},
+    components: {pdfShow,pdfShows},
     data() {
         return {
             // 总条数
@@ -476,6 +483,9 @@ export default {
             pdfFileList : [],
             pdfShowDialog : false,
             parent : this,
+            pdfShowDialogs : false,
+            pdfFileLists : [],
+            parents : this,
         };
     },
     watch:{
@@ -532,7 +542,12 @@ export default {
        
     },
     methods: {
-
+        PDFData(val){
+            console.log(val,"子传父")
+            this.pdfFileLists = val;
+            this.pdfShowDialogs = true;
+            
+        },
         // 取消按钮
         cancel() {
             this.$store.dispatch("tagsView/delView", this.$route);
@@ -1179,6 +1194,9 @@ export default {
     closePdfShow(){
         this.pdfShowDialog = false;
     },
+    closePdfShows(){
+        this.pdfShowDialogs = false;
+    },
     //盖章
     contractSigning(){
             const loading = this.$loading({

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

@@ -418,72 +418,7 @@
                             <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
                             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='400' fixed="right">
                                 <template slot-scope="scope">
-                                    <el-button class="zap-button-plain" size="mini" type="text" @click="handleDetail(scope.row)" v-hasPermi="['credit:credit:query']">详情</el-button>
-                                    <!--
-                (核心方)核心开立+核心审批拒绝||融资/平台拒绝||
-                (融资方)融资申请+融资审批状态/平台审批拒绝+融信不等于待签收||
-                (融资方)融资开立+融资审批状态/平台审批拒绝||
-              -->
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['credit:credit:update']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
-                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
-                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))
-                        ">修改</el-button>
-                                    <!--融信状态待确权且为核心企业
-              -->
-                                    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
-                                    <!--原补充资料-->
-                                    <!--核心开立+融信状态为待签收+融资企业   判断内部，平台，审批中不可进入
-              -->
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleAddInformation(scope.row)" v-hasPermi="['credit:credit:addInfor']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus=='01' || scope.row.zfiStatus=='06')">签收</el-button>
-                                    <!--融资申请+融信状态待签收+融资企业
-              判断是否内部通过 审批中不可进入
-              -->
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleSignFor(scope.row)" v-hasPermi="['credit:credit:signFor']" v-show="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && scope.row.companyType == '02'">签收</el-button>
-                                    <!--(融资申请+融信状态待签收+融资审批状态不是审批中并且不是审批通过)||
-                  (核心开立+融信状态为待签收+(融资审批状态不是审批中并且不是审批通过)或者(平台审批状态不是审批中并且不是审批通过))
-              -->
-                                    <!--    <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleRefuse(scope.row)"
-                v-hasPermi="['credit:credit:refuse']"
-                v-show="(scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' &&(scope.row.zfiSupplierStatus != '00' && scope.row.zfiSupplierStatus != '01'))||
-                (scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' &&((scope.row.zfiSupplierStatus != '00' && scope.row.zfiSupplierStatus != '01') || (scope.row.zfiPlatformStatus != '00' && scope.row.zfiPlatformStatus != '01')))"
-              >拒签</el-button> -->
-                                    <!--生效-->
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleGoFinance(scope.row)" v-hasPermi="['finance:record:add']" v-show="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'">去融资</el-button>
-                                    <!--(核心)核心开立:核心审批通过+其他状态为空||
-                (融资方)补充资料：融资方通过+核心通过+平台通过+待签收||
-                (融资方)融资开立:融资方通过+平台通过+其他为空||
-                (核心)确权:融资方通过+核心通过+平台通过+待确权
-            -->
-                                    <!--  <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="seal(scope.row)"
-                v-hasPermi="['credit:credit:seal']"
-                v-show="(scope.row.companyType == '01' && scope.row.zfiCoreStatus == '01' && (scope.row.zfiSupplierStatus == '' || scope.row.zfiSupplierStatus == null || scope.row.zfiSupplierStatus == 'null') && (scope.row.zfiPlatformStatus == '' || scope.row.zfiPlatformStatus == null || scope.row.zfiPlatformStatus == 'null') && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null))||
-                      (scope.row.companyType == '02' && scope.row.zfiSupplierStatus == '01' && scope.row.zfiCoreStatus == '01' && scope.row.zfiPlatformStatus == '01' &&  scope.row.zfiStatus == '01')||
-                      (scope.row.companyType == '02' && scope.row.zfiSupplierStatus == '01' && scope.row.zfiPlatformStatus == '01' && (scope.row.zfiCoreStatus == '' || scope.row.zfiCoreStatus == null || scope.row.zfiCoreStatus =='null') && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null))||
-                      (scope.row.companyType == '01' && scope.row.zfiSupplierStatus == '01' && scope.row.zfiCoreStatus == '01' && scope.row.zfiPlatformStatus == '01' &&  scope.row.zfiStatus == '00')"
-              >盖章</el-button> -->
-                                    <!--核心开立
-                类型为核心开立，状态为空，并且核心企业
-              -->
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">开立融信</el-button>
-                                    <el-button class="zap-button-info" size="mini" type="text" @click="refuse(scope.row)" v-show="(scope.row.companyType == '01' || scope.row.companyType == '02')
-                        && (scope.row.zfiCreateType == '1' || scope.row.zfiCreateType == '2')
-                        && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">作废</el-button>
-                                    <!--供应商开立
-                类型为供应商开立，状态为空，并且融资企业
-              -->
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">融信开立</el-button>
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['credit:credit:del']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
-                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
-                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))">删除</el-button>
-                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleFlowable(scope.row)">查看流程</el-button>
+                                    
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -527,26 +462,26 @@
                             <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
                             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='400' fixed="right">
                                 <template slot-scope="scope">
-                                    <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)" v-hasPermi="['credit:credit:query']">详情</el-button>
+                                    <el-button class="zap-button-plain" size="mini" type="text" @click="handleDetail(scope.row)" v-hasPermi="['credit:credit:query']">详情</el-button>
                                     <!--
                 (核心方)核心开立+核心审批拒绝||融资/平台拒绝||
                 (融资方)融资申请+融资审批状态/平台审批拒绝+融信不等于待签收||
                 (融资方)融资开立+融资审批状态/平台审批拒绝||
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['credit:credit:update']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['credit:credit:update']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))
                         ">修改</el-button>
                                     <!--融信状态待确权且为核心企业
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
+                                    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
                                     <!--原补充资料-->
                                     <!--核心开立+融信状态为待签收+融资企业   判断内部，平台，审批中不可进入-->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAddInformation(scope.row)" v-hasPermi="['credit:credit:addInfor']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus=='01' || scope.row.zfiStatus=='06')">签收</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleAddInformation(scope.row)" v-hasPermi="['credit:credit:addInfor']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus=='01' || scope.row.zfiStatus=='06')">签收</el-button>
                                     <!--融资申请+融信状态待签收+融资企业
               判断是否内部通过 审批中不可进入
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSignFor(scope.row)" v-hasPermi="['credit:credit:signFor']" v-show="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && scope.row.companyType == '02'">签收</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleSignFor(scope.row)" v-hasPermi="['credit:credit:signFor']" v-show="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && scope.row.companyType == '02'">签收</el-button>
                                     <!--(融资申请+融信状态待签收+融资审批状态不是审批中并且不是审批通过)||
                   (核心开立+融信状态为待签收+(融资审批状态不是审批中并且不是审批通过)或者(平台审批状态不是审批中并且不是审批通过))
               -->
@@ -560,7 +495,7 @@
                 (scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' &&((scope.row.zfiSupplierStatus != '00' && scope.row.zfiSupplierStatus != '01') || (scope.row.zfiPlatformStatus != '00' && scope.row.zfiPlatformStatus != '01')))"
               >拒签</el-button> -->
                                     <!--生效-->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleGoFinance(scope.row)" v-hasPermi="['finance:record:add']" v-show="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'">去融资</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleGoFinance(scope.row)" v-hasPermi="['finance:record:add']" v-show="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'">去融资</el-button>
                                     <!--(核心)核心开立:核心审批通过+其他状态为空||
                 (融资方)补充资料：融资方通过+核心通过+平台通过+待签收||
                 (融资方)融资开立:融资方通过+平台通过+其他为空||
@@ -580,24 +515,26 @@
                                     <!--核心开立
                 类型为核心开立，状态为空，并且核心企业
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">开立融信</el-button>
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="refuse(scope.row)" v-show="(scope.row.companyType == '01' || scope.row.companyType == '02')
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">开立融信</el-button>
+                                    <el-button size="mini" type="text" @click="refuse(scope.row)" v-show="(scope.row.companyType == '01' || scope.row.companyType == '02')
                         && (scope.row.zfiCreateType == '1' || scope.row.zfiCreateType == '2')
                         && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">作废</el-button>
                                     <!--供应商开立
                 类型为供应商开立，状态为空，并且融资企业
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">融信开立</el-button>
-                                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['credit:credit:del']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">融信开立</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['credit:credit:del']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))">删除</el-button>
-                                    <el-button size="mini" type="text" icon="el-icon-info" @click="handleFlowable(scope.row)">查看流程</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleFlowable(scope.row)">查看流程</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
+                         <statistical-data>
+                            <span class="label">总合计:<span class="value">{{klzAmount}}</span></span>
+                            <span class="label">开立中:{{klzAmount}}</span>
+                         </statistical-data>
                         <pagination v-show="totalOpening>0" :total="totalOpening" :page.sync="queryParamsOpening.pageNum" :limit.sync="queryParamsOpening.pageSize" @pagination="getListOpening" />
-                        <span>总合计:{{klzAmount}}</span>
-                        <span>开立中:{{klzAmount}}</span>
                     </el-tab-pane>
                     <!--已生效-->
                     <el-tab-pane label="已生效">
@@ -627,26 +564,26 @@
                             <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
                             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='400' fixed="right">
                                 <template slot-scope="scope">
-                                    <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)" v-hasPermi="['credit:credit:query']">详情</el-button>
+                                    <el-button class="zap-button-plain" size="mini" type="text" @click="handleDetail(scope.row)" v-hasPermi="['credit:credit:query']">详情</el-button>
                                     <!--
                 (核心方)核心开立+核心审批拒绝||融资/平台拒绝||
                 (融资方)融资申请+融资审批状态/平台审批拒绝+融信不等于待签收||
                 (融资方)融资开立+融资审批状态/平台审批拒绝||
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['credit:credit:update']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['credit:credit:update']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))
                         ">修改</el-button>
                                     <!--融信状态待确权且为核心企业
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
+                                    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
                                     <!--原补充资料-->
                                     <!--核心开立+融信状态为待签收+融资企业   判断内部，平台，审批中不可进入-->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAddInformation(scope.row)" v-hasPermi="['credit:credit:addInfor']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus=='01' || scope.row.zfiStatus=='06')">签收</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleAddInformation(scope.row)" v-hasPermi="['credit:credit:addInfor']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus=='01' || scope.row.zfiStatus=='06')">签收</el-button>
                                     <!--融资申请+融信状态待签收+融资企业
               判断是否内部通过 审批中不可进入
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSignFor(scope.row)" v-hasPermi="['credit:credit:signFor']" v-show="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && scope.row.companyType == '02'">签收</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleSignFor(scope.row)" v-hasPermi="['credit:credit:signFor']" v-show="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && scope.row.companyType == '02'">签收</el-button>
                                     <!--(融资申请+融信状态待签收+融资审批状态不是审批中并且不是审批通过)||
                   (核心开立+融信状态为待签收+(融资审批状态不是审批中并且不是审批通过)或者(平台审批状态不是审批中并且不是审批通过))
               -->
@@ -660,7 +597,7 @@
                 (scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && scope.row.zfiStatus=='01' &&((scope.row.zfiSupplierStatus != '00' && scope.row.zfiSupplierStatus != '01') || (scope.row.zfiPlatformStatus != '00' && scope.row.zfiPlatformStatus != '01')))"
               >拒签</el-button> -->
                                     <!--生效-->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleGoFinance(scope.row)" v-hasPermi="['finance:record:add']" v-show="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'">去融资</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleGoFinance(scope.row)" v-hasPermi="['finance:record:add']" v-show="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'">去融资</el-button>
                                     <!--(核心)核心开立:核心审批通过+其他状态为空||
                 (融资方)补充资料：融资方通过+核心通过+平台通过+待签收||
                 (融资方)融资开立:融资方通过+平台通过+其他为空||
@@ -680,24 +617,26 @@
                                     <!--核心开立
                 类型为核心开立，状态为空，并且核心企业
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">开立融信</el-button>
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="refuse(scope.row)" v-show="(scope.row.companyType == '01' || scope.row.companyType == '02')
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">开立融信</el-button>
+                                    <el-button class="zap-button-info" size="mini" type="text" @click="refuse(scope.row)" v-show="(scope.row.companyType == '01' || scope.row.companyType == '02')
                         && (scope.row.zfiCreateType == '1' || scope.row.zfiCreateType == '2')
                         && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">作废</el-button>
                                     <!--供应商开立
                 类型为供应商开立，状态为空，并且融资企业
               -->
-                                    <el-button size="mini" type="text" icon="el-icon-edit" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">融信开立</el-button>
-                                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['credit:credit:del']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">融信开立</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['credit:credit:del']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
                         (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))">删除</el-button>
-                                    <el-button size="mini" type="text" icon="el-icon-info" @click="handleFlowable(scope.row)">查看流程</el-button>
+                                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleFlowable(scope.row)">查看流程</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <statistical-data>
+                            <span class="label">总合计:<span class="value">{{ysxAmount}}</span></span>
+                            <span class="label">已生效:{{ysxAmount}}</span>
+                        </statistical-data>
                         <pagination v-show="totalSign>0" :total="totalSign" :page.sync="queryParamsSign.pageNum" :limit.sync="queryParamsSign.pageSize" @pagination="getListSign" />
-                        <span>总合计:{{ysxAmount}}</span>
-                        <span>已生效:{{ysxAmount}}</span>
                     </el-tab-pane>
 
                     <!--融资中-->

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

@@ -191,12 +191,20 @@
             <el-button type="success" @click="getContractFile(false)">签署</el-button>
             <el-button @click="cancel">取消</el-button>
         </div>
+        <!-- pdf -->
         <el-dialog
             :visible.sync="pdfShowDialog"
             width="70%" height = "60%" append-to-body  >
-            <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
+            <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent" @PDFData="PDFData">
             </pdf-show>
         </el-dialog>
+        <!-- pdf -->
+        <el-dialog
+            :visible.sync="pdfShowDialogs"
+            width="70%" height = "60%" append-to-body :show-close="false" >
+            <pdf-shows :pdfFileLists="pdfFileLists" :zfiId="this.form.zfiId" :parents="parents">
+            </pdf-shows>
+        </el-dialog>
          <!--选择签署意愿类型-->
         <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">
@@ -263,10 +271,11 @@ import {getContractFile,sealRefuse,getCreditSealFile} from "@/api/service/credit
 import {sendMessage,checkCode,faceAuth,checkFaceAuth,contractSigning} from "@/api/service/credit/message";
 import {cfcaProjectNo,projectSendMessage,checkProCode} from "@/api/service/credit/cfcaProject";
 import pdfShow from "./pdfShow";
+import pdfShows from "./showStampedPdf";
 import {getToken} from "@/utils/auth";
 export default {
     name: "CreditSeal",
-    components: {pdfShow},
+    components: {pdfShow,pdfShows},
     data() {
         return {
             // 总条数
@@ -304,6 +313,8 @@ export default {
             otherFileList:[],
             pdfShowDialog : false,
             pdfFileList : [],
+            pdfShowDialogs : false,
+            pdfFileLists : [],
             //展示选择意愿
             confirmIsShow:false,
             //意愿
@@ -352,6 +363,7 @@ export default {
             //项目编号
             projectCode:"",
             parent : this,
+            parents : this,
         };
     },
     activated() {
@@ -412,6 +424,12 @@ export default {
         })
     },
     methods: {
+        PDFData(val){
+            console.log(val,"子传父")
+            this.pdfFileLists = val;
+            this.pdfShowDialogs = true;
+            
+        },
         //列表格式化金额
         moneyFormat(row, column, cellValue) {
         if (cellValue == null || cellValue == undefined || cellValue == "") {
@@ -998,6 +1016,10 @@ export default {
     },
     closePdfShow(){
         this.pdfShowDialog = false;
+        
+    },
+    closePdfShows(){
+        this.pdfShowDialogs = false;
     },
     //返回到列表页
      goParent(){

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

@@ -461,17 +461,16 @@
     </el-dialog>
 
     <!-- 合同预览 -->
-    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body>
+    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="pdfIsShow">
       <pdf-show
         :pdfFileList="pdfFileList"
         :zfiId="this.form.zfiId"
         :parent="parent"
       ></pdf-show>
       <span slot="footer" class="dialog-footer" style="float: right">
-        <el-button type="primary" @click="selectType">签署</el-button>
-        <el-button type="primary" plain="" @click="pdfShowDialog = false"
-          >取消</el-button
-        >
+        <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
+        <el-button type="primary" plain="" @click="pdfShowDialog = false" v-if="pdfIsShow">取消</el-button>
+        <el-button type="primary" @click="closePDF" v-if="!pdfIsShow">确定</el-button>
       </span>
     </el-dialog>
 
@@ -635,6 +634,7 @@ export default {
   components: { DetailBill, pdfShow },
   data() {
     return {
+      pdfIsShow: true,
       //往来账款id
       zbiId: "",
       //融资账户是够编辑
@@ -1605,14 +1605,36 @@ export default {
             //关闭人脸二维码
             self.faceIsShow = false;
           }
-          self.closePdfShow();
-          self.$router.push({ path: "/Bill/financeRecord"});
+          //self.closePdfShow();
+          //self.$router.push({ path: "/Bill/financeRecord"});
           //self.cancel();
+          let queryStamped = {};
+          queryStamped.zfrId = this.zfrId
+          const load = self.$loading({
+            lock: true,
+            text: "Loading",
+            background: "rgba(0, 0, 0,0)",
+          });
+          listStamped(queryStamped).then((response) =>{
+            if(response.data){
+              this.pdfFileList = response.data.list;
+            }
+            this.pdfShowDialog = true;
+            this.pdfIsShow = false;
+            load.close()
+          }).catch((response) => {
+             load.close();
+          });
         })
         .catch((response) => {
           loading.close();
         });
     },
+    closePDF(){
+      //关闭预览合同
+      this.closePdfShow();
+      this.$router.push({ path: "/Bill/financeRecord"});
+    }
   },
 };
 </script>

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

@@ -127,21 +127,24 @@
                     </div>    
             </el-dialog>
         </div>
+        
     </div>
     
 </template>
 
 
 <script>
-import {sendMessage,checkCode,faceAuth,checkFaceAuth,contractSigning} from "@/api/service/credit/message";
+import {sendMessage,checkCode,faceAuth,checkFaceAuth,contractSigning,listStamped} from "@/api/service/credit/message";
 import {cfcaProjectNo,projectSendMessage,checkProCode} from "@/api/service/credit/cfcaProject";
 import {getCreditDetail,getFinanceSign} from "@/api/service/credit/credit";
 import { amtformat } from "@/utils/amtCommon";
 import Cookies from 'js-cookie';
 export default {
     props : ['pdfFileList','zfiId', 'parent'],
+    components: {},
     data() {
         return {
+            
             activeName: "first",
             dialogVisible: false,
             dialogTableVisible: false,
@@ -214,8 +217,8 @@ export default {
             //显示去融资框
             goShow:false,
             //融信类型
-            zfiCreateType:""
-
+            zfiCreateType:"",
+            parents: this
         };
     },
     created() {
@@ -536,73 +539,91 @@ export default {
                     //关闭人脸二维码
                     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.msgSuccess("确权成功,融信已生效");
-                        this.goParent();
+                
+                let queryStamped = {};
+                queryStamped.zfiId = this.zfiId
+                console.log(this.zfiId,"ooooooooooo")
+                console.log(queryStamped.zfiId,"kkkkkkkkkkk")
+                listStamped(queryStamped).then((response) =>{
+                    debugger
+                    if(response.data){
+                        this.pdfFileLists = response.data.list;
                     }
-                }else if(this.zfiStatus == '01' && this.zfiCreateType == '0'){//签收
-                    getFinanceSign(this.zfiId).then((response) => {
-                        //融信编号
-                        this.financeSignForm.zfiNumber = response.data.zfiNumber;
-                        //融信金额
-                        if(response.data.zfiAmount){
-                            this.financeSignForm.zfiAmount = response.data.zfiAmount;
-                        }else{
-                            this.financeSignForm.zfiAmount = "0.00";
-                        }
-                        //利率
-                        if(response.data.zfiRate){
-                            this.financeSignForm.zfiRate = response.data.zfiRate;
-                        }else{
-                            this.financeSignForm.zfiRate = "0";
-                        }
-                        //最长融信期限
-                        this.financeSignForm.intervalTime = response.data.intervalTime;
-                        //融信有效期
-                        if(response.data.validity){
-                        this.financeSignForm.validity = response.data.validity;
-                        }
-                        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(this.zfiCreateType == '1' && this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01'){//补充资料
-                    getFinanceSign(this.zfiId).then((response) => {
-                        //融信编号
-                        this.financeSignForm.zfiNumber = response.data.zfiNumber;
-                        //融信金额
-                        if(response.data.zfiAmount){
-                            this.financeSignForm.zfiAmount = response.data.zfiAmount;
-                        }else{
-                            this.financeSignForm.zfiAmount = "0.00";
-                        }
-                        //利率
-                        if(response.data.zfiRate){
-                            this.financeSignForm.zfiRate = response.data.zfiRate;
-                        }else{
-                            this.financeSignForm.zfiRate = "0";
-                        }
-                        //最长融信期限
-                        this.financeSignForm.intervalTime = response.data.intervalTime;
-                        //融信有效期
-                        if(response.data.validity){
-                        this.financeSignForm.validity = response.data.validity;
-                        }
-                        this.goShow = true;
-                    });
-                }
+                    
+                    this.$emit("PDFData",this.pdfFileLists)
+                    //关闭文件弹框
+                this.closePdfShow()
+                    // if(this.pdfFileLists.length > 0){
+                        //this.pdfShowDialogs = true;
+                    // }else{
+                    //     //确权：状态为待确权
+                    //     if(this.zfiStatus == '00'){
+                    //         if(this.zfiCreateType == '0'){//申请
+                    //             this.msgSuccess("确权成功，融信已提交,"+this.receiveName+"签收");
+                    //             this.goParent();
+                    //         }else if(this.zfiCreateType == '2'){//供应商开立
+                    //             this.msgSuccess("确权成功,融信已生效");
+                    //             this.goParent();
+                    //         }
+                    //     }else if(this.zfiStatus == '01' && this.zfiCreateType == '0'){//签收
+                    //         getFinanceSign(this.zfiId).then((response) => {
+                    //             //融信编号
+                    //             this.financeSignForm.zfiNumber = response.data.zfiNumber;
+                    //             //融信金额
+                    //             if(response.data.zfiAmount){
+                    //                 this.financeSignForm.zfiAmount = response.data.zfiAmount;
+                    //             }else{
+                    //                 this.financeSignForm.zfiAmount = "0.00";
+                    //             }
+                    //             //利率
+                    //             if(response.data.zfiRate){
+                    //                 this.financeSignForm.zfiRate = response.data.zfiRate;
+                    //             }else{
+                    //                 this.financeSignForm.zfiRate = "0";
+                    //             }
+                    //             //最长融信期限
+                    //             this.financeSignForm.intervalTime = response.data.intervalTime;
+                    //             //融信有效期
+                    //             if(response.data.validity){
+                    //             this.financeSignForm.validity = response.data.validity;
+                    //             }
+                    //             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(this.zfiCreateType == '1' && this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01'){//补充资料
+                    //         getFinanceSign(this.zfiId).then((response) => {
+                    //             //融信编号
+                    //             this.financeSignForm.zfiNumber = response.data.zfiNumber;
+                    //             //融信金额
+                    //             if(response.data.zfiAmount){
+                    //                 this.financeSignForm.zfiAmount = response.data.zfiAmount;
+                    //             }else{
+                    //                 this.financeSignForm.zfiAmount = "0.00";
+                    //             }
+                    //             //利率
+                    //             if(response.data.zfiRate){
+                    //                 this.financeSignForm.zfiRate = response.data.zfiRate;
+                    //             }else{
+                    //                 this.financeSignForm.zfiRate = "0";
+                    //             }
+                    //             //最长融信期限
+                    //             this.financeSignForm.intervalTime = response.data.intervalTime;
+                    //             //融信有效期
+                    //             if(response.data.validity){
+                    //             this.financeSignForm.validity = response.data.validity;
+                    //             }
+                    //             this.goShow = true;
+                    //         });
+                    //     }
+                    // }
+                })
+                
                 
             }).catch((response) => {
                 loading.close();
@@ -661,12 +682,27 @@ export default {
         });
     },
     closePdfShow(){
-        this.parent.closePdfShow();
+         this.parent.closePdfShow();
     },
+    
     //返回到列表页
     goParent(){
        this.parent.goParent();
     },
+    // closePdfShows(){
+    //     this.pdfShowDialogs = false;
+    // },
+    // //返回到列表页
+    //  goParents(){
+    //      var self = this
+    //     this.pdfShowDialogs = false;
+    //     self.$store.dispatch(
+    //         "tagsView/delView",
+    //         self.$route
+    //         );
+    //      //self.$router.push("/Bill/credit")
+    //      self.$router.push("/Bill/pdfShow")
+    // },
     //去融资
     goFinance(){
         //关闭弹框

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

@@ -0,0 +1,437 @@
+<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 pdfFileLists" :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> -->
+                    <el-button @click="submit" 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> -->
+                    <p>签收融信成功，融信信息：</p>
+                    <el-form ref="financeSignForm" :model="financeSignForm" label-width="auto" :inline="true">
+                        <el-row>
+                            <el-form-item label="融信编号：">{{financeSignForm.zfiNumber}}</el-form-item>
+                            <el-form-item label="融信金额：">{{handleInput(financeSignForm.zfiAmount) + "元"}}</el-form-item>
+                            <el-form-item label="大写：">{{smallToBig(financeSignForm.zfiAmount)}}</el-form-item>
+                        </el-row>
+                        <el-row>
+                            <el-form-item label="融信利率：">{{financeSignForm.zfiRate + "%"}}</el-form-item>
+                            <el-form-item label="最长融信期限：">{{financeSignForm.intervalTime + "天"}}</el-form-item>
+                            <el-form-item label="融信有效期：">{{financeSignForm.validity}}</el-form-item>
+                        </el-row>
+                    </el-form>
+                    <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,listStamped} from "@/api/service/credit/message";
+import {cfcaProjectNo,projectSendMessage,checkProCode} from "@/api/service/credit/cfcaProject";
+import {getCreditDetail,getFinanceSign} from "@/api/service/credit/credit";
+import { amtformat } from "@/utils/amtCommon";
+import Cookies from 'js-cookie';
+export default {
+    props : ['pdfFileLists','zfiId', 'parents'],
+    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:{},
+            financeSignForm:{},
+            //控制短信验证码倒计时是否展示
+            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,
+            //融信类型
+            zfiCreateType:"",
+        };
+    },
+    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.zfiCreateType = response.data.financeInf.zfiCreateType;
+             }
+        })
+        this.dialogVisible = true;
+        for(var i = 0 ; i < this.pdfFileLists.length; i++){
+            var base64 = this.pdfFileLists[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();
+        },
+    //回到父页
+    cancelGo(){
+        this.goShow = false;
+        this.goParent();
+    },
+    
+    closePdfShows(){
+        this.parents.closePdfShows();
+    },
+    //返回到列表页
+    goParent(){
+       this.parents.goParent();
+    },
+    //去融资
+    goFinance(){
+        //关闭弹框
+        this.goShow = false;
+         this.goParent();
+        Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
+        this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });
+    },
+    submit(){
+        //状态判断为盖完章之后的
+        debugger
+        //确权：状态为待确权
+        if(this.zfiStatus == '01' && this.zfiCreateType == '0'){
+           //供应商申请
+            this.msgSuccess("确权成功，融信已提交,"+this.receiveName+"签收");
+            this.closePdfShows();
+            this.goParent();
+        }
+        else if(this.zfiStatus == '02' && this.zfiCreateType == '2'){//供应商开立
+                this.msgSuccess("确权成功,融信已生效");
+                this.closePdfShows();
+                this.goParent();
+            }else if(this.zfiStatus == '02' && this.zfiCreateType == '0'){//签收
+            getFinanceSign(this.zfiId).then((response) => {
+                //融信编号
+                this.financeSignForm.zfiNumber = response.data.zfiNumber;
+                //融信金额
+                if(response.data.zfiAmount){
+                    this.financeSignForm.zfiAmount = response.data.zfiAmount;
+                }else{
+                    this.financeSignForm.zfiAmount = "0.00";
+                }
+                //利率
+                if(response.data.zfiRate){
+                    this.financeSignForm.zfiRate = response.data.zfiRate;
+                }else{
+                    this.financeSignForm.zfiRate = "0";
+                }
+                //最长融信期限
+                this.financeSignForm.intervalTime = response.data.intervalTime;
+                //融信有效期
+                if(response.data.validity){
+                this.financeSignForm.validity = response.data.validity;
+                }
+                this.goShow = true;
+            });
+        }else if(this.zfiCreateType == '1' && this.zfiCoreStatus == '01' && this.zfiStatus=='01'){//核心开立
+            this.msgSuccess("开立成功，融信已提交"+this.receiveName+"签收");
+            this.closePdfShows();
+            this.goParent();
+        }else if(this.zfiCreateType == '2' && this.zfiPlatformStatus == '01' && this.zfiSupplierStatus == '01' && this.zfiStatus=='00'){
+            //融资开立盖章
+            this.msgSuccess("开立成功,待:"+this.openName+"确权；确权结果请留意待办事项与站内消息");
+            this.closePdfShows();
+            this.goParent();
+        }else if(this.zfiCreateType == '1' && this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01'){//补充资料
+            getFinanceSign(this.zfiId).then((response) => {
+                //融信编号
+                this.financeSignForm.zfiNumber = response.data.zfiNumber;
+                //融信金额
+                if(response.data.zfiAmount){
+                    this.financeSignForm.zfiAmount = response.data.zfiAmount;
+                }else{
+                    this.financeSignForm.zfiAmount = "0.00";
+                }
+                //利率
+                if(response.data.zfiRate){
+                    this.financeSignForm.zfiRate = response.data.zfiRate;
+                }else{
+                    this.financeSignForm.zfiRate = "0";
+                }
+                //最长融信期限
+                this.financeSignForm.intervalTime = response.data.intervalTime;
+                //融信有效期
+                if(response.data.validity){
+                this.financeSignForm.validity = response.data.validity;
+                }
+                this.goShow = true;
+            });
+        }
+    },
+    /* 金额展示 */
+    handleInput(str) {
+        return amtformat(str, 2, ".", ",");
+    },
+    /* //  将数字金额转换为大写金额 */
+    smallToBig(money) {
+      //  将数字金额转换为大写金额
+      var cnNums = new Array(
+        "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" ); //汉字的数字
+      var cnIntRadice = new Array("", "拾", "佰", "仟"); //基本单位
+      var cnIntUnits = new Array("", "万", "亿", "兆"); //对应整数部分扩展单位
+      var cnDecUnits = new Array("角", "分", "毫", "厘"); //对应小数部分单位
+      var cnInteger = "整"; //整数金额时后面跟的字符
+      var cnIntLast = "元"; //整数完以后的单位
+      //最大处理的数字
+      var maxNum = 999999999999999.9999;
+      var integerNum; //金额整数部分
+      var decimalNum; //金额小数部分
+      //输出的中文金额字符串
+      var chineseStr = "";
+      var parts; //分离金额后用的数组，预定义
+      if (money == "" || money == null || money == undefined) {
+        return "零元零角零分";
+      }
+      money = parseFloat(money);
+      if (money >= maxNum) {
+        //超出最大处理数字
+        return "超出最大处理数字";
+      }
+      if (money == 0) {
+        chineseStr = cnNums[0] + cnIntLast + cnInteger;
+        return chineseStr;
+      }
+      //四舍五入保留两位小数,转换为字符串
+      money = Math.round(money * 100).toString();
+      integerNum = money.substr(0, money.length - 2);
+      decimalNum = money.substr(money.length - 2);
+      //获取整型部分转换
+      if (parseInt(integerNum, 10) > 0) {
+        var zeroCount = 0;
+        var IntLen = integerNum.length;
+        for (var i = 0; i < IntLen; i++) {
+          var n = integerNum.substr(i, 1);
+          var p = IntLen - i - 1;
+          var q = p / 4;
+          var m = p % 4;
+          if (n == "0") {
+            zeroCount++;
+          } else {
+            if (zeroCount > 0) {
+              chineseStr += cnNums[0];
+            }
+            //归零
+            zeroCount = 0;
+            chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
+          }
+          if (m == 0 && zeroCount < 4) {
+            chineseStr += cnIntUnits[q];
+          }
+        }
+        chineseStr += cnIntLast;
+      }
+      //小数部分
+      if (decimalNum != "") {
+        var decLen = decimalNum.length;
+        for (var i = 0; i < decLen; i++) {
+          var n = decimalNum.substr(i, 1);
+          if (n != "0") {
+            chineseStr += cnNums[Number(n)] + cnDecUnits[i];
+          }
+        }
+      }
+      if (chineseStr == "") {
+        chineseStr += cnNums[0] + cnIntLast + cnInteger;
+      } else if (decimalNum == "" || /^0*$/.test(decimalNum)) {
+        chineseStr += cnInteger;
+      }
+      return chineseStr;
+    },
+    },
+};
+</script>

front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -99,7 +99,7 @@
                 </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8">
-                <el-form-item label="核心企业还款账户开户行:" prop="zfpcrAccountBank" label-width="142px" v-if="this.companyType == '00'" size="large">
+                <el-form-item label="核心企业还款账户开户行:" prop="zfpcrAccountBank" label-width="200px"  size="large">
                     <el-input v-model="form.zfpcrAccountBank" placeholder="请输入核心企业还款账户开户行" maxlength="30" readonly>
                     </el-input>
                 </el-form-item>

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

@@ -423,17 +423,16 @@
     </el-dialog>
 
     <!-- 合同预览 -->
-    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body>
+    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="pdfIsShow">
       <pdf-show
         :pdfFileList="pdfFileList"
         :zfiId="this.form.zfiId"
         :parent="parent"
       ></pdf-show>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="selectType">签署</el-button>
-        <el-button type="primary" plain="" @click="pdfShowDialog = false"
-          >取消</el-button
-        >
+        <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
+        <el-button type="primary" plain="" @click="pdfShowDialog = false" v-if="pdfIsShow">取消</el-button>
+        <el-button type="primary" @click="closePDF" v-if="!pdfIsShow">确定</el-button>
       </span>
     </el-dialog>
 
@@ -597,6 +596,7 @@ export default {
   components: { DetailBill, pdfShow },
   data() {
     return {
+      pdfIsShow: true,
       //往来账款id
       zbiId: "",
       //融资账户是够编辑
@@ -1538,12 +1538,36 @@ export default {
             //关闭人脸二维码
             self.faceIsShow = false;
           }
-          self.cancel();
+          // self.cancel();
+          //关闭预览合同
+          //self.closePdfShow();
+          let queryStamped = {};
+          queryStamped.zfrId = this.zfrId
+          const load = self.$loading({
+            lock: true,
+            text: "Loading",
+            background: "rgba(0, 0, 0,0)",
+          });
+          listStamped(queryStamped).then((response) =>{
+            if(response.data){
+              this.pdfFileList = response.data.list;
+            }
+            this.pdfShowDialog = true;
+            this.pdfIsShow = false;
+            load.close()
+          }).catch((response) => {
+             load.close();
+          });
         })
         .catch((response) => {
           loading.close();
         });
     },
+    closePDF(){
+      this.cancel();
+          //关闭预览合同
+          this.closePdfShow();
+    }
   },
 };
 </script>

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

@@ -15,11 +15,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParams.zfrQuery" size="large">
                 <el-input v-model="queryParams.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParams.zfrQueryStatus" 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> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" label-width="96px" size="large">
                 <el-date-picker v-model="queryParams.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -40,11 +40,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParamsIng.zfrQuery" size="large">
                 <el-input v-model="queryParamsIng.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParamsIng.zfrQueryStatus" 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> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsIng.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -65,11 +65,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParamsEnd.zfrQuery" size="large">
                 <el-input v-model="queryParamsEnd.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParamsEnd.zfrQueryStatus" 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> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsEnd.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -90,11 +90,11 @@
             <el-form-item prop="zfrValue" v-if="this.queryParamsLose.zfrQuery && this.queryParamsLose.zfrQuery != '03' " size="large">
                 <el-input v-model="queryParamsLose.zfrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25" />
             </el-form-item>
-            <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
+            <!-- <el-form-item label="融资状态" prop="zfrQueryStatus" size="large">
                 <el-select v-model="queryParamsLose.zfrQueryStatus" 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> -->
             <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsLose.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
@@ -114,9 +114,9 @@
                                 <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (this.companyType == '00' || this.companyType == '02')" />
+                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (companyType == '00' || companyType == '02')" />
                         <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber" />
-                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (this.companyType == '01' || this.companyType == '00')" />
+                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (companyType == '01' || companyType == '00')" />
                         <el-table-column label="开立方" align="center" prop="coreScyName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.coreScyName" />
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
@@ -125,12 +125,12 @@
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
-                        <el-table-column label="内部审核" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && this.companyType == '02'" />
+                        <el-table-column label="内部审核" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && companyType == '02'" />
                         <el-table-column label="融资状态" :formatter="statusFormat" align="center" prop="zfrStatus" :show-overflow-tooltip="true" v-if="uncheckList.zfrStatus" />
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                             <template slot-scope="scope">
                                 <el-button class="zap-button-plain" size="mini" @click="handleDetail(scope.row)" v-hasPermi="['finance:record:query']">详情</el-button>
-                                <el-button class="zap-button-parimary" size="mini" type="primary" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '01')">放款登记</el-button>
+                                <el-button class="zap-button-parimary" size="mini" type="primary" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' && (companyType =='00' || companyType =='03')">放款登记</el-button>
                                 <el-button class="zap-button-waring" size="mini" type="warning" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
                                 <el-button class="zap-button-parimary" size="mini" type="primary" @click="seal(scope.row)" v-hasPermi="['finance:record:seal']" v-if="scope.row.zfrApproveStt == '01' && scope.row.zfrStatus == '04'">融资</el-button>
                                 <el-button class="zap-button-info" size="mini" @click="cancelFtp(scope.row)" v-if="scope.row.zfrApproveStt == '01' && scope.row.zfrStatus == '04'">作废</el-button>
@@ -150,9 +150,9 @@
                                 <span>{{(queryParamsIng.pageNum - 1) * queryParamsIng.pageSize +scope.$index + 1}}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (this.companyType == '00' || this.companyType == '02')" />
+                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (companyType == '00' || companyType == '02')" />
                         <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber" />
-                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (this.companyType == '01' || this.companyType == '00')" />
+                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (companyType == '01' || companyType == '00')" />
                         <el-table-column label="开立方" align="center" prop="coreScyName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.coreScyName" />
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
@@ -161,12 +161,12 @@
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
-                        <el-table-column label="内部审核" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && this.companyType == '02'" />
+                        <el-table-column label="内部审核" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && companyType == '02'" />
                         <el-table-column label="融资状态" :formatter="statusFormat" align="center" prop="zfrStatus" :show-overflow-tooltip="true" v-if="uncheckList.zfrStatus" />
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)" v-hasPermi="['finance:record:query']">详情</el-button>
-                                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' && scope.row.companyType ==('00' || '01')">放款登记</el-button>
+                                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' &&(companyType =='00' || companyType =='03')">放款登记</el-button>
                                 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
                                 <el-button size="mini" type="text" icon="el-icon-info" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">查看流程</el-button>
                             </template>
@@ -184,9 +184,9 @@
                                 <span>{{ (queryParamsEnd.pageNum - 1) * queryParamsEnd.pageSize + scope.$index + 1 }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (this.companyType == '00' || this.companyType == '02')" />
+                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (companyType == '00' || companyType == '02')" />
                         <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber" />
-                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (this.companyType == '01'|| this.companyType == '00')" />
+                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (companyType == '01'|| companyType == '00')" />
                         <el-table-column label="开立方" align="center" prop="coreScyName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.coreScyName" />
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
@@ -195,7 +195,7 @@
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
-                        <el-table-column label="内部审核" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && this.companyType == '02'" />
+                        <el-table-column label="内部审核" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && companyType == '02'" />
                         <el-table-column label="融资状态" :formatter="statusFormat" align="center" prop="zfrStatus" :show-overflow-tooltip="true" v-if="uncheckList.zfrStatus" />
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                             <template slot-scope="scope">
@@ -216,9 +216,9 @@
                                 <span>{{ (queryParamsLose.pageNum - 1) * queryParamsLose.pageSize + scope.$index + 1}}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (this.companyType == '00' || this.companyType == '02')" />
+                        <el-table-column label="融信编号" align="center" prop="zfiNumner" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfiNumner  && (companyType == '00' || companyType == '02')" />
                         <el-table-column label="融资编号" align="center" prop="zfrNumber" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrNumber" />
-                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (this.companyType == '01'|| this.companyType == '00')" />
+                        <el-table-column label="融资方" align="center" prop="supplierScyName" width="180" :show-overflow-tooltip="true" v-if="uncheckList.supplierScyName && (companyType == '01'|| companyType == '00')" />
                         <el-table-column label="开立方" align="center" prop="coreScyName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.coreScyName" />
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
@@ -227,7 +227,7 @@
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
-                        <el-table-column label="内部审批" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && this.companyType == '02'" />
+                        <el-table-column label="内部审批" :formatter="approveFormat" align="center" prop="zfrApproveStt" :show-overflow-tooltip="true" v-if="uncheckList.zfrApproveStt && companyType == '02'" />
                         <el-table-column label="融资状态" :formatter="statusFormat" align="center" prop="zfrStatus" :show-overflow-tooltip="true" v-if="uncheckList.zfrStatus" />
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                             <template slot-scope="scope">
@@ -345,9 +345,9 @@ export default {
     data() {
         return {
             //企业Id
-            companyId: "",
+            companyId: null,
             //企业类型
-            companyType: "",
+            companyType: null,
             //上传使用
             dialogImageUrl: "",
             dialogVisible: false,
@@ -416,7 +416,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             queryParamsIng: {
                 pageNum: 1,
@@ -436,7 +436,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             queryParamsEnd: {
                 pageNum: 1,
@@ -456,7 +456,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             queryParamsLose: {
                 pageNum: 1,
@@ -476,7 +476,7 @@ export default {
                 zfrTypes: "00",
                 zfrQuery: null,
                 zfrValue: null,
-                zfrQueryStatus: '05'
+                // zfrQueryStatus: '05'
             },
             // 表单参数
             form: {},
@@ -762,6 +762,7 @@ export default {
         });
         this.getList().then(() => {
             getUserProfile().then(response => {
+                console.log(this.companyType)
                 if ("00" == response.data.companyType) {
                     this.queryParams.zfrQuery = "02";
                 } else if ("01" == response.data.companyType) {
@@ -772,6 +773,7 @@ export default {
             });
         });
         this.getIngList().then(() => {
+            
             getUserProfile().then(response => {
                 if ("00" == response.data.companyType) {
                     this.queryParamsIng.zfrQuery = "02";

front-vue/src/views/service/financeRecord/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,'')"/>

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

@@ -424,17 +424,17 @@
     </el-dialog>
 
     <!-- 合同预览 -->
-    <el-dialog title="合同预览" :visible.sync="pdfShowDialog" width="60%" append-to-body>
+    <el-dialog title="合同预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="pdfIsShow">
       <pdf-show
         :pdfFileList="pdfFileList"
         :zfiId="this.form.zfiId"
         :parent="parent"
       ></pdf-show>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="selectType">签署</el-button>
-        <el-button type="primary" plain="" @click="pdfShowDialog = false"
-          >取消</el-button
-        >
+        <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
+        <el-button type="primary" plain="" @click="pdfShowDialog = false" v-if="pdfIsShow"
+          >取消</el-button>
+          <el-button type="primary" @click="closePDF" v-if="!pdfIsShow">确定</el-button>
       </span>
     </el-dialog>
 
@@ -573,6 +573,7 @@ import {
   updateChargeStatus,
   listChargeStatus,
   cancelContract,
+  listStamped
 } from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
 import { getFile } from "@/api/service/credit/credit";
@@ -601,6 +602,7 @@ export default {
   components: { DetailBill, pdfShow },
   data() {
     return {
+      pdfIsShow: true,
       //往来账款id
       zbiId: "",
       //融资账户是够编辑
@@ -1190,6 +1192,7 @@ export default {
           }
           //文件存在
           if (this.pdfFileList.length > 0) {
+            this.pdfIsShow = true
             this.pdfShowDialog = true;
           } else {
             this.$message({
@@ -1570,14 +1573,36 @@ export default {
             //关闭人脸二维码
             self.faceIsShow = false;
           }
-          self.cancel();
+          // self.cancel();
           //关闭预览合同
-          self.closePdfShow();
+          //self.closePdfShow();
+          let queryStamped = {};
+          queryStamped.zfrId = this.zfrId
+          const load = self.$loading({
+            lock: true,
+            text: "Loading",
+            background: "rgba(0, 0, 0,0)",
+          });
+          listStamped(queryStamped).then((response) =>{
+            if(response.data){
+              this.pdfFileList = response.data.list;
+            }
+            this.pdfShowDialog = true;
+            this.pdfIsShow = false;
+            load.close()
+          }).catch((response) => {
+             load.close();
+          });
         })
         .catch((response) => {
           loading.close();
         });
     },
+    closePDF(){
+      this.cancel();
+          //关闭预览合同
+          this.closePdfShow();
+    }
   },
 };
 </script>

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

@@ -348,6 +348,7 @@
             <el-col :span="12">
               <el-form-item label="手机号" prop="userName">
                 <el-input
+                clearable
                   v-model="form.userName"
                   placeholder="请输入手机号"
                   maxlength="11"
@@ -1484,19 +1485,37 @@ export default {
     },
     //上传前校验
     beforeAvatarUpload(file) {
-      const isJPG =
-        file.type === "image/jpeg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp";
-      const isLt2M = file.size / 1024 / 1024 < 3;
+      var testmsg = files.name.substring(files.name.lastIndexOf(".") + 1);
+            const extension = testmsg === "jpg";
+            const extension2 = testmsg === "jpeg";
+            const extension3 = testmsg === "png";
+            const extension4 = testmsg === "JPG";
+            const extension5 = testmsg === "JPEG";
+            const extension6 = testmsg === "PNG";
+            if (
+                !extension &&
+                !extension2 &&
+                !extension3 &&
+                !extension4 &&
+                !extension5 &&
+                !extension6
+            ) {
+                this.$message.warning(`请选择图片格式文件`);
+            }
+            return extension || extension2 || extension3;
+      // const isJPG =
+      //   file.type === "image/jpeg" ||
+      //   file.type === "image/png" ||
+      //   file.type === "image/bmp";
+      // const isLt2M = file.size / 1024 / 1024 < 3;
 
-      if (!isJPG) {
-        this.$message.error("上传图片只能是 JPG/PNG/BMP 格式");
-      }
-      if (!isLt2M) {
-        this.$message.error("上传图片大小不能超过 3MB");
-      }
-      return isJPG && isLt2M;
+      // if (!isJPG) {
+      //   this.$message.error("上传图片只能是 JPG/PNG/BMP 格式");
+      // }
+      // if (!isLt2M) {
+      //   this.$message.error("上传图片大小不能超过 3MB");
+      // }
+      // return isJPG && isLt2M;
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {