调整流程的显示

src/views/modules/cus/communicate-detail.vue

@@ -9,7 +9,7 @@
     <div style="margin-left: 20px; margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="!isComponent && 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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -254,6 +254,7 @@ export default {
       taskTypeOption: taskTypeOption,
       rankTypeOption: rankTypeOption,
       isFlow: false,
+      activeNo: 0,
       stepList: [],
       logList: []
     }
@@ -313,8 +314,13 @@ export default {
           }
 
           // 流程图展示
-          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, this.id)

src/views/modules/cus/contract-add-or-update.vue

@@ -8,7 +8,7 @@
       <div class="my-title">{{ !id ? '发起评审': display ? '评审详情' : '修改' }}</div>
       <!-- 工作流 -->
       <div v-show="display && 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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -223,6 +223,7 @@ export default {
         dataList: [],
         fileList: [],
         fileList1: [],
+        activeNo: 0,
         stepList: [],
         logList: [],
         radio: '',
@@ -291,8 +292,13 @@ export default {
           if (data && data.code === '200') {
             this.dataForm = data.data
             // 流程图展示
-            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)
+            }
             // 附件显示
             this.fileList = []
             data.data.attachList.forEach((item) => {

src/views/modules/cus/contract-detail.vue

@@ -9,7 +9,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -105,6 +105,7 @@
         cusRCommProductVOS: [],
         fileList: [],
         fileList1: [],
+        activeNo: 0,
         stepList: [],
         logList: []
       }
@@ -135,6 +136,9 @@
               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)
+            }
             // 合同评审表附件显示
             this.fileList = []
             data.data.attachList.forEach((item) => {

src/views/modules/cus/quoted-detail.vue

@@ -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)

src/views/modules/notice/notice-detail.vue

@@ -9,7 +9,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" :key="i+'_lll'" :title="item.title" :description="item.description"></el-step>
             </template>
@@ -62,6 +62,7 @@
         visible: false,
         id: 0,
         dataForm: {},
+        activeNo: 0,
         stepList: [],
         logList: [],
         fileList: []
@@ -89,6 +90,9 @@
               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)
+            }
             // 附件显示
             if (data.data.attaches) {
               data.data.attaches.forEach((item) => {

src/views/modules/order/order-add-or-update.vue

@@ -4,7 +4,7 @@
       <div class="my-title">{{ !id ? '新增': display ? '详情' : '修改' }}</div>
       <!-- 工作流 -->
       <div v-show="display && 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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -340,6 +340,7 @@ export default {
         visible: false,
         display: false,
         addType: 0,
+        activeNo: 0,
         fileList: [],
         dataList: [],
         id: 0,
@@ -383,8 +384,13 @@ export default {
           if (data && data.code === '200') {
             this.dataForm = data.data
             // 流程图展示
-            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)
+            }
             // 附件
             if (data.data.attachList) {
               data.data.attachList.forEach((item) => {

src/views/modules/order/order-detail.vue

@@ -5,7 +5,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -268,6 +268,7 @@ export default {
         dataForm: {},
         productDetails: [],
         workInfoDetails: [],
+        activeNo: 0,
         stepList: [],
         logList: []
       }
@@ -299,6 +300,9 @@ export default {
             if (data.data.workFlowBusinessExt.processLogList) {
               dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
             }
+            if (data.data.workFlowProcessStepList) {
+              this.activeNo = Number(data.data.workFlowProcessStepList.activeNo)
+            }
             // 任务单物料明细
             if (data.data.saleROrderProductList) {
               this.productDetails = data.data.saleROrderProductList

src/views/modules/production/damage-details.vue

@@ -9,7 +9,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -70,6 +70,7 @@
         isFlow: false,
         id: 0,
         dataForm: {},
+        activeNo: 0,
         stepList: [],
         logList: []
       }
@@ -93,10 +94,14 @@
         getDamageDetail(this.id).then(({data}) => {
           if (data && data.code === '200' && data.data) {
             this.dataForm = data.data
-             // 流程图展示
-            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, this.id)
           }

src/views/modules/quality/disqualification-detail.vue

@@ -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"
@@ -108,6 +99,7 @@ export default {
       approveStateOption: approveStateOption,
       measureStateOption: measureStateOption,
       dataForm: {},
+      activeNo: 0,
       stepList: [],
       logList: []
     }
@@ -133,14 +125,13 @@ export default {
         if (data && data.code === '200' && data.data) {
           this.dataForm = data.data
           // 流程图展示
-          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, this.id)

src/views/modules/quality/first-detail.vue

@@ -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"
@@ -117,6 +108,7 @@ export default {
       id: 0,
       approveStateOption: approveStateOption,
       dataForm: {},
+      activeNo: 0,
       stepList: [],
       logList: []
     }
@@ -142,14 +134,13 @@ export default {
         if (data && data.code === '200' && data.data) {
           this.dataForm = data.data
           // 流程图展示
-          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, this.id)
         }

src/views/modules/sale/outsource-detail.vue

@@ -5,7 +5,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -217,6 +217,7 @@
         id: 0,
         dataForm: {},
         attachVisible: false,
+        activeNo: 0,
         stepList: [],
         logList: [],
         totalAmount: 0,
@@ -257,6 +258,9 @@
               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)
+            }
             // 付款方式
             if (data.data.payType) {
               this.idsPayType.push(data.data.payType)

src/views/modules/sale/purchase-add-or-update.vue

@@ -4,7 +4,7 @@
       <div class="my-title">{{ !id ? '新增': '修改' }}</div>
       <!-- 工作流 -->
       <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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -171,6 +171,7 @@
           purchaseType: [{ required: true, message: '请选择采购类别', trigger: 'change' }],
           applierId: [{ required: true, message: '请选择申请人', trigger: 'change' }]
         },
+        activeNo: 0,
         stepList: [],
         logList: [],
         totalAmount: 0,
@@ -224,6 +225,9 @@
                 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)
+              }
               // 获取采购物品明细
               if (data.data.purchaseDetails) {
                 this.materialDetails = data.data.purchaseDetails

src/views/modules/sale/purchase-detail.vue

@@ -4,7 +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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -169,7 +169,7 @@
         isFlow: false,
         id: 0,
         dataForm: {},
-
+        activeNo: 0,
         stepList: [],
         logList: [],
         idsPayType: [],
@@ -215,8 +215,13 @@
           if (data && data.code === '200') {
             this.dataForm = data.data
             // 流程图展示
-            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)
+            }
             // 付款方式
             if (data.data.payType) {
               this.idsPayType.push(data.data.payType)

src/views/modules/sale/supplier-detail.vue

@@ -5,7 +5,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-if="flowVisible && dataForm.workFlowBusinessExt">
-        <el-steps :active="flowVisible?dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0: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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -117,6 +117,7 @@ export default {
         // 流程图
         flowVisible: false,
         isFlow: false,
+        activeNo: 0,
         stepList: [],
         logList: []
       }
@@ -141,6 +142,9 @@ export default {
               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, this.id)
           } else {

src/views/modules/tech/crafts-detail.vue

@@ -11,7 +11,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -86,6 +86,7 @@ export default {
       dataForm: {
         workFlowBusinessExt: null
       },
+      activeNo: 0,
       stepList: [],
       logList: [],
       fileList: [],
@@ -121,16 +122,12 @@ export default {
             nodeList: data.data.nodeList,
             lineList: data.data.lineList
           }
-
           if (data.data.workFlowBusinessExt) {
-            dealStepData(
-              data.data.workFlowBusinessExt.workFlowProcessStepList,
-              this.stepList
-            )
-            dealStepLogs(
-              data.data.workFlowBusinessExt.processLogList,
-              this.logList
-            )
+            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)
           }
           // 附件
           if (data.data.attachList) {

src/views/modules/tech/draw-detail.vue

@@ -9,7 +9,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -61,6 +61,7 @@
         visible: false,
         id: 0,
         dataForm: {},
+        activeNo: 0,
         stepList: [],
         logList: [],
         fileList: []
@@ -88,6 +89,9 @@
               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)
+            }
             // 图纸
             if (data.data.attachList) {
               data.data.attachList.forEach((item) => {

src/views/modules/tech/product-add-or-update.vue

@@ -8,9 +8,7 @@
     <div class="my-title">{{ !id ? '新增' : display ? '详情' : '修改' }}</div>
     <!-- 工作流 -->
     <div v-show="display && 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" :title="item.title" :description="item.description"></el-step>
         </template>
@@ -254,6 +252,7 @@ export default {
         cnt: [{ required: true, message: '请输入单套数量', trigger: 'blur' }],
         mapNumber: [{ required: true, message: '请输入主图号', trigger: 'blur' }]
       },
+      activeNo: 0,
       stepList: [],
       logList: []
     }
@@ -309,6 +308,9 @@ export default {
             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)
+          }
           // 组合小物料
           if (data.data.composeProductMaterialList) {
             data.data.composeProductMaterialList.forEach((item) => {

src/views/modules/tech/product-detail.vue

@@ -9,7 +9,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -254,6 +254,7 @@ export default {
         dataForm: {},
         materialList: [],
         productDetails: [],
+        activeNo: 0,
         stepList: [],
         logList: [],
         fileList: []
@@ -284,6 +285,9 @@ export default {
               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)
+            }
             // 组合小物料
             data.data.composeProductMaterialList.forEach((item) => {
               this.productDetails.push(item)

src/views/modules/tech/work-type-detail.vue

@@ -9,7 +9,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 :key="i + '_mesg'" :icon="item.icon" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -59,6 +59,7 @@
         visible: false,
         id: 0,
         dataForm: {},
+        activeNo: 0,
         stepList: [],
         logList: []
       }
@@ -84,6 +85,9 @@
               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)
+            }
           }
         })
       }

src/views/modules/trace/order-detail.vue

@@ -9,7 +9,7 @@
     <div v-if="!prodVisible" 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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -148,6 +148,7 @@ export default {
         id: 0,
         dataForm: {},
         productDetails: [],
+        activeNo: 0,
         stepList: [],
         logList: [],
         fileList: [],
@@ -205,8 +206,13 @@ export default {
           if (data && data.code === '200') {
             this.dataForm = data.data
             // 流程图展示
-            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)
+            }
             // 附件
             if (data.data.attachList) {
               data.data.attachList.forEach((item) => {

src/views/modules/warehouse/inventory-detail.vue

@@ -9,7 +9,7 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-if="flowVisible">
-        <el-steps :active="flowVisible?dataList[0].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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -67,6 +67,7 @@
         dataList: [],
         fileList: [],
         fileList1: [],
+        activeNo: 0,
         stepList: [],
         logList: [],
         pageIndex: 1,
@@ -148,6 +149,9 @@
                 dealStepData(this.dataList[0].workFlowBusinessExt.workFlowProcessStepList, this.stepList)
                 dealStepLogs(this.dataList[0].workFlowBusinessExt.processLogList, this.logList)
               }
+              if (this.dataList[0].workFlowProcessStepList) {
+                this.activeNo = Number(this.dataList[0].workFlowProcessStepList.activeNo)
+              }
               // 初始化审批Form
               this.showApproveForm(businessType, this.id)
             }

src/views/modules/warehouse/stock-order-detail.vue

@@ -9,7 +9,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" :title="item.title" :description="item.description"></el-step>
             </template>
@@ -190,6 +190,7 @@
         isFlow: false,
         dataForm: {},
         dataList: [],
+        activeNo: 0,
         stepList: [],
         logList: []
       }
@@ -215,6 +216,9 @@
                 dealStepData(data.data[0].workFlowBusinessExt.workFlowProcessStepList, this.stepList)
                 dealStepLogs(data.data[0].workFlowBusinessExt.processLogList, this.logList)
               }
+              if (data.data[0].workFlowProcessStepList) {
+                this.activeNo = Number(data.data[0].workFlowProcessStepList.activeNo)
+              }
             }
             this.dataList = data.data
             // 初始化审批Form

src/views/modules/warehouse/template-delivery-detail.vue

@@ -9,7 +9,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" :title="item.title" :description="item.description"></el-step>
           </template>
@@ -120,6 +120,7 @@
         id: 0,
         dataForm: {},
         materialList: [],
+        activeNo: 0,
         stepList: [],
         logList: []
       }
@@ -147,6 +148,9 @@
               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)
+            }
             // 模板对应的零件
             this.materialList = data.data.whTemplateItemPlanList
             // 初始化审批Form