From 3c0f7798cdc0cc8d1282f9d755532c803d6946bd Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 26 Apr 2022 14:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8F=A1=E6=89=8B=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/circulationHistory.vue         | 14 +++++-----
 .../processForm/handshakeProcess/index.vue    | 26 ++++++++++++++-----
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index 75271d501..679426d70 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -32,21 +32,21 @@
           {
             title: this.$t('result'),
             dataIndex: 'result',
-            align: 'center'
+            align: 'approvalResult'
           },
           {
             title: this.$t('opinion'),
-            dataIndex: 'opinion',
+            dataIndex: 'approvalOpinion',
             align: 'center'
           },
           {
             title: this.$t('enclosure'),
-            dataIndex: 'enclosure',
+            dataIndex: 'approvalFile',
             align: 'center'
           },
           {
             title: this.$t('operationNode'),
-            dataIndex: 'operationNode',
+            dataIndex: 'name',
             align: 'center'
           },
           {
@@ -56,7 +56,7 @@
           },
           {
             title: this.$t('operationTime'),
-            dataIndex: 'operationTime',
+            dataIndex: 'createTime',
             align: 'center'
           }
         ]
@@ -71,9 +71,7 @@
           prcNum: this.$route.query.prcNum
         }
         getAction('/workFlow/get_list_by_instance', query).then((res) => {
-          if (res.success) {
-
-          }
+          this.dataSource = res
         })
       }
     }
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index addbb6d9d..945335c08 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -150,7 +150,8 @@
         ],
         url: {
           urlFrom: 'project/projectLibraryBase/queryById',
-          queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById'
+          queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById',
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds'
         },
         queryBy: {},
         queryProject: {},
@@ -158,10 +159,10 @@
       }
     },
     mounted() {
-      if (this.$route.query.mes) {
-        this.queryBy = JSON.parse(this.$route.query.mes)
-      }
-      this.queryProjectLawsInventoryInfo()
+      let _this = this
+      this.queryTaskDetailByTask(function() {
+        _this.queryProjectLawsInventoryInfo()
+      })
     },
     methods: {
       ...mapGetters(['userInfo']),
@@ -169,10 +170,22 @@
         this.completeTask({ flag: 2 })
       },
       submit() {
-        this.$refs.examineInformationRef.submit(function(res) {
+        this.$refs.examineInformationRef.submit((res) => {
           this.completeTask(res)
         })
       },
+      queryTaskDetailByTask(callback) {
+        this.loading = true
+        getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+          if (res instanceof String) {
+            this.queryBy = JSON.parse(res)
+            callback()
+          } else {
+            this.queryBy = res
+            callback()
+          }
+        })
+      },
       completeTask(value) {
         let json = Object.assign({}, this.queryBy, value)
         let data = JSON.stringify(json).replace(/\"/g, '\'')
@@ -193,7 +206,6 @@
         })
       },
       queryProjectLawsInventoryInfo() {
-        this.loading = true
         let query = {
           id: this.queryBy.id,
           operatorType: 'taskAffirmQuery'