From 24d45655da47705bbcb22bbfa2cb03791e7eddc9 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 14:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modules/fillAdd.vue            |  11 +-
 .../src/views/dashboard/components/myList.vue |   6 +
 .../regulatoryCirculationHistory.vue          | 104 ++++++++++++++++++
 .../processForm/regulatoryProcess/index.vue   |  10 +-
 .../tabComponents/processCenter/index.vue     |   6 +
 5 files changed, 123 insertions(+), 14 deletions(-)
 create mode 100644 jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
index ec843792e..725066153 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -166,16 +166,9 @@
     },
     methods: {
       getTree() {
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: 1000
-        }
-        getAction('/report/lawsMonthlyReportTitleTemplateEO/page', query).then((res) => {
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => {
           if (res.success) {
-            this.chapterContentsList = res.result.records || []
-            this.chapterContentsList.forEach(res => {
-
-            })
+            this.chapterContentsList = res.result || []
           } else {
             this.chapterContentsList = []
           }
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 47a680c99..82e3f7663 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -94,6 +94,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.prcType == '5') {
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       }
     }
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
new file mode 100644
index 000000000..3ece69515
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{$t('circulationHistory')}}
+      </div>
+    </div>
+    <div style="width: 100%">
+      <a-table
+        ref="table"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { Base64 } from 'js-base64'
+
+  export default {
+    name: 'regulatoryCirculationHistory',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('operationContent'),
+            dataIndex: 'name',
+            align: 'center',
+            width: '20%'
+          },
+          {
+            title: this.$t('Operator'),
+            dataIndex: 'assignee',
+            align: 'center',
+            width: '20%'
+          },
+          {
+            title: this.$t('role'),
+            dataIndex: 'approvalOpinion',
+            align: 'center',
+            width: '20%'
+          },
+          {
+            title: this.$t('operationTime'),
+            dataIndex: 'createTime',
+            align: 'center',
+            width: '20%',
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getList() {
+        let query = {
+          actiProcInstId: this.$route.query.prcId,
+          flowType: '5'
+        }
+        getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+          } else {
+            this.dataSource = []
+          }
+
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 7c8e09c40..5f980019f 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -32,7 +32,7 @@
 <script>
   import headerProcess from '../../components/headerProcess'
   import standardContent from '../../components/standardContent'
-  import circulationHistory from '../../components/taskCirculationHistory'
+  import circulationHistory from '../../components/regulatoryCirculationHistory'
   import footerProcess from '../../components/footerProcess'
   import feedbackInformation from '../../components/feedbackInformation'
 
@@ -63,21 +63,21 @@
           },
           {
             title: this.$t('regulatoryEngineer'),
-            value: 'regulatoryEngineer'
+            value: 'currentUserName'
           },
           {
             title: this.$t('closingDate'),
-            value: 'closingDate'
+            value: 'endTime'
           },
           {
             title: this.$t('enclosure'),
-            value: 'enclosure',
+            value: 'accessory_id',
             type: 2
           },
           {},
           {
             title: this.$t('taskDescription'),
-            value: 'taskDescription'
+            value: 'taskExplain'
           }
           // {
           //   title: this.$t('remarks'),
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 e2fc23025..0cf614453 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -161,6 +161,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.prcType == '5') {
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       },
       onChange(page, pageSize) {