From 4874b22d936baea99130dc528183bf4d06ad0cd5 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 12 Aug 2024 10:32:01 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug88408?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonmatchItem/NonmatchItemList.vue | 19 +++++++++++++++++-- .../modules/AssessmentLookModal.vue | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue index de9a030..6e72986 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue @@ -117,6 +117,14 @@ + + + + {{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }} + + {{ global.emptyLine }} + + {{ $t('view') }} @@ -133,6 +141,8 @@ + + @@ -144,10 +154,11 @@ import NonmatchItemCloseModal from './modules/NonmatchItemCloseModal' import NonmatchItemLookModal from './modules/NonmatchItemLookModal' import { queryDepartTreeList } from '../../../api/api' import UploadFile from '@/components/UploadFile' +import SplitClauseDetail from '../../documentTool/documentSplit/modules/SplitClauseDetail' export default { name: 'NonmatchItemList', - components: { JTable, NonmatchItemCloseModal, NonmatchItemLookModal, UploadFile }, + components: { JTable, NonmatchItemCloseModal, NonmatchItemLookModal, UploadFile, SplitClauseDetail }, mixins: [JeroListMixin], data () { return { @@ -194,7 +205,7 @@ export default { align: 'center', width: 180, dataIndex: 'termContent', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'item_content' } }, { // 责任部门 title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.responsibleDepartment'), @@ -320,6 +331,10 @@ export default { } }) }, + // 显示条款内容弹框 + showContent (val) { + this.$refs.splitClauseDetail.open(val) + }, // 批量关闭 batchClose () { if (this.selectedRowKeys.length <= 0) { diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue index e541e6b..9f2e88c 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue @@ -91,6 +91,14 @@ + + + + {{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }} + + {{ global.emptyLine }} + + {{ text || text === 0 ? text : global.emptyLine }} @@ -107,6 +115,8 @@ + + @@ -115,10 +125,11 @@ import { JeroListMixin } from '@/mixins/JeroListMixin' import { queryDepartTreeList } from '../../../../api/api' import UploadFile from '@/components/UploadFile' +import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail' export default { name: 'AssessmentLookModal', - components: { UploadFile }, + components: { UploadFile, SplitClauseDetail }, mixins: [JeroListMixin], data () { return { @@ -148,7 +159,7 @@ export default { align: 'center', width: 180, dataIndex: 'termContent', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'item_content' } }, { // 车型 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.vehicleType'), @@ -269,6 +280,10 @@ export default { } }) }, + // 显示条款内容弹框 + showContent (val) { + this.$refs.splitClauseDetail.open(val) + }, filterTreeOption (input, option) { const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label return text.toLowerCase().indexOf(input.toLowerCase()) >= 0