From 48d50501ced2d12b35973b59f63cb32a8131a4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 27 Feb 2024 15:17:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=9D=A1=E6=AC=BE=E6=AF=94?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/api/documentToolApi.js | 2 +- jero-web/src/config/router.config.js | 11 +- .../documentComparison/comparisonOfTerms.vue | 91 ++++++++++----- .../comparisonTermsView.vue | 109 ++++++++++++++++++ 4 files changed, 179 insertions(+), 34 deletions(-) create mode 100644 jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue diff --git a/jero-web/src/api/documentToolApi.js b/jero-web/src/api/documentToolApi.js index 29eb0e4..c2872a8 100644 --- a/jero-web/src/api/documentToolApi.js +++ b/jero-web/src/api/documentToolApi.js @@ -64,7 +64,7 @@ const getComparisonDetail = (params) => postAction('/compare/sarFileCompareInfo/ // 文档对比-文档对比-条款对比左侧目录 const getSplitMenusByInfo = (params) => getAction('/split/sarFileSplitMenu/getSplitMenusByInfoId', params) // 文档对比-文档对比-条款对比右侧展示 -const documentSplitView = (params) => postAction('/laws/DocumentTool/documentSplit/queryView', params) +const documentSplitView = (params) => postAction('/laws/DocumentTool/documentSplit/queryDocumentSplitDetail', params) // 文档对比-文档对比-条款对比对比按钮 const clauseComparisonEvent = (params) => postAction('/compare/sarFileCompareItem/clauseComparisonEvent', params) diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index a46d2b9..34a3a2a 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -61,7 +61,16 @@ export const constantRouterMap = [ }, component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/comparisonOfTerms') }, - // 新旧拆分单对比-对比结果 + // 新旧拆分单对比-条款对比对比结果 + { + path: '/documentTool/comparisonTermsView', + name: 'documentTool-comparisonTermsView', + meta: { + title: '新旧拆分单对比-条款对比' + }, + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/comparisonTermsView') + }, + // 新旧拆分单对比-对比结果全文对比 { path: '/documentTool/ComparisonResults', name: 'documentTool-ComparisonResults', diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue index 39cbd5d..f393e69 100644 --- a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue +++ b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue @@ -41,12 +41,12 @@
-
-
- 条款内容：
- 但是看见官方电话就是官方的话就十分大师傅df ghdfgkj定时联发科和司法会计的是疯狂的事哈佛导师反馈但是反馈的身 - 份和但是开发的是否和的课时费和上课积分都十分考究的释放的空间是犯得上看见发大师傅但是豆腐干豆腐干豆腐干的 +
+
+ 条款内容： +
+
@@ -87,12 +87,12 @@
-
-
- {{ item.itemsNum + ' ' + item.itemsName }} +
+
+ 条款内容：
-
+
@@ -108,6 +108,7 @@ {{ $t('docTool.comparison.comparison') }}
+ @@ -127,7 +128,9 @@ export default { menuRight: [], menuLeft: [], leftData: {}, - rightData: {} + rightData: {}, + textRight: '', + textLeft: '' } }, mounted () { @@ -149,15 +152,24 @@ export default { }, getLeftDocumentSplitView () { const query = { - menuId: this.leftData.id, - infoId: this.$route.query.infoIdLeft, - page: 1, - pageSize: 9999 + menu_id: this.leftData.id, + info_id: this.$route.query.infoIdLeft, + pageNo: 1, + pageSize: 9999, + order: 'desc' } + this.loading = true documentSplitView(query).then((res) => { if (res.success) { - + if (res.result.records && res.result.records.length > 0){ + this.textLeft = res.result.records[0].item_content + } else { + this.textLeft = '' + } + } else { + this.textLeft = '' } + this.loading = false }) }, // 右侧树选择 @@ -172,15 +184,24 @@ export default { getRightDocumentSplitView () { const query = { - menuId: this.rightData.id, - infoId: this.$route.query.infoIdRight, - page: 1, - pageSize: 9999 + menu_id: this.rightData.id, + info_id: this.$route.query.infoIdRight, + pageNo: 1, + pageSize: 9999, + order: 'desc' } + this.loading = true documentSplitView(query).then((res) => { if (res.success) { - + if (res.result.records && res.result.records.length > 0){ + this.textRight = res.result.records[0].item_content + } else { + this.textRight = '' + } + } else { + this.textRight = '' } + this.loading = false }) }, @@ -206,16 +227,22 @@ export default { }) }, comparisonClick () { - const query = { - // oldItemId: this.saveItemId, - // newItemId: this.saveItemIdRight, - standHisId: this.$route.query.id - } - clauseComparisonEvent(query).then((res) => { - if (res.success) { - + if (!this.leftData.id) { + this.$message.warning('请选择左侧条款') + } else if (!this.rightData.id) { + this.$message.warning('请选择右侧条款') + } else { + const query = { + oldItemId: this.leftData.id, + newItemId: this.rightData.id, + standHisId: this.$route.query.id } - }) + clauseComparisonEvent(query).then((res) => { + if (res.success) { + + } + }) + } } } } @@ -375,7 +402,7 @@ export default { .detail-content-right-item { padding: 16px 20px; box-sizing: border-box; - border: 1px solid #EFF1F3; + /*border: 1px solid #EFF1F3;*/ cursor: pointer; background-color: white; } diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue new file mode 100644 index 0000000..88d0b82 --- /dev/null +++ b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue @@ -0,0 +1,109 @@ + + + + +