From a56832d622916ecabb9e3a1ee28bddee1deb56eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Wed, 18 Oct 2023 10:02:40 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/documentToolApi.js | 9 ++-- src/common/lang/zh-cn.js | 2 +- .../documentSplit/DocumentSplitDetail.vue | 25 ++++++++--- .../documentSplit/modules/SplitAddForm.vue | 36 +++++++++------- .../modules/SplitClauseDetail.vue | 3 +- .../modules/SplitDetailBatchEditDrawer.vue | 42 +++++++++---------- 6 files changed, 67 insertions(+), 50 deletions(-) diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js index ac3026eb..caf6aac8 100644 --- a/src/api/documentToolApi.js +++ b/src/api/documentToolApi.js @@ -34,10 +34,6 @@ const batchCopyClause = (params) => getAction('/laws/DocumentTool/documentSplit/ const merageClause = (params) => postAction('/laws/DocumentTool/documentSplit/mergeDocumentSplitDetail', params) // 文档拆分编辑-批量编辑 const editBatchEditClause = (params) => postAction('/laws/DocumentTool/documentSplit/editBatchDocumentSplitDetail', params) -// 文档拆分编辑-批量编辑-获取表单 -const getFormForBatchEditClause = (params) => getAction('/split/sarFileSplitItems/getBatchSetForm', params) -// 文档拆分编辑-批量编辑-获取表单内容 -const getFormDataForBatchEditClause = (params) => getAction('/split/sarFileSplitItems/batchSet', params) // 文档拆分编辑-获取左侧树数据 const getClauseTreeData = (params) => getAction('/split/sarFileSplitMenu/getSplitMenusByInfoId', params) // 文档拆分-编辑-树节点新增 @@ -46,6 +42,8 @@ const addClauseTreeNode = (params) => postAction('/split/sarFileSplitMenu/addMen const editClauseTreeNode = (params) => postAction('/split/sarFileSplitMenu/updateMenu', params) // 文档拆分-编辑-复制 const copyClause = (params) => getAction('/laws/DocumentTool/documentSplit/copyDocumentSplitDetail', params) +// 文档拆分-编辑-获取条文解读数据 +const getInterpretationArticlesList = (params) => getAction('/laws/DocumentTool/documentSplit/queryInterpretationArticlesList', params) // 文档对比-发布/撤回 const withdrawPublication = (params) => postAction('/compare/sarFileCompareInfo/changeState', params) @@ -92,12 +90,11 @@ export { batchCopyClause, merageClause, editBatchEditClause, - getFormForBatchEditClause, - getFormDataForBatchEditClause, getClauseTreeData, addClauseTreeNode, editClauseTreeNode, copyClause, + getInterpretationArticlesList, // 文档比对 withdrawPublication, diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 95d61dc8..c85765ec 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -434,7 +434,7 @@ module.exports = { gbt: 'GB/T', gso: 'GSO', batchSetting: '批量设置', - clauseContent: '条款内容', + clauseContent: '条文内容', clauseNo: '条款号', clauseName: '条款名称', selectDirectoryTerms: '请选择添加条款的目录位置', diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue index 60654836..730d4fb2 100644 --- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue +++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue @@ -143,7 +143,14 @@ + + + @@ -153,7 +160,7 @@ - + @@ -261,7 +268,7 @@ export default { downTemplateUrl: '/split/sarFileSplitItems/exportTemplate' // 模板下载 }, disabledMixinsCreate: true, - tableSlotField: ['item_content'] + tableSlotField: ['item_content', 'interpretation_articles'] } }, computed: { @@ -326,8 +333,16 @@ export default { this.loadData() }, - // 显示条款内容弹框 - showContent (val) { + /** + * 显示条款内容、条文解读弹框 + * @param fieldName + * @param val + */ + showContent (fieldName, val) { + const title = (this.columns.find(tt => tt.dbFieldName === fieldName) || {}).dbFieldTxt + if (title) { + this.$refs.splitClauseDetail.title = title + } this.$refs.splitClauseDetail.open(val) }, // 获取左侧目录数据 diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue index 33b938a2..93d691c2 100644 --- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue +++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue @@ -33,7 +33,7 @@
{{ $t('newlyAdded') }} + :disabled="interpretationArticlesList.length === 1 && unscrambleIndex === interpretationArticlesList.length - 1"> {{ $t('delete') }}
@@ -207,7 +207,8 @@ import { getDocSplitEditFormData, addClause, editClause, - getEditClauseContent + getEditClauseContent, + getInterpretationArticlesList } from '../../../../api/documentToolApi.js' import UserSelection from '../../../../components/selection/UserSelection.vue' import JMultipleDatePicker from '../../../../components/JMultipleDatePicker.vue' @@ -321,6 +322,7 @@ export default { this.getForm(() => { this.loadFormInfo() this.getClauseContentList() + this.initInterpretationArticlesList() }) }, /** @@ -442,14 +444,6 @@ export default { if (!this.formInline.is_long_effect) { this.formInline.is_long_effect = YesOrNoEnum.NO.value } - // 条文解读数据处理 - if (this.formInline.interpretationArticlesList && this.formInline.interpretationArticlesList.length > 0) { - this.interpretationArticlesList = this.formInline.interpretationArticlesList - } else { - this.interpretationArticlesList = [{ - itemContent: null - }] - } } }) }, @@ -581,6 +575,7 @@ export default { this.visible = false this.formInline = {} this.contentList = [] + this.interpretationArticlesList = [] }, handleSave () { if (this.submitFlag) { @@ -642,7 +637,7 @@ export default { * @param index */ handleAddUnscramble (index) { - this.interpretationArticlesList.splice(index + 1, 0, { id: '', itemContent: null }) + this.interpretationArticlesList.splice(index + 1, 0, { id: '', itemContent: null, displaySeq: 1 }) }, /** * 删除条文解读 @@ -652,6 +647,19 @@ export default { if (item.id) { this.deleteIds.push(item.id) } + }, + /** + * 获取条文解读数据 + */ + initInterpretationArticlesList () { + getInterpretationArticlesList({ id: this.itemVal.id }).then(res => { + if (res.success) { + this.interpretationArticlesList = res.result || [{ + itemContent: null, + displaySeq: 1 + }] + } + }) } } } @@ -829,7 +837,7 @@ export default { width: 0; flex: 1; - table { + /deep/ table { width: 100%; } } @@ -858,10 +866,6 @@ export default { &-content { width: 0; flex: 1; - - table { - width: 100%; - } } &-operate { diff --git a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue index 8675c00c..d26bd2bd 100644 --- a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue +++ b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue @@ -1,6 +1,6 @@