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

front-vue/src/views/approval/approval/getMyJoinProcint.vue

@@ -11,8 +11,8 @@ export default {
  components: {},
   data() {
     return {
-      wordUrl:'http://192.168.0.127/flowablePc/#/getMyJoinProcint?token='+getToken(),
-        // wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/getMyJoinProcint?token='+getToken(),
+      // wordUrl:'http://192.168.0.127/flowablePc/#/getMyJoinProcint?token='+getToken(),
+        wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/getMyJoinProcint?token='+getToken(),
     };
   },
 };

front-vue/src/views/approval/approval/menuConfig.vue

@@ -11,8 +11,8 @@ export default {
  components: {},
   data() {
     return {
-      wordUrl:'http://192.168.0.127/flowablePc/#/menuConfig?token='+getToken(),
-       // wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/menuConfig?token='+getToken(),
+      // wordUrl:'http://192.168.0.127/flowablePc/#/menuConfig?token='+getToken(),
+       wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/menuConfig?token='+getToken(),
     };
   },
 };

front-vue/src/views/approval/approval/myStartFlow.vue

@@ -11,8 +11,8 @@ export default {
  components: {},
   data() {
     return {
-     wordUrl:'http://192.168.0.127/flowablePc/#/myStartFlow?token='+getToken(),
-        // wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/myStartFlow?token='+getToken(),
+    //  wordUrl:'http://192.168.0.127/flowablePc/#/myStartFlow?token='+getToken(),
+        wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/myStartFlow?token='+getToken(),
     };
   },
 };

front-vue/src/views/approval/approval/myTask.vue

@@ -11,8 +11,8 @@ export default {
  components: {},
   data() {
     return {
-      // wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/myTask?token='+getToken(),
-      wordUrl:'http://192.168.0.127/flowablePc/#/myTask?token='+getToken(),
+      wordUrl:window.location.protocol+'//'+window.location.host+'/flowablePc/#/myTask?token='+getToken(),
+      // wordUrl:'http://192.168.0.127/flowablePc/#/myTask?token='+getToken(),
     };
   },
 };

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

@@ -161,6 +161,9 @@
       <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true" />
       <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
       <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"/>
       <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='300' fixed="right" >
         <template slot-scope="scope">
@@ -434,6 +437,9 @@
       <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true" />
       <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
       <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"/>
       <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='300' fixed="right" >
         <template slot-scope="scope">
@@ -706,6 +712,9 @@
       <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
       <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
       <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
+      <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"/>
       <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='300' fixed="right" >
         <template slot-scope="scope">
@@ -978,6 +987,9 @@
       <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
       <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
       <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
+      <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"/>
       <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='300' fixed="right" >
         <template slot-scope="scope">
@@ -1250,6 +1262,9 @@
       <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
       <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
       <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
+      <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"/>
       <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='300' fixed="right" >
         <template slot-scope="scope">
@@ -1522,6 +1537,9 @@
       <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
       <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
       <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
+      <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"/>
       <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='300' fixed="right" >
         <template slot-scope="scope">
@@ -1680,6 +1698,12 @@ export default {
       typeOptions: [],
       //状态
       stateOptions:[],
+      //平台审批状态
+      platformOptions:[],
+      //核心审批状态
+      coreOptions:[],
+      //供应商审批状态
+      supplierOptions:[],
        //开始金额
       startAmt:undefined,
       //结束金额
@@ -1798,6 +1822,18 @@ export default {
     this.getDicts("zc_finance_state").then(response => {
       this.stateOptions = response.data;
     });
+
+    this.getDicts("finance_platform_status").then(response => {
+      this.platformOptions = response.data;
+    });
+
+    this.getDicts("finance_core_status").then(response => {
+      this.coreOptions = response.data;
+    });
+
+    this.getDicts("finance_supplier_status").then(response => {
+      this.supplierOptions = response.data;
+    });
     this.getUser();
     this.getList();
     this.getListSign();
@@ -1813,6 +1849,16 @@ export default {
     this.getDicts("zc_finance_state").then(response => {
       this.stateOptions = response.data;
     });
+    this.getDicts("finance_platform_status").then(response => {
+      this.platformOptions = response.data;
+    });
+    this.getDicts("finance_core_status").then(response => {
+      this.coreOptions = response.data;
+    });
+
+    this.getDicts("finance_supplier_status").then(response => {
+      this.supplierOptions = response.data;
+    });
     this.getUser();
     this.getList();
     this.getListSign();
@@ -2198,6 +2244,18 @@ export default {
     stateFormat(row, column) {
       return this.selectDictLabel(this.stateOptions, row.zfiStatus);
     },
+    //格式化平台审批状态
+    platformStatusFormat(row, column) {
+      return this.selectDictLabel(this.platformOptions, row.zfiPlatformStatus);
+    },
+    //格式化核心审批
+    coreStatusFormat(row, column) {
+      return this.selectDictLabel(this.coreOptions, row.zfiCoreStatus);
+    },
+    //格式化融资方审批
+    supplierStatusFormat(row, column) {
+      return this.selectDictLabel(this.supplierOptions, row.zfiSupplierStatus);
+    },
     //融资开立
     finanOpening(){
         this.reset();

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

@@ -563,6 +563,7 @@ export default {
           this.$set(this.form, "zfcSubject", this.ticketList[0].zfcSubject);
           this.$set(this.form, "zfcId", this.ticketList[0].zfcId);
           this.open = false
+          this.queryParamsContract.zfcName = null
       }else{
         this.$message({
           message: '请选择合同',
@@ -577,6 +578,7 @@ export default {
         this.$refs.tableContract.clearSelection();
       }
       this.open = false;
+      this.queryParamsContract.zfcName = null
     },
     /** 清空选择发票信息 */
     deleteTicekt() {
@@ -602,7 +604,7 @@ export default {
       if (row.pfiUrl) {
           if (pfiFileName.substr(-3) == "pdf") {
               this.wordUrl = pfiUrl + "/" + getToken();
-          } else {
+          } else if(pfiFileName.substr(-3) == "doc" || pfiFileName.substr(-3) == "docx"){
               this.wordUrl =
                   "https://view.officeapps.live.com/op/view.aspx?src=" +
                   pfiUrl +
@@ -610,6 +612,12 @@ export default {
                   getToken() +
                   "/" +
                   pfiFileName;
+          }else{
+            this.$message({
+              message: "暂不支持该类型文件预览",
+              type: "warning",
+            });
+            return;
           }
       }