diff --git a/jero-web/src/api/documentToolApi.js b/jero-web/src/api/documentToolApi.js index 1997bf7..db1d8ea 100644 --- a/jero-web/src/api/documentToolApi.js +++ b/jero-web/src/api/documentToolApi.js @@ -63,6 +63,9 @@ const docComparsionConsistentAndSave = (params) => postAction('/compare/sarFileC const getComparisonDetail = (params) => postAction('/compare/sarFileCompareInfo/getComparisonDetail', params) // 文档对比-文档对比-条款对比左侧目录 const getSplitMenusByInfo = (params) => getAction('/split/sarFileSplitMenu/getSplitMenusByInfoId', params) +// 文档对比-文档对比-条款对比右侧展示 +const documentSplitView = (params) => postAction('/laws/DocumentTool/documentSplit/queryView', params) + // 文档对比-文档对比-自动匹配 const clauseComparison = (params) => getAction('/compare/sarFileCompareItem/clauseComparison', params) // 文档对比-添加全文评论 @@ -139,6 +142,7 @@ export { docComparsionConsistentAndSave, getComparisonDetail, getSplitMenusByInfo, + documentSplitView, clauseComparison, addFullTextComment, deleteComparisonResult, diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bc36786..f94aee9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -473,6 +473,7 @@ module.exports = { newDocumentTextNumber: 'New document text number', newDocumentTextName: 'New document text name', newTextState: 'New text state', + comparisonType: 'Comparison Type', releaseSituation: 'Release situation', comparisonResults: 'Comparison results', initiateComparison: 'Initiate Comparison', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index fae6720..cf93f72 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -485,6 +485,7 @@ module.exports = { newDocumentTextNumber: '新文档文本号', newDocumentTextName: '新文档文本名称', newTextState: '新文本状态', + comparisonType: '比对类型', releaseSituation: '发布情况', comparisonResults: '对比结果', initiateComparison: '发起对比', diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue index 7d192a4..c8089d1 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -157,18 +157,24 @@ export default { width: 150, dataIndex: 'fileTypeRight_dictText' }, - // 发布情况 + // 比对类型 { - title: this.$t('docTool.comparison.releaseSituation'), + title: this.$t('docTool.comparison.comparisonType'), width: 150, - dataIndex: 'releaseState_dictText' + dataIndex: 'compareTypeShow' }, + // 发布情况 + // { + // title: this.$t('docTool.comparison.releaseSituation'), + // width: 150, + // dataIndex: 'releaseState_dictText' + // }, // 创建人 - { - title: this.$t('creator'), - width: 180, - dataIndex: 'createNameNo' - }, + // { + // title: this.$t('creator'), + // width: 180, + // dataIndex: 'createNameNo' + // }, // 备注 { title: this.$t('remarks'), @@ -190,36 +196,36 @@ export default { clickEvent: 'comparisonResultsClick' }, // 发布 - { - text: this.$t('release'), - clickEvent: 'subscribe', - show: (record) => { - return !record.releaseState || record.releaseState === 'draft' - } - }, + // { + // text: this.$t('release'), + // clickEvent: 'subscribe', + // show: (record) => { + // return !record.releaseState || record.releaseState === 'draft' + // } + // }, // 撤回 - { - text: this.$t('withdraw'), - clickEvent: 'subscribe', - show: (record) => { - return !(!record.releaseState || record.releaseState === 'draft') - } - }, + // { + // text: this.$t('withdraw'), + // clickEvent: 'subscribe', + // show: (record) => { + // return !(!record.releaseState || record.releaseState === 'draft') + // } + // }, // 编辑 { text: this.$t('edit'), clickEvent: 'edit', - show: (record) => { - return !record.releaseState || record.releaseState === 'draft' - } + // show: (record) => { + // return !record.releaseState || record.releaseState === 'draft' + // } }, // 删除 { text: this.$t('delete'), clickEvent: 'handleDelete', - show: (record) => { - return !record.releaseState || record.releaseState === 'draft' - } + // show: (record) => { + // return !record.releaseState || record.releaseState === 'draft' + // } } ] } @@ -251,10 +257,7 @@ export default { const idList = [] const selectionRows = JSON.parse(JSON.stringify(this.selectionRows)) for (let i = 0; i < selectionRows.length; i++) { - if (selectionRows[i].createBy === this.userInfo.username && - selectionRows[i].releaseState === 'draft') { - idList.push(selectionRows[i].id) - } + idList.push(selectionRows[i].id) } if (idList.length > 0) { postAction(this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { diff --git a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue index 73d3c1b..dae0fe5 100644 --- a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue @@ -364,7 +364,11 @@ export default { query: { id: res.result, infoIdLeft: this.selectedRowsLeft[0].id, - infoIdRight: this.selectedRowsRight[0].id + infoNameLeft: this.selectedRowsLeft[0].title, + infoNumberLeft: this.selectedRowsLeft[0].serialNumber, + infoIdRight: this.selectedRowsRight[0].id, + infoNameRight: this.selectedRowsRight[0].title, + infoNumberRight: this.selectedRowsRight[0].serialNumber, } }) } else { diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue index 5f766c5..5de2ca2 100644 --- a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue +++ b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue @@ -10,7 +10,7 @@