QR/laws_chery_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
赵霄
2024-06-26 15:08:12 +08:00
parent 022296b667 a47e30970f
commit 9d4112a049
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+2 -3
View File
@@ -102,8 +102,7 @@
rowKey="id" rowKey="id"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="false" :pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
:operationList="operationList" :operationList="operationList"
@operationClick="operationClick" @operationClick="operationClick"
@@ -120,7 +119,7 @@
<!-- 附件 --> <!-- 附件 -->
<template v-slot:file="{text, record}"> <template v-slot:file="{text, record}">
<a-tooltip overlay-class-name="tooltip-style"> <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> <a v-if="text" class="link-a" @click="previewFile(record)">{{ record.file_dictText }}</a>
<div v-else class="table-text">{{ global.emptyLine }}</div> <div v-else class="table-text">{{ global.emptyLine }}</div>
</a-tooltip> </a-tooltip>
src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
+2 -2
View File
@@ -74,7 +74,7 @@
rowKey="id" rowKey="id"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="false" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
:operationList="operationList" :operationList="operationList"
@@ -129,7 +129,7 @@ export default {
title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.applicableMarket'), title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.applicableMarket'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'applicableMarket', dataIndex: 'applicableMarket_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 评估日期 { // 评估日期
src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
+1 -1
View File
@@ -81,7 +81,7 @@
rowKey="id" rowKey="id"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="false" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"> @change="handleTableChange">
src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
+1 -1
View File
@@ -91,7 +91,7 @@
rowKey="id" rowKey="id"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="false" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"> @change="handleTableChange">