xuefy 3 years ago
parent
commit
e03ca74d80

+ 1 - 1
front-vue/src/api/service/credit/creditHandle.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 确权
 export function approveCredit(data) {
   return request({
-    url: '/sc-service/creditHandle',
+    url: '/sc-service/ownCreditHandle',
     method: 'put',
     data: data
   })

+ 48 - 0
front-vue/src/api/service/credit/message.js

@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+//发送短信
+export function sendMessage() {
+  return request({
+    url: '/sc-service/ownMessage/sendMessage',
+    method: 'get'
+  })
+}
+
+
+//校验验证码
+export function checkCode(query) {
+  return request({
+    url: '/sc-service/ownMessage/checkCode',
+    method: 'get',
+    params: query
+  })
+}
+
+
+//人脸识别
+export function faceAuth() {
+  return request({
+    url: '/sc-service/ownMessage/faceAuth',
+    method: 'get'
+  })
+}
+
+
+//人脸识别结果查证
+export function checkFaceAuth(query) {
+  return request({
+    url: '/sc-service/ownMessage/checkFaceAuth',
+    method: 'get',
+    params: query
+  })
+}
+
+
+//盖章
+export function contractSigning(query) {
+  return request({
+    url: '/sc-service/ownMessage/contractSigning',
+    method: 'post',
+    data: query
+  })
+}

+ 36 - 77
front-vue/src/views/service/credit/addCredit.vue

@@ -35,7 +35,10 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="签发有效期" prop="zfiEffectiveDate">
-                        <el-date-picker clearable size="small" style="width: 200px" v-model="form.zfiEffectiveDate" type="date" value-format="yyyy-MM-dd" placeholder="选择签发有效期">
+                        <el-date-picker clearable size="small" style="width: 200px" v-model="form.zfiEffectiveDate" 
+                        type="date" value-format="yyyy-MM-dd"
+                        placeholder="选择签发有效期"
+                        :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -72,7 +75,10 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="承诺还款日" prop="zfiExpireDate">
-                        <el-date-picker clearable size="small" style="width: 200px" v-model="form.zfiExpireDate" type="date" value-format="yyyy-MM-dd" placeholder="选择承诺还款日">
+                        <el-date-picker clearable size="small" style="width: 200px" v-model="form.zfiExpireDate"
+                         type="date" value-format="yyyy-MM-dd" 
+                         placeholder="选择承诺还款日"
+                         :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -87,7 +93,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -95,14 +101,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -110,14 +116,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -125,7 +131,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -172,27 +178,11 @@
                 <el-button size="mini" type="primary" @click="closeTicket">确认</el-button>
             </span>
         </el-dialog>
-        <!--选择签署意愿类型-->
-        <el-dialog  :visible.sync="confirmIsShow" width="600px" append-to-body :before-close = "cancelUpdate">
-            <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="getContractFile">确 定</el-button>
-                <el-button @click="cancelUpdate">取 消</el-button>
-            </div>
-        </el-dialog>
         <el-dialog
             title="预览"
             :visible.sync="pdfShowDialog"
             width="30%">
-            <pdf-show
-            :pdfFileList="pdfFileList"
-            >
+            <pdf-show :pdfFileList="pdfFileList">
             </pdf-show>
         </el-dialog>
     </div>
@@ -206,10 +196,10 @@ import {
     addCredit,
     getFile
 } from "@/api/service/credit/credit";
-import {getContractFile} from "@/api/service/credit/creditHandle";
 import { getRandom } from "@/api/common/getRandom";
 import { accAdd } from "@/utils/calculation";
 import pdfShow from "./pdfShow";
+import {getToken} from "@/utils/auth";
 export default {
     name: "addCredit",
     components: {pdfShow},
@@ -327,7 +317,12 @@ export default {
             //意愿
             updateForm:{},
             pdfShowDialog : false,
-            pdfFileList : []
+            pdfFileList : [],
+            pickerOptions:{
+                disabledDate(v){
+                    return v.getTime() < new Date().getTime()-86400000;
+                }
+            }
         };
     },
     created() {
@@ -335,6 +330,7 @@ export default {
         getRandom().then((response) => {
             if (response.data) {
                 this.$set(this.form, "openName", response.data.companyName);
+                this.$set(this.form, "zfiCoreId", response.data.companyId);
             }
         }),
             //获取授信额度
@@ -421,20 +417,6 @@ export default {
             };
             this.resetForm("updateForm");
         },
-        //确定选择意愿
-        confirmSubmit(){
-            if(!this.updateForm.radio){
-                this.$message({
-                    message: '请选择签署意愿类型',
-                    type: 'warning'
-                });
-                return;
-            }
-
-            this.confirmIsShow = false;
-            this.zfpAuthType = this.updateForm.radio;
-            this.selectType();
-        },
         //打开应付账款选择列表
         openTicket() {
             this.getAccountsPay();
@@ -472,6 +454,19 @@ export default {
         handleSelectionChange(val) {
             this.chooseTicket = val;
         },
+        //文件下载
+        handleDownload(row){
+            const pfiUrl = row.pfiUrl;
+            if(pfiUrl != null && pfiUrl != ''){
+            window.open(pfiUrl +"/"+ getToken());
+            }else{
+                this.$message({
+                message: '该附件不存在!',
+                type: 'warning'
+                });
+                return;
+            }
+        },
         // 确认选择
         closeTicket() {
             if (this.chooseTicket) {
@@ -736,25 +731,6 @@ export default {
             }
             return chineseStr;
         },
-        selectType(){
-                this.$refs["form"].validate((valid) => {
-                    if(valid){
-                         //全部
-                        if(this.zfpAuthType == '00'){
-
-                            this.confirmIsShow = true;
-                            
-                        }else if(this.zfpAuthType == '01'){
-                            //人脸
-                            alert("人脸");
-                        }else if(this.zfpAuthType == '02'){
-                            //短信
-                            alert("短信");
-                        }
-                    }
-                    
-                });
-        },
         //新增
         submitForm() {
             this.$refs["form"].validate((valid) => {
@@ -877,23 +853,6 @@ export default {
                 }else{
                     return num;
                 }
-        },
-        //获取合同文件
-        getContractFile(){
-             //产品
-             this.form.zfpcrProductId = this.zfpId;
-             //节点
-             this.form.code = "02";
-             getContractFile(this.form).then((response) => {
-               if(response.data.list){
-                   
-                 this.pdfFileList = response.data.list;
-                   /*   for(var i = 0 ; i < list.length;i++){
-                        var base64 = list[i].base64;
-                        <embed src="base64"  type="application/pdf" title="Embedded PDF" style="overflow: auto; width: 100%; height: 100%;"/>
-                   } */
-               }
-            });
         }
     },
 };

+ 21 - 7
front-vue/src/views/service/credit/addInformation.vue

@@ -141,7 +141,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -149,14 +149,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -164,14 +164,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -179,14 +179,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <div class="footer" style="float: right;
             margin-bottom:2px;">
-            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button type="primary" @click="submitForm">保存</el-button>
             <el-button @click="cancel">取 消</el-button>
         </div>
            <!-- 应收账款信息 -->
@@ -250,6 +250,7 @@
 import {getCreditDetail,getReceiverList,listCreditLine,getAvailableBalance,getAccountsCollection,updateCredit,getFile} from "@/api/service/credit/credit";
 import {addInfor} from "@/api/service/credit/creditHandle";
 import {accAdd} from "@/utils/calculation";
+import {getToken} from "@/utils/auth";
 export default {
     name: "addCredit",
     components: {},
@@ -431,6 +432,19 @@ export default {
             //附件
              this.getFile(this.ticketList);
         },
+        //文件下载
+        handleDownload(row){
+            const pfiUrl = row.pfiUrl;
+            if(pfiUrl != null && pfiUrl != ''){
+            window.open(pfiUrl +"/"+ getToken());
+            }else{
+                this.$message({
+                message: '该附件不存在!',
+                type: 'warning'
+                });
+                return;
+            }
+        },
         /* 删除按钮 */
         handleDelete(index, rows) {
             rows.splice(index, 1);

+ 20 - 6
front-vue/src/views/service/credit/applyCreditEdit.vue

@@ -130,7 +130,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -138,14 +138,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -153,14 +153,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -168,7 +168,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -247,6 +247,7 @@
 <script>
 import {getFile,getCreditDetail,getAccountsCollection,updateCredit} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
+import {getToken} from "@/utils/auth";
 export default {
     name: "addCredit",
     components: {},
@@ -420,6 +421,19 @@ export default {
                 }
             });
         },
+         //文件下载
+        handleDownload(row){
+            const pfiUrl = row.pfiUrl;
+            if(pfiUrl != null && pfiUrl != ''){
+            window.open(pfiUrl +"/"+ getToken());
+            }else{
+                this.$message({
+                message: '该附件不存在!',
+                type: 'warning'
+                });
+                return;
+            }
+        },
         resetQuerys() {
             this.resetForm("formQuery");
             this.handleQuerys();

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

@@ -97,7 +97,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -112,7 +112,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -127,7 +127,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -137,6 +137,7 @@
 <script>
 import {getCreditDetail,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
+import {getToken} from "@/utils/auth";
 export default {
     name: "addCredit",
     components: {},
@@ -266,6 +267,19 @@ export default {
         return $1 + ',';
       }).replace(/\.$/, '');
     },
+    //文件下载
+    handleDownload(row){
+        const pfiUrl = row.pfiUrl;
+        if(pfiUrl != null && pfiUrl != ''){
+        window.open(pfiUrl +"/"+ getToken());
+        }else{
+            this.$message({
+            message: '该附件不存在!',
+            type: 'warning'
+            });
+            return;
+        }
+    },
      /* //  将数字金额转换为大写金额 */
     smallToBig(money) {
       //  将数字金额转换为大写金额

+ 34 - 9
front-vue/src/views/service/credit/confirmationAudit.vue

@@ -94,7 +94,8 @@
                             v-model="form.zfiEffectiveDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择签发有效期">
+                            placeholder="选择签发有效期"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -104,7 +105,8 @@
                             v-model="form.zfiExpireDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择承诺还款日">
+                            placeholder="选择承诺还款日"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col> 
@@ -131,7 +133,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -139,14 +141,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -154,14 +156,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -169,7 +171,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -250,6 +252,7 @@
 import {listSupplierCreditLine,getCreditDetail,getAccountsCollection,getSupplierAvailableBalance,getFile} from "@/api/service/credit/credit";
 import {approveCredit} from "@/api/service/credit/creditHandle";
 import {accAdd} from "@/utils/calculation";
+import {getToken} from "@/utils/auth";
 export default {
     name: "addCredit",
     components: {},
@@ -322,7 +325,12 @@ export default {
             //融信类型
             zfiCreateType:"",
             //是否可编辑
-            isUpdate:false
+            isUpdate:false,
+            pickerOptions:{
+                disabledDate(v){
+                    return v.getTime() < new Date().getTime()-86400000;
+                }
+            }
         };
     },
     watch:{
@@ -397,6 +405,19 @@ export default {
                 this.total = response.data.total;
             });
         },
+        //文件下载
+        handleDownload(row){
+            const pfiUrl = row.pfiUrl;
+            if(pfiUrl != null && pfiUrl != ''){
+            window.open(pfiUrl +"/"+ getToken());
+            }else{
+                this.$message({
+                message: '该附件不存在!',
+                type: 'warning'
+                });
+                return;
+            }
+        },
         resetQuerys() {
             this.resetForm("formQuery");
             this.handleQuerys();
@@ -721,6 +742,10 @@ export default {
                         background: 'rgba(0, 0, 0,0)'
                     });
                     this.form.flag = param;
+                    //产品
+                    this.form.zfpId = this.zfpId;
+                    //利率
+                    this.form.zfiRate = this.zfpcrRate;
                     approveCredit(this.form).then(response => {
                         loading.close();
                         this.msgSuccess("确权成功");

+ 20 - 6
front-vue/src/views/service/credit/creditApply.vue

@@ -115,7 +115,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -123,14 +123,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -138,14 +138,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -153,7 +153,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -232,6 +232,7 @@
 <script>
 import {getAccountsCollection,addCredit,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
+import {getToken} from "@/utils/auth";
 export default {
     name: "creditApply",
     components: {},
@@ -373,6 +374,19 @@ export default {
         handleSelectionChange(val) {
             this.chooseTicket = val
         },
+        //文件下载
+        handleDownload(row){
+            const pfiUrl = row.pfiUrl;
+            if(pfiUrl != null && pfiUrl != ''){
+            window.open(pfiUrl +"/"+ getToken());
+            }else{
+                this.$message({
+                message: '该附件不存在!',
+                type: 'warning'
+                });
+                return;
+            }
+        },
         // 确认选择
       closeTicket() {
         if(this.chooseTicket){

+ 23 - 9
front-vue/src/views/service/credit/creditDetail.vue

@@ -30,20 +30,20 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="授信额度" prop="zfpName" v-if="createType!='0'">
+                    <el-form-item label="授信额度" prop="zfpName" >
                          <el-input v-model="form.zfpName" style="width: 200px"/>
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row>
                 <el-col :span="8">
-                    <el-form-item label="签发有效期" prop="zfiEffectiveDate" v-if="createType!='0'"> 
+                    <el-form-item label="签发有效期" prop="zfiEffectiveDate"> 
                          <el-date-picker disabled size="small" style="width: 200px" v-model="form.zfiEffectiveDate" type="date" value-format="yyyy-MM-dd">
                         </el-date-picker>
                     </el-form-item>
                 </el-col> 
                 <el-col :span="8">
-                    <el-form-item label="承诺还款日" prop="zfiExpireDate" v-if="createType!='0'"> 
+                    <el-form-item label="承诺还款日" prop="zfiExpireDate" > 
                         <el-date-picker disabled size="small" style="width: 200px" v-model="form.zfiExpireDate" type="date" value-format="yyyy-MM-dd">
                         </el-date-picker>
                     </el-form-item>
@@ -89,7 +89,7 @@
         </el-form>
           <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -97,14 +97,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -112,14 +112,14 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -127,7 +127,7 @@
                             size="mini"
                             type="text"
                             icon="el-icon-view"
-                            @click="handleDetail(scope.row)"
+                            @click="handleDownload(scope.row)"
                         >下载</el-button>
                     </template>
                 </el-table-column>
@@ -141,6 +141,7 @@
 <script>
 import {getCreditDetail,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
+import {getToken} from "@/utils/auth";
 export default {
     name: "addCredit",
     components: {},
@@ -257,6 +258,19 @@ export default {
                 }
             });
         },
+            //文件下载
+       handleDownload(row){
+            const pfiUrl = row.pfiUrl;
+            if(pfiUrl != null && pfiUrl != ''){
+            window.open(pfiUrl +"/"+ getToken());
+            }else{
+                this.$message({
+                message: '该附件不存在!',
+                type: 'warning'
+                });
+                return;
+            }
+        },   
     //格式化金额 
     amtFormat(cellValue) {
       if(cellValue == null || cellValue== undefined || cellValue == ''){

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

@@ -133,16 +133,63 @@
         </el-table>
         <div class="footer" style="float: right;
             margin-bottom:2px;">
-            <el-button @click="cancel">取 消</el-button>
+            <el-button type="success" @click="getContractFile">预览文件</el-button>
+            <el-button type="primary" @click="selectType">确定</el-button>
+            <el-button @click="cancel">取消</el-button>
         </div>
+        <el-dialog
+            title="预览"
+            :visible.sync="pdfShowDialog"
+            width="30%">
+            <pdf-show :pdfFileList="pdfFileList">
+            </pdf-show>
+        </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">
+                 <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="600px"  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">
+                    <el-form-item label="验证码" prop="validCode"> 
+                        <el-input v-model="messageForm.validCode" style="width: 200px" maxlength="6"/>
+                    </el-form-item>
+                    <el-form-item> 
+                        <el-button type="success" @click="send">发送验证码</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  :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>
   </div>
 </template>
 <script>
 import {getCreditDetail,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
+import {getContractFile} from "@/api/service/credit/creditHandle";
+import {sendMessage,checkCode,faceAuth,checkFaceAuth,contractSigning} from "@/api/service/credit/message";
+import pdfShow from "./pdfShow";
 export default {
     name: "addCredit",
-    components: {},
+    components: {pdfShow},
     data() {
         return {
             // 总条数
@@ -170,12 +217,36 @@ export default {
             isShow:false,
             //获取类型
             createType:'',
+            //获取融信的类型
+            zfiStatus:'',
+            //融资方审批状态
+            zfiSupplierStatus:'',
             //合同附件
             contractFileList:[],
             //发票附件
             invoiceFileList:[],
             //其他文件
-            otherFileList:[]
+            otherFileList:[],
+            pdfShowDialog : false,
+            pdfFileList : [],
+            //展示选择意愿
+            confirmIsShow:false,
+            //意愿
+            updateForm:{},
+            //意愿类型
+            zfpAuthType:'',
+            //短信展示
+            messageIsShow:false,
+            //短信
+            messageForm:{validCode:""},
+            //人脸二维码
+            fileUrl:"",
+            //控制人脸二维码是否展示
+            faceIsShow:false,
+            //人脸验证结果
+            faceResult:"",
+            //人脸识别结果传参
+            authForm:{}
         };
     },
     created() {
@@ -184,7 +255,14 @@ export default {
              if(response.data){
                 //融信信息
                 this.form = response.data.financeInf;
+                //类型
                 this.createType = response.data.financeInf.zfiCreateType;
+                //融信状态
+                 this.zfiStatus = response.data.financeInf.zfiStatus;
+                 //融资方审批状态
+                 this.zfiSupplierStatus =  response.data.financeInf.zfiSupplierStatus;
+                //意愿类型
+                this.zfpAuthType = response.data.zfpAuthType;
                 //核心开立
                 if(response.data.financeInf.zfiCreateType == '1'){
                       this.tableTitle = "应付账款";
@@ -343,7 +421,207 @@ export default {
         chineseStr += cnInteger;
       }
       return chineseStr;
+    },
+     //取消选择意愿
+    cancelUpdate(){
+        this.confirmIsShow = false;
+        this.resetUpdate();
+    },
+    //关闭短信
+    cancelMessage(){
+        this.messageIsShow = false;
+        this.resetMessage();
+    },
+    //关闭二维码
+    cancelFace(){
+        this.faceIsShow = false;
+    },
+    resetUpdate() {
+        this.updateForm = {
+            radio:""
+        };
+        //意愿类型还原为全部
+        this.zfpAuthType ="00";
+        this.resetForm("updateForm");
+    },
+    resetMessage() {
+        this.messageForm = {
+            validCode:""
+        };
+        this.resetForm("messageForm");
+    },
+     //获取合同文件
+    getContractFile(){
+         getContractFile(this.form).then((response) => {
+                if(response.data.list){
+                    this.pdfFileList = response.data.list;
+                }
+            });
+        //文件存在
+        if(this.pdfFileList.length > 0 ){
+                this.pdfShowDialog = true;
+                
+        }
+    },
+    //选择类型
+    selectType(){
+        //可以直接盖章的
+        if( (this.zfiCreateType =='0' && this.zfiStatus =='01' && this.zfiSupplierStatus =='01') 
+            || (this.zfiCreateType =='1' && this.zfiStatus =='01' && this.zfiSupplierStatus =='01')){
+                //直接盖章
+                this.contractSigning();
+        }else{
+             //选择签署意愿
+              if(this.zfpAuthType == "00"){
+                     this.confirmIsShow = true;
+                }else{
+                    this.checking();
+                }
+        }
+
+    },
+    //确认选择
+    confirmSelect(){
+            if(!this.updateForm.radio){
+                this.$message({
+                    message: '请选择签署意愿类型',
+                    type: 'warning'
+                });
+                return;
+            }
+
+            this.confirmIsShow = false;
+            this.zfpAuthType = this.updateForm.radio;
+            //调用人脸识别或者短信验证
+            this.checking();
+    },
+    //去签署
+    checking(){
+        //人脸
+        if(this.zfpAuthType == '01'){
+          //调用人脸识别生成二维码  
+          faceAuth().then((response) => {
+                if(response.data){
+                    //获取二维码
+                    this.fileUrl = response.data.fileUrl;
+                    //获取源流水号
+                    var originalTxSN = response.data.originalTxSN;
+                    this.faceIsShow = true;
+                    //每5秒查证人脸识别结果
+                    var timeInterval = window.setInterval(() => {
+                            setTimeout(() => {
+                               //源流水不为空并且结果为空
+                               if(originalTxSN && !this.faceResult){
+                                    this.authForm.originalTxSN = originalTxSN;
+                                    //调用查证方法
+                                    checkFaceAuth(this.authForm).then((res) => {
+                                        //认证结果
+                                        this.faceResult = res.data.Verification;
+                                        //成功
+                                        if(this.faceResult == '20'){
+                                            this.msgSuccess("验证成功");
+                                            //关闭验证码
+                                            this.faceIsShow = false;
+                                            //关闭定时
+                                            window.clearInterval(timeInterval);
+                                            //调用盖章
+                                            this.contractSigning();
+                                        }else if(this.faceResult == '30'){
+                                            this.$message({
+                                                message: "验证失败",
+                                                type: 'warning'
+                                            }); 
+                                            //关闭验证码
+                                            this.faceIsShow = false;
+                                            window.clearInterval(timeInterval);
+                                        }
+                                    });
+                               }
+                            }, 0)
+                         },10000)
+                }
+            });
+
+        }else if(this.zfpAuthType == '02'){//短信
+            this.messageIsShow = true;
+        }
+        
+    },
+    //发送短信验证码
+    send(){
+        //发送
+        sendMessage().then((response) => {
+            if(response.data){
+                //手机号
+                var newIphone = response.data.newIphone;
+                //结果
+                var result = response.data.result;
+                //成功
+                if("20" == result){
+                     this.$message({
+                        message: "已向经办人手机号为"+newIphone+"发送短信验证码,请注意查收",
+                        type: 'warning'
+                    });
+                }else if("10" == result){//失败
+                    this.$message({
+                        message: "短信发送失败",
+                        type: 'warning'
+                    });
+                }
+
+            }
+        });
+
+    },
+    //校验验证码是否正确
+    checkCode(){
+            if(!this.messageForm.validCode){
+                     this.$message({
+                        message: "请输入验证码",
+                        type: 'warning'
+                    });
+                    return;
+            }
+            //校验验证码
+            checkCode(this.messageForm).then((response) => {
+                if(response.data){
+                    //结果
+                    var verification = response.data.verification;
+                    //匹配
+                    if("20" == verification){
+                        //进行下一步-- 盖章
+                         this.contractSigning();
+                    }else if("30" == verification){//不匹配
+                         this.$message({
+                            message: "验证有误,请重新输入",
+                            type: 'warning'
+                        });
+                    }
+
+                }
+        });
+    },
+    //盖章
+    contractSigning(){
+         contractSigning(this.form).then((response) => {
+                this.msgSuccess("盖章成功");
+                if(this.zfpAuthType == '02'){
+                    //关闭短信验证
+                    this.messageIsShow = false;
+                }else if(this.zfpAuthType == '01'){
+                    //关闭人脸二维码
+                    this.faceIsShow = false;    
+                }
+                this.$store.dispatch(
+                    "tagsView/delView",
+                    this.$route
+                );
+                this.$router.go(-1);
+            }).catch((response) => {
+            });
     }
+
+    
        
     }
 };

+ 13 - 6
front-vue/src/views/service/credit/creditUpdate.vue

@@ -48,7 +48,8 @@
                             v-model="form.zfiEffectiveDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择签发有效期">
+                            placeholder="选择签发有效期"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -60,7 +61,8 @@
                             v-model="form.zfiExpireDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择承诺还款日">
+                            placeholder="选择承诺还款日"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col> 
@@ -137,7 +139,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -152,7 +154,7 @@
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -167,7 +169,7 @@
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -363,7 +365,12 @@ export default {
           //发票附件
           invoiceFileList:[],
           //其他文件
-          otherFileList:[]   
+          otherFileList:[],
+          pickerOptions:{
+                disabledDate(v){
+                    return v.getTime() < new Date().getTime()-86400000;
+                }
+            }   
         };
     },
     watch:{

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

@@ -76,7 +76,8 @@
                             v-model="form.zfiEffectiveDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择签发有效期">
+                            placeholder="选择签发有效期"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -86,7 +87,8 @@
                             v-model="form.zfiExpireDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择承诺还款日">
+                            placeholder="选择承诺还款日"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col> 
@@ -113,7 +115,7 @@
         </el-form>
           <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -128,7 +130,7 @@
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -143,7 +145,7 @@
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -342,7 +344,12 @@ export default {
             //发票附件
             invoiceFileList:[],
             //其他文件
-            otherFileList:[]
+            otherFileList:[],
+            pickerOptions:{
+                disabledDate(v){
+                    return v.getTime() < new Date().getTime()-86400000;
+                }
+            }  
         };
     },
     created() {

+ 13 - 6
front-vue/src/views/service/credit/financeOpenUpdate.vue

@@ -93,7 +93,8 @@
                             v-model="form.zfiEffectiveDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择签发有效期">
+                            placeholder="选择签发有效期"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -103,7 +104,8 @@
                             v-model="form.zfiExpireDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="选择承诺还款日">
+                            placeholder="选择承诺还款日"
+                            :picker-options="pickerOptions">
                         </el-date-picker>
                     </el-form-item>
                 </el-col> 
@@ -130,7 +132,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -145,7 +147,7 @@
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -160,7 +162,7 @@
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -361,7 +363,12 @@ export default {
             //发票附件
             invoiceFileList:[],
             //其他文件
-            otherFileList:[]
+            otherFileList:[],
+            pickerOptions:{
+                disabledDate(v){
+                    return v.getTime() < new Date().getTime()-86400000;
+                }
+            } 
         };
     },
     watch:{

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

@@ -19,7 +19,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="融资金额:" prop="zfrAmount">
-              <el-input v-model="form.zfrAmount" placeholder="请输入融资金额"  style="width: 284px;"/>
+              <el-input v-model="form.zfrAmount" placeholder="请输入融资金额" disabled style="width: 284px;"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -71,7 +71,7 @@
         </el-table>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-          <el-table :data="invoiceFileList" border style="width: 100%">
+          <el-table :data="invoiceFileList"  style="width: 100%">
             <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                 <template slot-scope="scope">
@@ -86,7 +86,7 @@
           </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-          <el-table :data="contractFileList" border style="width: 100%">
+          <el-table :data="contractFileList"  style="width: 100%">
             <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                 <template slot-scope="scope">
@@ -101,7 +101,7 @@
           </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-          <el-table :data="otherFileList" border style="width: 100%">
+          <el-table :data="otherFileList"  style="width: 100%">
             <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                 <template slot-scope="scope">

+ 7 - 4
front-vue/src/views/service/credit/pdfShow.vue

@@ -2,9 +2,9 @@
     <div>
         <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
 
-        <el-dialog title="提示" :visible.sync="dialogVisible" width="50%" height="1080px;" :before-close="handleClose" append-to-body	>
-            <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-                <el-tab-pane v-for="item in pdfFileList" :key="item.value" label="申请协议" name="first"  style="height:780px;">
+        <el-dialog title="提示" :visible.sync="dialogVisible" width="80%" height="1080px;" :before-close="handleClose" append-to-body	>
+            <el-tabs v-model="activeName" type="card">
+                <el-tab-pane v-for="item in pdfFileList" :key="item.value" label="合同信息" name="first"  style="height:780px;">
                     <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;">
@@ -45,7 +45,7 @@
             </el-tabs>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                <el-button type="primary" @click="selectChildType">确 定</el-button>
             </span>
         </el-dialog>
     </div>
@@ -89,6 +89,9 @@ export default {
                 })
                 .catch((_) => {});
         },
+        selectChildType(){
+            this.$parent.selectType();
+        }
     },
 };
 </script>

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

@@ -49,7 +49,7 @@
         </el-form>
         <!-- 发票附件 -->
         <el-divider content-position="left">发票附件</el-divider>
-        <el-table :data="invoiceFileList" border style="width: 100%">
+        <el-table :data="invoiceFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -64,7 +64,7 @@
         </el-table>
         <!-- 合同附件 -->
         <el-divider content-position="left">合同附件</el-divider>
-        <el-table :data="contractFileList" border style="width: 100%">
+        <el-table :data="contractFileList"  style="width: 100%">
                <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">
@@ -79,7 +79,7 @@
         </el-table>
         <!-- 其他附件 -->
         <el-divider content-position="left">其他附件</el-divider>
-        <el-table :data="otherFileList" border style="width: 100%">
+        <el-table :data="otherFileList"  style="width: 100%">
                 <el-table-column label="文件名称" align="center" prop="pfiFileName" show-overflow-tooltip />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
                     <template slot-scope="scope">