peixh 3 éve
szülő
commit
bd92f6a3a4

+ 2 - 1
front-vue/src/views/service/creditLine/addCreditLine.vue

@@ -532,6 +532,7 @@ export default {
     },
     //打开合同选择列表
     openTicket() {
+      this.resetForm("formQuery");
       this.getContractList()
       this.open = true
       this.title = "合同信息"
@@ -604,7 +605,7 @@ export default {
       if (row.pfiUrl) {
           if (pfiFileName.substr(-3) == "pdf") {
               this.wordUrl = pfiUrl + "/" + getToken();
-          } else if(pfiFileName.substr(-3) == "doc" || pfiFileName.substr(-3) == "docx"){
+          } else if(pfiFileName.substr(-3) == "doc" || pfiFileName.substr(-4) == "docx"){
               this.wordUrl =
                   "https://view.officeapps.live.com/op/view.aspx?src=" +
                   pfiUrl +

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

@@ -119,7 +119,7 @@
         </template>
       </el-table-column>
       <el-table-column label="核心企业" align="center" prop="scyName" show-overflow-tooltip/>
-      <el-table-column label="融资产品" align="center" prop="zfpName" v-if="uncheckList.zfpName" show-overflow-tooltip/>
+      <el-table-column label="融资产品" align="center" prop="zfpName"  show-overflow-tooltip/>
       <el-table-column label="授信额度" :formatter="moneyFormat"  align="center" prop="zfsqAmount" show-overflow-tooltip  width="120"/>
       <el-table-column label="利率(%)" align="center" prop="zfpcrRate"  width="120" />
       <el-table-column label="已使用额度" :formatter="moneyFormat"  align="center" prop="zfiAmount"  width="120"/>

+ 42 - 11
front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -182,16 +182,17 @@
           <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
           <el-table-column label="签署节点"  align="center"  prop="zfcNode"   :formatter="nodeFormat"/>
           <el-table-column label="合同id"  align="center"  prop="zfcId" v-if="false"  />
-          <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.$index, ticketList)"
-              >删除</el-button>
+              <el-button 
+              :disabled="!scope.row.pfiUrl" 
+              style="font-size:12px" 
+              type="text" 
+              icon="el-icon-s-promotion"
+              @click="handlePreview(scope.row)" 
+              >预览</el-button>
             </template>
-          </el-table-column> -->
+          </el-table-column>
         </el-table>
       </el-form-item>
     </el-form>
@@ -268,14 +269,17 @@
 
 <script>
 import { listCreditLine, getCreditLine, delCreditLine, addCreditLine, updateCreditLine} from "@/api/service/creditLine/creditLine";
-import { listFinanceProduct } from "@/api/common/financeProduct"
-import { listCompany } from "@/api/common/company"
-import { listCompanyAcc } from "@/api/common/companyAcc"
+import { listFinanceProduct } from "@/api/common/financeProduct";
+import { listCompany } from "@/api/common/company";
+import { listCompanyAcc } from "@/api/common/companyAcc";
+import { getToken } from "@/utils/auth";
 export default {
   name: "detailCreditLine",
   components: {},
   data() {
     return {
+      wordUrl: '',
+      openWord: false,
       //金额展示
       zfpcrAmountFormat: '',
       //还款账户搜所
@@ -617,6 +621,33 @@ export default {
       this.resetForm("formQuery");
       this.handleQuerys();
     },
+    handlePreview(row) {
+      this.title = "";
+      const pfiUrl = row.pfiUrl;
+      const pfiFileName = row.pfiFileName;
+      console.log(pfiFileName.substr(-3),"laalal");
+      if (row.pfiUrl) {
+          if (pfiFileName.substr(-3) == "pdf") {
+              this.wordUrl = pfiUrl + "/" + getToken();
+          } else if(pfiFileName.substr(-3) == "doc" || pfiFileName.substr(-4) == "docx"){
+              this.wordUrl =
+                  "https://view.officeapps.live.com/op/view.aspx?src=" +
+                  pfiUrl +
+                  "/" +
+                  getToken() +
+                  "/" +
+                  pfiFileName;
+          }else{
+            this.$message({
+              message: "暂不支持该类型文件预览",
+              type: "warning",
+            });
+            return;
+          }
+      }
+
+      this.openWord = true;
+    },
     /** 提交按钮 */
     submitForm() {
       // if(this.ticketList == undefined || this.ticketList.length == 0){

+ 9 - 1
front-vue/src/views/service/creditLine/editCreditLine.vue

@@ -593,6 +593,7 @@ export default {
     },
     //打开合同选择列表
     openTicket() {
+      this.resetForm("formQuery");
       this.getContractList()
       this.open = true
       this.title = "合同信息"
@@ -664,7 +665,7 @@ export default {
       if (row.pfiUrl) {
           if (pfiFileName.substr(-3) == "pdf") {
               this.wordUrl = pfiUrl + "/" + getToken();
-          } else {
+          } else if(pfiFileName.substr(-3) == "doc" || pfiFileName.substr(-4) == "docx"){
               this.wordUrl =
                   "https://view.officeapps.live.com/op/view.aspx?src=" +
                   pfiUrl +
@@ -672,8 +673,15 @@ export default {
                   getToken() +
                   "/" +
                   pfiFileName;
+          }else{
+            this.$message({
+              message: "暂不支持该类型文件预览",
+              type: "warning",
+            });
+            return;
           }
       }
+
       this.openWord = true;
     },
     onSelectAll() {

+ 80 - 35
front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -153,7 +153,7 @@
                 <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" @submit.native.prevent>
                     <el-form-item label="验证码" prop="validCode"> 
@@ -173,6 +173,24 @@
                 <el-button @click="cancelMessage">取 消</el-button>
             </div>
         </el-dialog>
+        <!--授权编号激活短信-->
+        <el-dialog  :visible.sync="messageIfShow" width="600px"  append-to-body :before-close = "cancelMessages" center>
+            <el-form ref="messageForm"  :disabled="false" :model="messagesForm"  v-if="messageIfShow" label-width="150px"  class="demo-form-inline" :inline="true" @submit.native.prevent>
+                <el-form-item label="验证码" prop="validCode"> 
+                    <el-input v-model="messagesForm.validCode" style="width: 200px" maxlength="6"/>
+                </el-form-item>
+                <el-form-item> 
+                    <el-button :disabled="!showCode" type="success" @click="send">点击获取验证码
+                        <span v-show="!showCode" class="count">{{countCode}} s</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="cancelMessages">取 消</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%;"/>
@@ -193,6 +211,7 @@ import { listCompanyHandler } from "@/api/common/companyHandler";
 import {getCreditDetail,getFile} from "@/api/service/credit/credit";
 import {accAdd} from "@/utils/calculation";
 import {sendMessage,checkCode,faceAuth,checkFaceAuth} from "@/api/service/credit/message";
+import {cfcaProjectNo} from "@/api/service/credit/cfcaProject";
 import pdfShow from "../credit/pdfShow";
 import {getToken} from "@/utils/auth";
 export default {
@@ -200,10 +219,14 @@ export default {
     components: {pdfShow},
     data() {
         return {
-            //短信验证码倒计时
+            //盖章短信验证码倒计时
             show: true,
             count: '',
             timer: null,
+            //授权编号激活短信验证码倒计时
+            showCode: true,
+            countCode: '',
+            timerCode: null,
             //融资id
             zfrId: '',
             //需要缴纳的费用
@@ -257,10 +280,14 @@ export default {
             updateForm:{},
             //意愿类型
             zfpAuthType:'',
-            //短信展示
+            //盖章短信展示
             messageIsShow:false,
-            //短信
+            //盖章短信
             messageForm:{validCode:""},
+            //授信编号激活短信展示
+            messageIfShow:false,
+            //授权编号激活短信
+            messagesForm:{validCode:""},
             //人脸二维码
             fileUrl:"",
             //控制人脸二维码是否展示
@@ -526,11 +553,16 @@ export default {
         this.confirmIsShow = false;
         this.resetUpdate();
     },
-    //关闭短信
+    //关闭盖章短信
     cancelMessage(){
         this.messageIsShow = false;
         this.resetMessage();
     },
+    //关闭授权编号激活短信
+    cancelMessages(){
+        this.messageIfShow = false;
+        this.resetMessages();
+    },
     //关闭二维码
     cancelFace(){
         this.faceIsShow = false;
@@ -549,6 +581,12 @@ export default {
         };
         this.resetForm("messageForm");
     },
+    resetMessages() {
+        this.messagesForm = {
+            validCode:""
+        };
+        this.resetForm("messagesForm");
+    },
      //获取合同文件
     getContractFile(){
         const loading = this.$loading({
@@ -579,46 +617,53 @@ export default {
     selectType(){
         listCompanyHandler().then((response) => {
             if(response.data == true){
-                var zfrId= this.zfrId
-                listChargeStatus(zfrId).then((response) => {
+                cfcaProjectNo().then((response) =>{
                     debugger
-                    if(response.data[0]){
-                        if(response.data[0].zciStatus == '00'){
-                            this.$confirm(
-                                '请缴纳手续费'+ this.needPay + '元',
-                                "警告",
-                                {
-                                confirmButtonText: "去缴费",
-                                cancelButtonText: "取消",
-                                type: "warning",
-                                }
-                            ).then(function () {
-                                return updateChargeStatus(zfrId);
-                                }).then(() =>{
-                                //选择签署意愿
-                                if(this.zfpAuthType == "00"){
-                                        this.confirmIsShow = true;
+                    if(response.data.scyCfcaAuthNumber == null){
+                        this.messageIfShow = true;
+                    }else{
+                        var zfrId= this.zfrId
+                        listChargeStatus(zfrId).then((response) => {
+                            if(response.data[0]){
+                                if(response.data[0].zciStatus == '00'){
+                                    this.$confirm(
+                                        '请缴纳手续费'+ this.needPay + '元',
+                                        "警告",
+                                        {
+                                        confirmButtonText: "去缴费",
+                                        cancelButtonText: "取消",
+                                        type: "warning",
+                                        }
+                                    ).then(function () {
+                                        return updateChargeStatus(zfrId);
+                                        }).then(() =>{
+                                        //选择签署意愿
+                                        if(this.zfpAuthType == "00"){
+                                                this.confirmIsShow = true;
+                                        }else{
+                                            this.checking();
+                                        }
+                                    })
                                 }else{
-                                    this.checking();
+                                    //选择签署意愿
+                                        if(this.zfpAuthType == "00"){
+                                                this.confirmIsShow = true;
+                                        }else{
+                                            this.checking();
+                                        }
                                 }
-                            })
-                        }else{
+                            }else{
                             //选择签署意愿
                                 if(this.zfpAuthType == "00"){
                                         this.confirmIsShow = true;
                                 }else{
                                     this.checking();
                                 }
-                        }
-                    }else{
-                    //选择签署意愿
-                        if(this.zfpAuthType == "00"){
-                                this.confirmIsShow = true;
-                        }else{
-                            this.checking();
-                        }
+                            }
+                        });
                     }
-                });
+                })
+                
             }else{
                 this.$message.error('此操作需经办人权限,请确认您是否是经办人');
             }