From a47e30970f4c109fe63431830eb62243d5e177a0 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 26 Jun 2024 13:42:09 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonmatchItem/NonmatchItemList.vue                        | 5 ++---
 .../RegulatoryComplianceAssessmentList.vue                   | 4 ++--
 .../marketRegulationsList/MarketRegulationsDetailPage.vue    | 2 +-
 .../marketRegulationsList/MarketRegulationsList.vue          | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
index 79d2ddb..da0caf6 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
@@ -102,8 +102,7 @@
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
-        :pagination="false"
-        :loading="loading"
+        :pagination="ipagination"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         :operationList="operationList"
         @operationClick="operationClick"
@@ -120,7 +119,7 @@
         <!--  附件 -->
         <template v-slot:file="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+            <template slot="title">{{ record.file_dictText || record.file_dictText === 0 ? record.file_dictText : global.emptyLine }}</template>
             <a v-if="text" class="link-a" @click="previewFile(record)">{{ record.file_dictText }}</a>
             <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
index b9b2c4f..92e7483 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
@@ -74,7 +74,7 @@
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
-        :pagination="false"
+        :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         :operationList="operationList"
@@ -129,7 +129,7 @@ export default {
           title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.applicableMarket'),
           align: 'center',
           width: 180,
-          dataIndex: 'applicableMarket',
+          dataIndex: 'applicableMarket_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 评估日期
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
index ee35943..6e8168e 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
@@ -81,7 +81,7 @@
           rowKey="id"
           :columns="columns"
           :dataSource="dataSource"
-          :pagination="false"
+          :pagination="ipagination"
           :loading="loading"
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange">
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
index 6daf106..2b63fdf 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
@@ -91,7 +91,7 @@
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
-        :pagination="false"
+        :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">