From d052f724af93578cf4c0a6e88a99cb71c29bd95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 21 Feb 2024 13:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=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/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + jero-web/src/config/router.config.js | 27 +- .../documentComparison/InitiateComparison.vue | 45 +- .../documentComparison/comparisonOfTerms.vue | 471 ++++++++++++++++++ 5 files changed, 520 insertions(+), 27 deletions(-) create mode 100644 jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0617782..e9a553b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -479,6 +479,8 @@ module.exports = { selectedStandard: 'Selected Standard', noComparisonDocumentSelected: 'No comparison document selected', remarkInfo: 'Remarks Info', + comparisonOfTerms: 'Comparison Of Terms', + comparison: 'Comparison', initiateDocumentComparison: 'Initiate Document Comparison', documentComparison: 'Doc Comparison', viewTheComparisonResults: 'View Results', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2452e8b..00b0727 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -491,6 +491,8 @@ module.exports = { selectedStandard: '所选标准', noComparisonDocumentSelected: '未选择对比文档', remarkInfo: '备注信息', + comparisonOfTerms: '条款对比', + comparison: '比对', initiateDocumentComparison: '发起文档对比', documentComparison: '文档对比', viewTheComparisonResults: '查看对比结果', diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index bfd419e..a46d2b9 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -28,15 +28,6 @@ export const constantRouterMap = [ // name: 'documentTool-documentSplit', // component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/DocumentSplit') // }, - // 标准分解单 - { - path: '/documentTool/StandardSplitSheet', - name: 'documentTool-StandardSplitSheet', - meta: { - title: '标准分解单' - }, - component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/StandardSplitSheet') - }, // 新旧拆分单对比 // { // path: '/documentTool/documentComparison', @@ -61,6 +52,15 @@ export const constantRouterMap = [ }, component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/DocumentDataComparison') }, + // 新旧拆分单对比-条款对比 + { + path: '/documentTool/comparisonOfTerms', + name: 'documentTool-comparisonOfTerms', + meta: { + title: '新旧拆分单对比-条款对比' + }, + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/comparisonOfTerms') + }, // 新旧拆分单对比-对比结果 { path: '/documentTool/ComparisonResults', @@ -81,6 +81,15 @@ export const constantRouterMap = [ } ] }, + // 标准分解单 + { + path: '/documentTool/StandardSplitSheet', + name: 'documentTool-StandardSplitSheet', + meta: { + title: '标准分解单' + }, + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/StandardSplitSheet') + }, // { // path: '/user', // component: UserLayout, diff --git a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue index 4a4d4e2..449c2ac 100644 --- a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue @@ -130,8 +130,12 @@
@@ -337,7 +341,7 @@ export default { this.ipaginationRight = pagination this.getListRight() }, - submit () { + submit (type) { if (!this.selectedRowsRight[0] || !this.selectedRowsLeft[0]) { this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared')) return @@ -350,22 +354,27 @@ export default { rightStandard: this.selectedRowsRight[0].id, remark: this.formInline.remark } - submitInitComparsion(query).then((res) => { - if (res.success) { - console.log(res) - this.loading = false - this.$message.success(this.$t('operationSuccessful')) - this.$router.push({ - path: '/documentTool/DocumentDataComparison', - query: { - id: res.result - } - }) - } else { - this.loading = false - this.$message.warning(res.message) - } - }) + if (type === 'comparisonOfTerms') { + this.$router.push({ + path: '/documentTool/comparisonOfTerms' + }) + } else { + submitInitComparsion(query).then((res) => { + if (res.success) { + this.loading = false + this.$message.success(this.$t('operationSuccessful')) + this.$router.push({ + path: '/documentTool/DocumentDataComparison', + query: { + id: res.result + } + }) + } else { + this.loading = false + this.$message.warning(res.message) + } + }) + } } }) }, diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue new file mode 100644 index 0000000..5478cef --- /dev/null +++ b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue @@ -0,0 +1,471 @@ + +