From 42067060b4b973393ac459700398103b721b0013 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 30 Jun 2022 09:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=9C=88?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionOfRegulatoryOpinions/index.vue  | 21 ++++++++++++++--
 .../components/RegulationMonthlyFill.vue      |  4 +--
 .../components/modules/fillTable.vue          | 25 ++++++++++++++++---
 .../components/modules/fillTableAdd.vue       |  4 +--
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index c74b36e03..45a26c812 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -95,6 +95,7 @@
 
 <script>
   import evaluationResultsList from './components/evaluationResultsList'
+  import { getAction, postAction } from '@/api/manage'
 
   export default {
     name: 'index',
@@ -105,7 +106,8 @@
       return {
         //url传参严格按照当前命名
         url: {
-          deleteBatch: ''
+          deleteBatch: '',
+          list: '/lawsOpinionGather/lawsOpinionGatherEO/page'
         },
         loading: false,
         toggleSearchStatus: false,
@@ -167,6 +169,7 @@
       }
     },
     mounted() {
+      this.getList()
     },
     methods: {
       handleToggleSearch() {
@@ -191,7 +194,21 @@
         this.getList()
       },
       getList() {
-
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
       },
       onSelectChange(value) {
         this.selectedRowKeys = value
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
index 2c85f06fd..023bfac40 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
@@ -109,7 +109,7 @@
           {
             title: this.$t('chineseTitle'),
             align: 'center',
-            dataIndex: 'chineseTitle',
+            dataIndex: 'titleCn',
             width: 170
           },
           {
@@ -117,7 +117,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'englishTitle'
+            dataIndex: 'titleEn'
           },
           {
             title: this.$t('regulatoryContact'),
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index 1d7841f2e..f6dd229df 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -53,6 +53,7 @@
 
 <script>
   import fillTableAdd from './fillTableAdd'
+  import { getAction, postAction } from '@/api/manage'
 
   export default {
     name: 'fillTable',
@@ -80,7 +81,7 @@
           {
             title: this.$t('chineseTitle'),
             align: 'center',
-            dataIndex: 'chineseTitle',
+            dataIndex: 'titleCn',
             width: 210
           },
           {
@@ -88,7 +89,7 @@
             align: 'center',
             width: 210,
             ellipsis: true,
-            dataIndex: 'englishTitle'
+            dataIndex: 'titleEn'
           },
           {
             title: this.$t('operation'),
@@ -124,7 +125,25 @@
         this.getList()
       },
       getList() {
-
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
+        }
+        this.loading = true
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/list', query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = res.result.current - 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
       },
       moveUpClick() {
 
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
index 628453061..1ae51d15c 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
@@ -19,7 +19,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="chineseTitle">
                 <a-input class="box-input"
-                         v-model="formInline.chineseTitle"
+                         v-model="formInline.titleCn"
                          :placeholder="$t('PleaseEnter')+$t('chineseTitle')"/>
               </a-form-model-item>
             </div>
@@ -31,7 +31,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="englishTitle">
                 <a-input class="box-input"
-                         v-model="formInline.englishTitle"
+                         v-model="formInline.titleEn"
                          :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
               </a-form-model-item>
             </div>