对接法规意见收集

jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue

@@ -166,16 +166,9 @@
     },
     methods: {
       getTree() {
-        let query = {
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => {
-          pageNo: this.pageNo,
-          pageSize: 1000
-        }
-        getAction('/report/lawsMonthlyReportTitleTemplateEO/page', query).then((res) => {
           if (res.success) {
-            this.chapterContentsList = res.result.records || []
+            this.chapterContentsList = res.result || []
-            this.chapterContentsList.forEach(res => {
-
-            })
           } else {
             this.chapterContentsList = []
           }

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')
         }
       }
     }

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>

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'),

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) {