From 7cf9507c2bb4d72d0a8221739e3fa61166093e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 20 Mar 2023 16:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/circulationHistory.vue         | 101 ++++++++++++++++++
 .../components/designCompliance.vue           |   6 +-
 2 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index 39f2d3e18..624d71225 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -5,12 +5,42 @@
         {{title}}
       </div>
     </div>
+    <div style="width: 100%">
+      <a-table
+        ref="table"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+        <span slot="approvalResult" slot-scope="text,result">
+            {{approvalResult[text]}}
+        </span>
+        <span slot="approvalFile" slot-scope="text,result">
+              <span class="viewFile"
+                    @click="viewFileClick(record.approvalFile)"
+                    v-if="record.approvalFile">
+                {{$t('viewFile')}}
+              </span>
+              <span v-else>--</span>
+        </span>
+      </a-table>
+    </div>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
+  import moment from 'moment'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import viewFileModel from '@/components/viewFileModel/index'
+
   export default {
     name: 'circulationHistory',
+    components:{
+      viewFileModel
+    },
     props: {
       //  需要参数urlFrom，获取数据去显示内容
       url: {
@@ -30,6 +60,72 @@
         default: ''
       }
     },
+    data() {
+      return {
+        loading: false,
+        dataSource: [],
+        columns: [
+          {
+            title: this.$t('Operator'),
+            dataIndex: 'assignee',
+            align: 'left',
+            width: 200
+          },
+          {
+            title: this.$t('Tasknode'),
+            dataIndex: 'name',
+            align: 'left',
+            width: 180
+          },
+          {
+            title: this.$t('OperationTime'),
+            dataIndex: 'createTime',
+            align: 'left',
+            width: 200,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
+          },
+          {
+            title: this.$t('resultofhandling'),
+            dataIndex: 'approvalResult',
+            align: 'left',
+            width: 200,
+            scopedSlots: { customRender: 'approvalResult' }
+          },
+          {
+            title: this.$t('feedback'),
+            dataIndex: 'approvalOpinion',
+            align: 'left',
+            width: 200
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'approvalFile',
+            align: 'left',
+            width: 100,
+            scopedSlots: { customRender: 'approvalFile' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getList() {
+        let query = {
+          prcNum: this.$route.query.prcNum,
+          prcType: this.$route.query.prcType
+        }
+        getAction('/workFlow/get_list_by_instance', query).then((res) => {
+          this.dataSource = res
+        })
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      }
+    }
   }
 </script>
 
@@ -51,4 +147,9 @@
       color: #000F16;
     }
   }
+
+  .viewFile {
+    color: #00B3BE;
+    cursor: pointer;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index ef4c417f5..5510957e8 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -135,13 +135,15 @@
         return false
       },
       isCancel() {
-        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') {
+        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' ||
+          this.queryData.TaskKey == 'zrrtjjfw' || this.queryData.TaskKey == 'dezrrtjjfw') {
           return true
         }
         return false
       },
       isConfirm() {
-        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') {
+        if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' ||
+          this.queryData.TaskKey == 'zrrtjjfw' || this.queryData.TaskKey == 'dezrrtjjfw') {
           return true
         }
         return false