|
@@ -4,16 +4,7 @@
|
|
|
<div style="margin-left: 20px; margin-right: 20px">
|
|
|
<!-- 工作流 -->
|
|
|
<div v-show="dataForm.workFlowBusinessExt">
|
|
|
- <el-steps
|
|
|
- :active="
|
|
|
- dataForm.workFlowBusinessExt &&
|
|
|
- dataForm.workFlowBusinessExt.workFlowProcessStepList
|
|
|
- ? dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2
|
|
|
- : 0
|
|
|
- "
|
|
|
- align-center
|
|
|
- style="margin-bottom: 20px"
|
|
|
- >
|
|
|
+ <el-steps :active="activeNo" finish-status="success" align-center style="margin-bottom: 20px">
|
|
|
<template v-for="(item, i) in stepList">
|
|
|
<el-step
|
|
|
:icon="item.icon"
|
|
@@ -428,6 +419,7 @@ export default {
|
|
|
workInfoList: []
|
|
|
},
|
|
|
productList: [],
|
|
|
+ activeNo: 0,
|
|
|
stepList: [],
|
|
|
logList: []
|
|
|
}
|
|
@@ -504,14 +496,13 @@ export default {
|
|
|
this.productIdChangeHandle(this.dataForm.productId)
|
|
|
|
|
|
// 流程图展示
|
|
|
- dealStepData(
|
|
|
- data.data.workFlowBusinessExt.workFlowProcessStepList,
|
|
|
- this.stepList
|
|
|
- )
|
|
|
- dealStepLogs(
|
|
|
- data.data.workFlowBusinessExt.processLogList,
|
|
|
- this.logList
|
|
|
- )
|
|
|
+ if (data.data.workFlowBusinessExt) {
|
|
|
+ dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
|
|
|
+ dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
|
|
|
+ }
|
|
|
+ if (data.data.workFlowProcessStepList) {
|
|
|
+ this.activeNo = Number(data.data.workFlowProcessStepList.activeNo)
|
|
|
+ }
|
|
|
|
|
|
// 初始化审批Form
|
|
|
this.showApproveForm(businessType, id)
|
|
@@ -543,8 +534,6 @@ export default {
|
|
|
let tempItem = this.productList.find(
|
|
|
(t) => t.productId === item.productId
|
|
|
)
|
|
|
- console.log(tempItem, '111111111111')
|
|
|
-
|
|
|
if (tempItem) {
|
|
|
item.productName = tempItem.productName
|
|
|
item.productSpec = tempItem.productSpec
|
|
@@ -567,7 +556,6 @@ export default {
|
|
|
},
|
|
|
// 初始化审批Form
|
|
|
showApproveForm (businessType, businessId) {
|
|
|
- console.log('businessType = ' + businessType + ', businessId = ' + businessId)
|
|
|
if (this.isFlow) {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.approve.init(businessType, businessId)
|