From b6313d30fcb81f5453387af544524aee8b35a2fe Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 10 May 2022 09:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E8=AE=A1=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processForm/taskListProcess/index.vue     | 17 +++++++++++++--
 .../projectManagement/components/TaskList.vue | 21 +++++++++++--------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index d328235c8..4dfd95638 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -69,7 +69,8 @@
         url: {
           urlFrom: 'project/projectLibraryBase/queryById',
           queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById',
-          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds'
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+          edit: '/project/projectTaskInventoryDetailEO/edit'
         },
         queryBy: {},
         queryProject: {},
@@ -256,9 +257,10 @@
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
+            this.edit()
             this.$router.push({
               path: '/ProjectDetails',
-              query: this.$route.query
+              query: this.$route.query.primaryKeyId
             })
           } else {
             this.loading = false
@@ -266,6 +268,17 @@
           }
         })
       },
+      edit() {
+        let query = {
+          id: this.$route.query.primaryKeyId,
+          status: 'haveDone'
+        }
+        postAction(this.url.edit, query).then((res) => {
+          if (res.success) {
+
+          }
+        })
+      },
       queryTaskDetailByTask(callback) {
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index aa03a213b..9faf6dce2 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -219,7 +219,7 @@
               projectTaskInventoryId: val.projectLawsInventoryId,
               projectLibraryId: this.$route.query.id,
               id: this.$route.query.id,
-              studioEngineer:this.$route.query.studioEngineer,
+              studioEngineer: this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
               TaskKey: val.designTaskDefinitionKey,
               flowType: 2,
@@ -227,8 +227,9 @@
               personLiable: 'designDutyName',
               typeOfDeliverables: 'designDeliverableType_dictText',
               deliverableTemplate: 'designDeliverableTemplate',
-              projectName:this.$route.query.projectName,
-              projectNameId:this.$route.query.projectNameId,
+              projectName: this.$route.query.projectName,
+              projectNameId: this.$route.query.projectNameId,
+              primaryKeyId: val.designTaskDetailId
             }
             break
           case 2:
@@ -236,7 +237,7 @@
               taskIds: val.prehomoTaskId,
               actiProcInstId: val.prehomoPId,
               projectTaskInventoryId: val.projectLawsInventoryId,
-              studioEngineer:this.$route.query.studioEngineer,
+              studioEngineer: this.$route.query.studioEngineer,
               projectLibraryId: this.$route.query.id,
               serialNumber: val.serialNumber,
               TaskKey: val.prehomoTaskDefinitionKey,
@@ -246,8 +247,9 @@
               personLiable: 'prehomoDutyName',
               typeOfDeliverables: 'prehomoDeliverableType_dictText',
               deliverableTemplate: 'prehomoDeliverableTemplate',
-              projectName:this.$route.query.projectName,
-              projectNameId:this.$route.query.projectNameId,
+              projectName: this.$route.query.projectName,
+              projectNameId: this.$route.query.projectNameId,
+              primaryKeyId: val.prehomoTaskDetailId
             }
             break
           case 3:
@@ -256,7 +258,7 @@
               actiProcInstId: val.verifyPId,
               id: this.$route.query.id,
               projectLibraryId: this.$route.query.id,
-              studioEngineer:this.$route.query.studioEngineer,
+              studioEngineer: this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
               projectTaskInventoryId: val.projectLawsInventoryId,
               TaskKey: val.verifyTaskDefinitionKey,
@@ -265,8 +267,9 @@
               personLiable: 'verifyDutyName',
               typeOfDeliverables: 'verifyDeliverableType_dictText',
               deliverableTemplate: 'verifyDeliverableTemplate',
-              projectName:this.$route.query.projectName,
-              projectNameId:this.$route.query.projectNameId,
+              projectName: this.$route.query.projectName,
+              projectNameId: this.$route.query.projectNameId,
+              primaryKeyId: val.verifyTaskDetailId
             }
             break
         }