diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 4ff0887ea..901eceac7 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -397,7 +397,7 @@ status: 'NotDone', actiProcInstId: this.$route.query.actiProcInstId, projectTaskInventoryId: this.$route.query.projectTaskInventoryId, - flowType: '2', + flowType: this.$route.query.flowType, userIds: this.formInline.userId, taskDefinitionKey: 'dreDispose', msgType: 'designIssueDreMsg' diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 273e6a4da..a61584e34 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -231,7 +231,7 @@ handleExport() { }, - verifyTaskClick(val, num,isTrue) { + verifyTaskClick(val, num, isTrue) { let query = {} switch (num) { case 1: @@ -251,7 +251,7 @@ deliverableTemplate: 'designDeliverableTemplate', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.designTaskDetailId, + primaryKeyId: val.designTaskDetailId } break case 2: @@ -271,7 +271,7 @@ deliverableTemplate: 'prehomoDeliverableTemplate', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.prehomoTaskDetailId, + primaryKeyId: val.prehomoTaskDetailId } break case 3: @@ -291,7 +291,7 @@ deliverableTemplate: 'verifyDeliverableTemplate', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.verifyTaskDetailId, + primaryKeyId: val.verifyTaskDetailId } break } @@ -309,12 +309,15 @@ projectLibraryId: this.$route.query.id, ...this.queryParam } + this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { this.dataSource = res.result + this.loading = false // this.dataSource = [{}] } else { this.dataSource = [] + this.loading = false } }) },