From 6a14ce332a0d225000b8e15f43e42fbfd57f7abe Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 11 May 2022 09:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue     |  3 ++-
 .../processForm/taskListProcess/index.vue      | 18 ++++++++++--------
 .../components/listOfRegulations.vue           |  2 ++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 6951aef25..4ff0887ea 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -399,7 +399,8 @@
           projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
           flowType: '2',
           userIds: this.formInline.userId,
-          taskDefinitionKey: 'dreDispose'
+          taskDefinitionKey: 'dreDispose',
+          msgType: 'designIssueDreMsg'
         }
         postAction(this.url.DetailEOAdd, query).then((res) => {
           if (res.success) {
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 53c28a1dd..440391051 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -222,34 +222,36 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
-      terminationProcess() {
+      terminationProcess(operatorTime) {
         this.textLoading = this.$t('terminationProcessing')
         this.loading = true
         this.queryBy.reviewResult = 'termination of task'
-        this.completeTask({ flag: 2 })
+        this.completeTask({ flag: 2, operatorTime: operatorTime })
       },
-      adopt() {
+      adopt(operatorTime) {
         this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
           this.textLoading = this.$t('Submitting')
           this.loading = true
           res.flag = 0
+          res.operatorTime = operatorTime
           this.completeTask(res)
         })
       },
-      sendBack() {
+      sendBack(operatorTime) {
         this.textLoading = this.$t('Returning')
         this.loading = true
-        if (this.queryBy.reviewResult == 'inconformity' || this.queryBy.reviewResult == 'to track'){
+        if (this.queryBy.reviewResult == 'inconformity' || this.queryBy.reviewResult == 'to track') {
 
-        }else{
+        } else {
           this.queryBy.reviewResult = 'to be confirmed'
         }
-        this.completeTask({ flag: 1 })
+        this.completeTask({ flag: 1, operatorTime: operatorTime })
       },
-      submit() {
+      submit(operatorTime) {
         this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
           this.textLoading = this.$t('Submitting')
           this.loading = true
+          res.operatorTime = operatorTime
           this.completeTask(res)
         })
       },
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 9123ceaf7..d83ff6202 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1155,6 +1155,8 @@
 
       completeTaskDesign(value, taskId) {
         value.reviewResult = 'launch'
+        let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        value.operatorTime = operatorTime
         let query = {
           userid: this.userInfo().id,
           taskId: taskId,