Merge remote-tracking branch 'origin/master'

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>

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' }
         },
         { // 评估日期

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">

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">