diff --git a/src/views/businessSupport/askForAdvice/AskForAdviceDetail.vue b/src/views/businessSupport/askForAdvice/AskForAdviceDetail.vue index 3133a0da..d55481b0 100644 --- a/src/views/businessSupport/askForAdvice/AskForAdviceDetail.vue +++ b/src/views/businessSupport/askForAdvice/AskForAdviceDetail.vue @@ -54,9 +54,10 @@ :scroll="{x: '100%'}" @change="handleTableChange"> - - @@ -75,10 +78,11 @@ import JTable from '../../../components/jero/JTable' import { JeroListMixin } from '../../../mixins/JeroListMixin' import { queryAskForAdviceDetail } from '../../../api/businessSupport' import { StandardSource } from '../../../enums/commonEnums' +import TextContentModal from './modules/TextContentModal' export default { name: 'AskForAdviceDetail', - components: { JTable, FileEcho, InternalDetailPage }, + components: { JTable, FileEcho, InternalDetailPage, TextContentModal }, mixins: [JeroListMixin], data () { return { @@ -118,21 +122,21 @@ export default { align: 'center', width: 180, dataIndex: 'modificationBefore', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改后 title: this.$t('workCenter.enStandardChange.afterUpdate'), align: 'center', width: 180, dataIndex: 'modificationAfter', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改理由 title: this.$t('workCenter.enStandardChange.updateReason'), align: 'center', width: 180, dataIndex: 'modificationReason', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } } ] }, @@ -304,6 +308,9 @@ export default { this.$openPageNewSheet({ path, query }) + }, + showContent (text) { + this.$refs.textContentModal.open(text) } } } diff --git a/src/views/businessSupport/askForAdvice/modules/TextContentModal.vue b/src/views/businessSupport/askForAdvice/modules/TextContentModal.vue new file mode 100644 index 00000000..b34c6704 --- /dev/null +++ b/src/views/businessSupport/askForAdvice/modules/TextContentModal.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index 0a537c43..d230a15b 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -179,6 +179,12 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :loading="loading"> + + +
{{ $t('edit') }} @@ -205,6 +211,13 @@ :extra-form="collectExtraForm" :all-disabled="disabledConsultationList" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"> + + + + @@ -304,10 +319,12 @@ import { } from '../../../api/workCenter' import UserSelectModal from '../../../components/selection/UserSelectModal' import { getFileInfo } from '../../../api/api' +import TextContentModal from '../../businessSupport/askForAdvice/modules/TextContentModal' export default { name: 'StandardConsultationProcess', components: { + TextContentModal, UserSelectModal, FileEcho, PersonnelInfo, @@ -461,21 +478,21 @@ export default { align: 'center', width: 180, dataIndex: 'modificationBefore', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改后 title: this.$t('workCenter.enStandardChange.afterUpdate'), align: 'center', width: 180, dataIndex: 'modificationAfter', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改理由 title: this.$t('workCenter.enStandardChange.updateReason'), align: 'center', width: 180, dataIndex: 'modificationReason', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } } ] }, @@ -520,21 +537,21 @@ export default { align: 'center', width: 180, dataIndex: 'modificationBefore', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改后 title: this.$t('workCenter.enStandardChange.afterUpdate'), align: 'center', width: 180, dataIndex: 'modificationAfter', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改理由 title: this.$t('workCenter.enStandardChange.updateReason'), align: 'center', width: 180, dataIndex: 'modificationReason', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } } ] }, @@ -682,21 +699,21 @@ export default { align: 'center', width: 180, dataIndex: 'modificationBefore', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改后 title: this.$t('workCenter.enStandardChange.afterUpdate'), align: 'center', width: 180, dataIndex: 'modificationAfter', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } }, { // 修改理由 title: this.$t('workCenter.enStandardChange.updateReason'), align: 'center', width: 180, dataIndex: 'modificationReason', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'modalDetail' } } ] }, @@ -1166,6 +1183,9 @@ export default { */ handleOpinionChange (value, index) { this.$set(this.dataSource[index], 'isAdopt', value) + }, + showContent (text) { + this.$refs.textContentModal.open(text) } } } diff --git a/src/views/workCenter/standardConsultationProcess/modules/ConsultationModal.vue b/src/views/workCenter/standardConsultationProcess/modules/ConsultationModal.vue index 846b7cb3..5a9476d1 100644 --- a/src/views/workCenter/standardConsultationProcess/modules/ConsultationModal.vue +++ b/src/views/workCenter/standardConsultationProcess/modules/ConsultationModal.vue @@ -40,22 +40,22 @@