From 586a13f3a286bff04e2c37e0a27c5f21ccf861ec Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 11 May 2022 17:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E8=B5=B7=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue            |  2 +-
 .../views/projectManagement/components/TaskList.vue   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

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
           }
         })
       },