From 20f14d18781bf8aff7c0f9ebfac1da6b4c65153e Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 16 Aug 2022 18:08:08 +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

---
 .../regulatoryCirculationHistory.vue          | 36 ++++++++++++++++---
 .../processForm/evaluationProcess/index.vue   |  2 +-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
index 65bf69caf..2ff41bc7f 100644
--- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -26,34 +26,46 @@
 
   export default {
     name: 'regulatoryCirculationHistory',
+    props: {
+      isTrue: {
+        type: Boolean,
+        default: false
+      }
+    },
     data() {
       return {
         dataSource: [],
         loading: false,
-        columns: [
+        columnsAll: [
           {
             title: this.$t('OperationContent'),
             dataIndex: 'taskDefinitionKeyName',
             align: 'center',
-            width: '25%'
+            width: '20%'
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'approvalOpinion',
+            align: 'center',
+            width: '20%'
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'createBy',
             align: 'center',
-            width: '25%'
+            width: '20%'
           },
           {
             title: this.$t('role'),
             dataIndex: 'operatorRoleName',
             align: 'center',
-            width: '25%'
+            width: '20%'
           },
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',
             align: 'center',
-            width: '25%',
+            width: '20%',
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }
@@ -64,6 +76,20 @@
     mounted() {
       this.getList()
     },
+    computed: {
+      columns() {
+        let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
+        if (!this.isTrue) {
+          for (let i = 0; i < columnsAll.length; i++) {
+            if (columnsAll[i].title == this.$t('opinion')) {
+              columnsAll.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columnsAll
+      }
+    },
     methods: {
       getList() {
         let query = {
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 1361ff125..bf371d414 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -34,7 +34,7 @@
           @submit="submit"
           @sendBack="sendBack"
         />
-        <circulationHistory v-if="isDisplay"/>
+        <circulationHistory :isTrue="true" v-if="isDisplay"/>
       </div>
     </div>
     <JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>