From 071bf00865815603254b1a7861d6908129265f94 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 26 Apr 2022 19:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/components/headerProcess.vue      |  8 ++++++--
 .../processForm/handshakeProcess/index.vue          | 13 +++++++------
 .../tabComponents/processCenter/index.vue           |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/headerProcess.vue b/jero-web/src/views/processCenter/components/headerProcess.vue
index a0347c8c7..0418ea7a2 100644
--- a/jero-web/src/views/processCenter/components/headerProcess.vue
+++ b/jero-web/src/views/processCenter/components/headerProcess.vue
@@ -22,6 +22,8 @@
 </template>
 
 <script>
+  import moment from 'moment'
+
   export default {
     name: 'headerProcess',
     props: {
@@ -52,7 +54,8 @@
     },
     methods: {
       terminationProcess() {
-        this.$emit('terminationProcess')
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        this.$emit('terminationProcess',handlingTime)
       },
       preservation() {
         this.$emit('preservation')
@@ -61,7 +64,8 @@
         this.$emit('issue')
       },
       submit() {
-        this.$emit('submit')
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        this.$emit('submit',handlingTime)
       },
       backTo() {
 
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 945335c08..93cd8893d 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -166,12 +166,12 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
-      terminationProcess() {
-        this.completeTask({ flag: 2 })
+      terminationProcess(handlingTime) {
+        this.completeTask({ flag: 2 },handlingTime)
       },
-      submit() {
+      submit(handlingTime) {
         this.$refs.examineInformationRef.submit((res) => {
-          this.completeTask(res)
+          this.completeTask(res,handlingTime)
         })
       },
       queryTaskDetailByTask(callback) {
@@ -186,13 +186,14 @@
           }
         })
       },
-      completeTask(value) {
+      completeTask(value,handlingTime) {
         let json = Object.assign({}, this.queryBy, value)
         let data = JSON.stringify(json).replace(/\"/g, '\'')
         let query = {
           userid: this.userInfo().id,
           taskId: this.$route.query.taskId || this.$route.query.taskIds,
-          json: data
+          json: data,
+          handlingTime:handlingTime
         }
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
index 204a4839d..b6b4a61ca 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -52,7 +52,7 @@
         columns: [
           {
             title: this.$t('RelatedItems'),
-            dataIndex: 'RelatedItems',
+            dataIndex: 'projectName',
             align: 'center',
             ellipsis: true
           },