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

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

@@ -488,6 +488,8 @@ export default {
             pdfShowDialogs : false,
             pdfFileLists : [],
             parents : this,
+            //确权审批开启
+            result:false
         };
     },
     watch:{
@@ -1062,9 +1064,9 @@ export default {
          var confirmParam = {};
          confirmParam.menuId = "1000000007";
          isOpenApproval(confirmParam).then((response) => {
-             var result = response.data.isOpen;
+              this.result = response.data.isOpen;
             //有确权内部审批
-            if(true == result){
+            if(true == this.result){
                 //获取核心审批状态(拒绝或者状态为空时显示内部审批按钮)
                 if(this.zfiCoreStatus == "02" || this.zfiCoreStatus == "" || this.zfiCoreStatus == "null" || this.zfiCoreStatus == null ){
                     this.isHas = true;
@@ -1086,11 +1088,11 @@ export default {
     },
     //确权
     confirmApproval(){
-        //核心确权通过,直接盖章
-        /* if(this.form.zfiCoreStatus == '01'){
+        //核心确权通过并且开启确权审批,直接盖章
+         if(this.form.zfiCoreStatus == '01' && true == this.result){
             //预览文件
             this.getContractFile(false);
-        }else{ */
+        }else{
             this.$refs["form"].validate(valid => {
 
                 if(!this.form.zfiCoreQuotaId){
@@ -1159,7 +1161,7 @@ export default {
                         });
                 }
             });
-        //}
+        }
 
 
     },

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

@@ -290,7 +290,7 @@
                         <el-steps direction="vertical" :active="histaskList[histaskList.length-1] && histaskList[histaskList.length-1].activityType == 'endEvent' ? histaskList.length : histaskList.length-1" finish-status="success" space="60px">
                             <el-step :title="item.name" v-for="(item,index) in histaskList" :key="index">
                                 <template slot="description">
-                                    <span v-if="item.activityType == 'userTask'">办理人: {{item.displayName}}</span> 节点名称: {{item.activityName}} 任务接收时间 {{parseTime(new Date(item.startTime), '{y}-{m}-{d} {h}:{i}:{s}')}} 任务办结时间 {{parseTime(new Date(item.endTime), '{y}-{m}-{d} {h}:{i}:{s}')}}
+                                    <span v-if="item.activityType == 'userTask'">办理人: {{item.displayName}}</span> 节点名称: {{item.activityName}} 任务接收时间 {{parseTime(new Date(item.startTime), '{y}-{m}-{d} {h}:{i}:{s}')}}  {{item.endTime?'任务办结时间' + parseTime(new Date(item.endTime), '{y}-{m}-{d} {h}:{i}:{s}'):''}}
                                     <div v-for="(comment,index) in item.commentList" class="text item" :key="index">
                                         {{'审批意见: ' + comment.message }}
                                     </div>
@@ -1445,9 +1445,10 @@ export default {
         },
         /** 导出按钮操作 */
         handleExport(row) {
-            const zfrFinanceId = row.zfrFinanceId || this.ids;
+            const zfrId = row.zfrId || this.ids;
+            const zfrFinanceId = row.zfrFinanceId ;
             this.download(
-                "sc-service/financeRecord/export/" + zfrFinanceId, {},
+                "sc-service/financeRecord/export/" + zfrFinanceId + '/' + zfrId, {},
                 `融资管理附件${this.parseTime(new Date(), "{y}{m}{d}{h}{m}{s}")}.zip`
             );
         },
@@ -1517,8 +1518,8 @@ export default {
             this.hisTaskForm = true;
             let form = {}
             form.zfiId = zfrId
-            console.log(form)
             approvalProcess(form).then((response) => {
+                     console.log(response,"response")
                 this.histaskList = response.data;
             })
         },