供应商开立改为平台审核 --- 合同签署 --- 确权生效，并且内部开审批进度

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

@@ -9,3 +9,12 @@ export function isOpenApproval(data) {
     data: data
   })
 }
+
+//查询当前审批流程进度
+export function approvalProcess(data) {
+  return request({
+    url: '/sc-service/approvalRelatedCredit/approvalProcess',
+    method: 'put',
+    data: data
+  })
+}

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

@@ -1823,6 +1823,24 @@
                 <el-button type="primary" @click="closeFliwDetail">关闭</el-button>
             </span>
         </el-dialog>
+        <!--查看内部审批流程-->
+        <el-dialog title="流程进度" :visible.sync="hisTaskForm">
+        <div>
+          <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 in histaskList" :key="item.id">
+              <template slot="description">
+                  <span v-if="item.activityType == 'userTask'">办理人:  {{item.displayName}}</span>  节点名称:  {{item.activityName}}   任务接收时间  {{item.startTime}}     任务办结时间  {{item.endTime}}
+                    <div v-for="comment in item.commentList" class="text item" :key="comment.id">
+                      {{'审批意见: ' + comment.message }}
+                    </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="hisTaskForm = false">关 闭</el-button>
+			</div>
+		</el-dialog>
       </el-tabs>
       </div>
     </el-col>
@@ -1836,6 +1854,7 @@ import { listCredit, coreApproval, confirmationApproval, informationApproval,app
 import {creditRefuse,creditDel} from "@/api/service/credit/creditHandle";
 import Editor from '@/components/Editor';
 import {listCompanyHandler} from "@/api/common/companyHandler";
+import {approvalProcess} from "@/api/service/credit/approvalRelatedCredit";
 import FlowDetail from "@/views/service/credit/flowDetail";
 import Cookies from 'js-cookie';
 import { getUserProfile} from "@/api/system/user";
@@ -1896,6 +1915,9 @@ export default {
       //筛选条件数据字典
       typesOptions: [],
       queryOptions: [],
+      //审批
+      hisTaskForm:false,
+      histaskList:[],
       // 查询参数
       queryParams:{
        pageNum: 1,
@@ -2900,39 +2922,98 @@ export default {
       const zfiSupplierStatus = row.zfiSupplierStatus
       console.log(zfiStatus)
       var active = 0
-      if(zfiCreateType == '0'){
-        if(zfiStatus == '01' || !zfiStatus){
-          active = 1
-        }else if(zfiStatus == '00'){
-          active = 2
-        }else if(zfiStatus == '01'){
-          active = 3
-        }else if(zfiStatus == '02'){
-          active = 4
-        }
-      }else if(zfiCreateType == '1'){
-        if(zfiStatus == '01'){
-          active = 1
-        }else if(zfiCoreStatus == '01' && zfiStatus == '01' || zfiCoreStatus == '01' && zfiStatus == '06'){
-          active = 2
-        }else if(zfiStatus == '01' && zfiPlatformStatus == '01'){
-          active = 3
-        }else if(zfiStatus == '02'){
-          active = 4
-        }
-      }else if(zfiCreateType == '2'){
-        if(zfiSupplierStatus == '01' && !zfiStatus){
-          active = 1
-        }else if(zfiPlatformStatus == '01' && !zfiStatus){
-          active = 2
-        }else if(zfiStatus == '02'){
-          active = 3
-        }
+       //融资企业
+      if(this.companyType == '02'){
+          //审批中
+          if(this.row.zfiSupplierStatus == '00' || !this.row.zfiSupplierStatus){
+              this.hisTaskForm = true;
+              approvalProcess(row).then((response) => {
+                 this.histaskList = response.data;
+              })  
+          }else{
+                  if(zfiCreateType == '0'){
+                    if(zfiStatus == '01' || !zfiStatus){
+                      active = 1
+                    }else if(zfiStatus == '00'){
+                      active = 2
+                    }else if(zfiStatus == '01'){
+                      active = 3
+                    }else if(zfiStatus == '02'){
+                      active = 4
+                    }
+                  }else if(zfiCreateType == '1'){
+                    if(zfiStatus == '01'){
+                      active = 1
+                    }else if(zfiCoreStatus == '01' && zfiStatus == '01' || zfiCoreStatus == '01' && zfiStatus == '06'){
+                      active = 2
+                    }else if(zfiStatus == '01' && zfiPlatformStatus == '01'){
+                      active = 3
+                    }else if(zfiStatus == '02'){
+                      active = 4
+                    }
+                  }else if(zfiCreateType == '2'){
+                    if(zfiSupplierStatus == '01' && !zfiStatus){
+                      active = 1
+                    }else if(zfiPlatformStatus == '01' && !zfiStatus){
+                      active = 2
+                    }else if(zfiStatus == '02'){
+                      active = 3
+                    }
+                  }
+                  this.openFlowDetail = true
+                  this.financeId = zfiId
+                  this.financeType = zfiCreateType
+                  this.financeActive = active
+
+          }
+      }
+      //核心企业
+      if(this.companyType == '01'){
+           //审批中
+          if(this.row.zfiCoreStatus == '00'){
+              this.hisTaskForm = true;
+              approvalProcess(row).then((response) => {
+                 this.histaskList = response.data;
+              })  
+          }else{
+                    if(zfiCreateType == '0'){
+                      if(zfiStatus == '01' || !zfiStatus){
+                        active = 1
+                      }else if(zfiStatus == '00'){
+                        active = 2
+                      }else if(zfiStatus == '01'){
+                        active = 3
+                      }else if(zfiStatus == '02'){
+                        active = 4
+                      }
+                    }else if(zfiCreateType == '1'){
+                      if(zfiStatus == '01'){
+                        active = 1
+                      }else if(zfiCoreStatus == '01' && zfiStatus == '01' || zfiCoreStatus == '01' && zfiStatus == '06'){
+                        active = 2
+                      }else if(zfiStatus == '01' && zfiPlatformStatus == '01'){
+                        active = 3
+                      }else if(zfiStatus == '02'){
+                        active = 4
+                      }
+                    }else if(zfiCreateType == '2'){
+                      if(zfiSupplierStatus == '01' && !zfiStatus){
+                        active = 1
+                      }else if(zfiPlatformStatus == '01' && !zfiStatus){
+                        active = 2
+                      }else if(zfiStatus == '02'){
+                        active = 3
+                      }
+                    }
+                    this.openFlowDetail = true
+                    this.financeId = zfiId
+                    this.financeType = zfiCreateType
+                    this.financeActive = active
+          }
       }
-      this.openFlowDetail = true
-      this.financeId = zfiId
-      this.financeType = zfiCreateType
-      this.financeActive = active
+
+  
+      
     },
     //关闭流程
     closeFliwDetail(){

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

@@ -15,8 +15,11 @@
           <el-step title="签收生效"></el-step>
         </el-steps>
         <el-steps :active="active" align-center process-status="finish" finish-status="success" v-if="financeType == '2'">
-          <el-step title="融信开立"></el-step>
+          <!-- <el-step title="融信开立"></el-step>
+          <el-step title="平台审核"></el-step>
+          <el-step title="确权生效"></el-step> -->
           <el-step title="平台审核"></el-step>
+          <el-step title="合同签署"></el-step>
           <el-step title="确权生效"></el-step>
         </el-steps>
       </el-header>