From 83c400a19ec9bcb0935b4f92214930e3d73ad1f0 Mon Sep 17 00:00:00 2001 From: quanyawei <401863037@qq.com> Date: Tue, 21 Nov 2023 15:59:15 +0800 Subject: [PATCH] Merge branch 'feature_1.0' --- src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue index 0521100..6437d59 100644 --- a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue +++ b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue @@ -7,7 +7,7 @@ </div> <div> <div v-if="dialogData.pageType !=='delay'" class="stepsList"> - <el-steps :space="200" :active="parentFormData.approveList.length+1" align-center> + <el-steps :space="200" :active="activeLeng" align-center> <el-step v-for="(item,index) in setepList" :key="index" :title="'' + item.createName + ' ' + item.stateName" :description="item.createTime" /> </el-steps> </div> @@ -272,7 +272,8 @@ fileDelayListCover: [], fileDelayList: [], videoVisible: false, - dialogImageUrl: '' + dialogImageUrl: '', + activeLeng: 1 } }, computed: { @@ -308,17 +309,20 @@ setepList() { const leng = this.dialogData.parentFormData.approveList.length let data = _.cloneDeep(this.dialogData.parentFormData.approveList) - + console.log('setepList', this.dialogData.parentFormData.approveList) if (leng === 1) { data = [...data, ...this.setepListAdd.set1] + this.activeLeng = 1 } if (leng === 2) { data = [...data, ...this.setepListAdd.set2] + this.activeLeng = 2 } if (leng === 3) { data = [...data, ...this.setepListAdd.set3] + this.activeLeng = 4 } - console.log('data', leng) + console.log('datadata', data) return data } }, -- Gitblit v1.8.0