From f53e57922ba7014e4045e621df6cedcf978e5c5c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 27 Apr 2022 14:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=A1=E6=89=8B=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=97=B6=E9=97=B4=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processForm/handshakeProcess/index.vue      |  2 +-
 .../components/listOfRegulations.vue            | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index ae8923cb9..c76cad659 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -209,7 +209,7 @@
         })
       },
       completeTask(value, handlingTime) {
-        let json = Object.assign({ handlingTime: handlingTime }, this.queryBy, value)
+        let json = Object.assign( this.queryBy,{ handlingTime: handlingTime }, value)
         let data = JSON.stringify(json).replace(/\"/g, '\'')
         let query = {
           userid: this.userInfo().id,
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 7a068d029..7e10bb5f7 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -810,17 +810,14 @@
                 for (let j = 0; j < selectedRowKeys.length; j++) {
                   if (this.dataSource[i].id == selectedRowKeys[j]) {
                     this.dataSource[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
-                    let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-                    this.dataSource[i].handlingTime = handlingTime
                     Object.keys(this.dataSource[i]).forEach(res => {
                       if (this.dataSource[i][res] && this.dataSource[i][res] instanceof String) {
                         this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
                         this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
                       }
                     })
-                    let data = JSON.stringify(this.dataSource[i]).replace(/\"/g, '\'')
                     setTimeout(() => {
-                      this.startProcess(data)
+                      this.startProcess(this.dataSource[i])
                     }, 500)
                   }
                 }
@@ -832,10 +829,10 @@
       startProcess(value) {
         let query = {
           type: 1,
-          msg: value,
-          projectNameId:this.$route.query.projectNameId,
-          projectName:this.$route.query.projectName,
-          taskAffirmDueDate: this.formInline.taskAffirmDueDate,
+          msg: JSON.stringify(value).replace(/\"/g, '\''),
+          projectNameId: this.$route.query.projectNameId,
+          projectName: this.$route.query.projectName,
+          taskAffirmDueDate: this.formInline.taskAffirmDueDate
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
@@ -844,10 +841,12 @@
         })
       },
       completeTask(value, taskId) {
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        value.handlingTime = handlingTime
         let query = {
           userid: this.userInfo().id,
           taskId: taskId,
-          json: value
+          json: JSON.stringify(value).replace(/\"/g, '\'')
         }
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {