BYD/structureplugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改全文对比得细节问题

Browse Source
This commit is contained in:
范强强
2024-02-29 09:46:25 +08:00
parent 27cd6f1118
commit 94606b404a
6 changed files with 395 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -484,7 +484,7 @@ module.exports = {
remarkInfo: 'Remarks Info',
comparisonOfTerms: 'Comparison Of Terms',
comparison: 'Comparison',
initiateDocumentComparison: 'Initiate Document Comparison',
initiateDocumentComparison: 'Full Text Comparison',
documentComparison: 'Doc Comparison',
viewTheComparisonResults: 'View Results',
addFullTextComment: 'Full Text Comment',
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -496,7 +496,7 @@ module.exports = {
remarkInfo: '备注信息',
comparisonOfTerms: '条款对比',
comparison: '比对',
initiateDocumentComparison: '发起文档对比',
initiateDocumentComparison: '全文对比',
documentComparison: '文档对比',
viewTheComparisonResults: '查看对比结果',
addFullTextComment: '添加全文评论',
jero-web/src/config/router.config.js
+1 -1
View File
@@ -48,7 +48,7 @@ export const constantRouterMap = [
path: '/documentTool/DocumentDataComparison',
name: 'documentTool-DocumentDataComparison',
meta: {
title: '新旧拆分单对比-文档对比'
title: '新旧拆分单对比-全文对比'
},
component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/DocumentDataComparison')
},
jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue
+5 -7
View File
@@ -300,16 +300,14 @@ export default {
}
})
} else {
if (item.releaseState === 'draft') {
item.isDisplay = 2
} else {
item.isDisplay = 1
}
this.$router.push({
path: '/documentTool/ComparisonResults',
path: '/documentTool/DocumentDataComparison',
query: {
id: item.id,
isDisplay: item.isDisplay
infoNameLeft: item.titleLeft,
infoNumberLeft: item.serialNumberLeft,
infoNameRight: item.titleRight,
infoNumberRight: item.serialNumberRight
}
})
}
jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
+325 -427
View File
@@ -1,39 +1,21 @@
<template>
<internal-detail-page :title="$t('docTool.comparison.documentComparison')"
<internal-detail-page :title="$t('docTool.comparison.initiateDocumentComparison')"
:content-padding="0"
:loading="loading"
need-custom-back-func
@back="handleBack">
<template v-slot:titleRightCustom>
<!--查看比对结果-->
<a-button class="header-btn"
type="primary"
icon="eye"
ghost
@click="viewTheComparisonResultsClick">
{{ $t('docTool.comparison.viewTheComparisonResults') }}
</a-button>
<!--添加全文评论-->
<a-button class="header-btn"
type="primary"
icon="message"
ghost
@click="addFullTextCommentClick">
{{ $t('docTool.comparison.addFullTextComment') }}
</a-button>
<!--关闭/打开自动匹配-->
<a-button class="header-btn"
type="primary"
:icon="isMatching?'close-circle':'check-circle'"
ghost
@click="turnOffAutomaticMatchingClick">
{{ isMatching ? $t('docTool.comparison.turnOffAutomaticMatching') : $t('docTool.comparison.turnOnAutoMatch') }}
</a-button>
</template>
<div class="can-scroll-content">
<div class="detail-content">
<!--左边的文档-->
<div class="detail-content-left">
<div class="detail-content-left-title">
<a-tooltip placement="topLeft">
<template #title>
<span>{{ $route.query.infoNumberLeft }} {{ $route.query.infoNameLeft }}</span>
</template>
<span>{{ $route.query.infoNumberLeft }} {{ $route.query.infoNameLeft }}</span>
</a-tooltip>
</div>
<!--左边的目录-->
<div class="standard-catalogue part-common" :class="{'hide-catalogue': !leftCatalogueShow}">
<div class="catalogue-show" @click="changeLeftCatalogueShow">
@@ -80,6 +62,14 @@
</div>
<!--右侧文档-->
<div class="detail-content-right">
<div class="detail-content-right-title">
<a-tooltip placement="topLeft">
<template #title>
<span>{{ $route.query.infoNumberRight }} {{ $route.query.infoNameRight }}</span>
</template>
<span>{{ $route.query.infoNumberRight }} {{ $route.query.infoNameRight }}</span>
</a-tooltip>
</div>
<!--右侧目录-->
<div class="standard-catalogue part-common" :class="{'hide-catalogue': !rightCatalogueShow}">
<div class="catalogue-show" @click="changeRightCatalogueShow">
@@ -126,49 +116,19 @@
</div>
</div>
</div>
<div class="remarks">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<div class="box-title-text-remarks">
<div class="title-text-remarks" :title="$t('docTool.comparison.comparisonOfArticles')" style="width: 84px">
<span>{{ $t('docTool.comparison.comparisonOfArticles') }}</span>
</div>
<a-form-model-item class="item-model" prop="comment">
<a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.comparisonOfArticles')"
v-model="formInline.comment"
:maxLength="500"
:rows="3" />
</a-form-model-item>
</div>
</a-form-model>
</div>
</div>
<div class="submit-button">
<!--一致-->
<a-button style="margin-right: 10px"
type="primary"
@click="consistentAssessmentClick">
{{ $t('docTool.comparison.consistentAssessment') }}
</a-button>
<!--保存-->
<a-button type="primary" @click="submit">{{ $t('preservation') }}</a-button>
</div>
<!--全文评论-->
<comparison-add-full-comment ref="comparisonAddFullComment" />
</internal-detail-page>
</template>
<script>
// 添加全文评论弹框
import ComparisonAddFullComment from './modules/ComparisonAddFullComment.vue'
import InternalDetailPage from '../../../components/InternalDetailPage.vue'
import { docComparsionConsistentAndSave, getComparisonDetail, clauseComparison } from '../../../api/documentToolApi.js'
import { getComparisonDetail, clauseComparison } from '../../../api/documentToolApi.js'
export default {
name: 'DocumentDataComparison',
components: { ComparisonAddFullComment, InternalDetailPage },
components: { InternalDetailPage },
data () {
return {
formInline: {},
@@ -192,98 +152,6 @@ export default {
this.getData()
},
methods: {
// 文档对比的一致按钮点击
consistentAssessmentClick () {
if (!this.dataLeft.id && !this.dataRight.id) {
this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared'))
return
}
const query = {
itemsIdLeft: this.dataLeft.id,
itemsIdRight: this.dataRight.id,
infoId: this.$route.query.id,
comment: '一致'
}
this.loading = true
docComparsionConsistentAndSave(query).then((res) => {
if (res.success) {
this.$message.success(res.message)
this.formInline = {}
// 保存之后会有一个淡蓝色的边框
if (this.leftHighlightMenuId === this.dataLeft.menuId) {
this.leftHighlightMenuId = null
}
if (this.rightHighlightMenuId === this.dataRight.menuId) {
this.rightHighlightMenuId = null
}
this.resultData.textRight.forEach(val => {
if (val.id === this.dataRight.id) {
val.reviewed = '1'
}
})
this.resultData.textLeft.forEach(val => {
if (val.id === this.dataLeft.id) {
val.reviewed = '1'
}
})
this.resultData = { ...this.resultData }
this.dataLeft = {}
this.dataRight = {}
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
},
// 文档对比的保存按钮点击
submit () {
if (!this.dataLeft.id && !this.dataRight.id) {
this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared'))
return
}
this.$refs.ruleForm.validate(valid => {
if (valid) {
const query = {
itemsIdLeft: this.dataLeft.id,
itemsIdRight: this.dataRight.id,
infoId: this.$route.query.id,
comment: this.formInline.comment
}
this.loading = true
docComparsionConsistentAndSave(query).then((res) => {
if (res.success) {
this.$message.success(res.message)
this.formInline = {}
// 保存之后会有一个淡蓝色的边框
if (this.leftHighlightMenuId === this.dataLeft.menuId) {
this.leftHighlightMenuId = null
}
if (this.rightHighlightMenuId === this.dataRight.menuId) {
this.rightHighlightMenuId = null
}
this.resultData.textRight.forEach(val => {
if (val.id === this.dataRight.id) {
val.reviewed = '1'
}
})
this.resultData.textLeft.forEach(val => {
if (val.id === this.dataLeft.id) {
val.reviewed = '1'
}
})
this.resultData = { ...this.resultData }
this.dataLeft = {}
this.dataRight = {}
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
}
})
},
// 查看对比结果按钮点击
viewTheComparisonResultsClick () {
this.$router.push({
@@ -294,17 +162,6 @@ export default {
}
})
},
// 添加全文评论按钮点击
addFullTextCommentClick () {
const query = {
id: this.$route.query.id
}
getComparisonDetail(query).then((res) => {
if (res.success) {
this.$refs.comparisonAddFullComment.open(res.result.comments || '')
}
})
},
// 关闭自动匹配、开启自动匹配
turnOffAutomaticMatchingClick () {
this.isMatching = !this.isMatching
@@ -415,7 +272,6 @@ export default {
},
// 右侧树选中
onSelectRight (selectedKeys, exports) {
debugger
const node = exports.node.$vnode.data.props.dataRef
const index = this.resultData.textRight.findIndex(tt => tt.menuId === node.menuId)
this.dataRight = this.resultData.textRight[index]
@@ -443,7 +299,7 @@ export default {
if (index > -1) {
const scrollContent = document.getElementsByClassName('detail-content-left-scroll')
const clauseItemDom = document.getElementsByClassName('detail-content-left-item')
scrollContent[0].scrollTop = clauseItemDom[index].offsetTop - 150
scrollContent[0].scrollTop = clauseItemDom[index].offsetTop - 175
}
},
/**
@@ -453,7 +309,7 @@ export default {
if (index > -1) {
const detailContent = document.getElementsByClassName('detail-content-right-scroll')
const detailRight = document.getElementsByClassName('detail-content-right-item')
detailContent[0].scrollTop = detailRight[index].offsetTop - 150
detailContent[0].scrollTop = detailRight[index].offsetTop - 175
}
},
handleBack () {
@@ -472,285 +328,327 @@ export default {
</script>
<style scoped lang="less">
.header-btn {
margin-left: 12px;
}
.header-btn:first-child {
margin-left: 0;
}
.can-scroll-content {
height: calc(100% - 52px);
overflow: auto;
}
.detail-content {
height: calc(100% - 131px);
background-color: #eff1f4;
}
.detail-content-left {
width: 50%;
float: left;
height: 100%;
border-right: 2px #EFF1F3 solid;
box-sizing: border-box;
border-bottom: 2px #EFF1F3 solid;
display: flex;
}
.detail-content-right {
width: 50%;
height: 100%;
float: left;
box-sizing: border-box;
border-bottom: 2px #EFF1F3 solid;
display: flex;
}
.detail-content-left-header {
width: 100%;
font-size: 16px;
font-family: Blue Sky Noto;
font-weight: 400;
color: #040B29;
margin-bottom: 24px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-title-text-remarks {
line-height: 1.4;
display: flex;
/*align-items: center;*/
margin-bottom: 10px;
}
.item-model {
width: calc(100% - 232px);
}
.title-text-remarks {
width: 68px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 6px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-button {
height: 38px;
/*margin-top: 2px;*/
}
.remarks {
margin-top: 20px;
width: 50%;
display: inline-block;
padding: 0 32px;
box-sizing: border-box;
}
.itemModel {
width: calc(100% - 232px);
}
.submit-button {
height: 52px;
text-align: right;
padding: 10px 24px;
}
.detail-content-left-container {
height: 100%;
overflow-y: auto;
transition: all 1s;
scroll-behavior: smooth;
flex: 1;
}
.detail-content-right-container {
height: 100%;
overflow-y: auto;
transition: all 1s;
scroll-behavior: smooth;
flex: 1;
.standard-name {
margin-right: 0;
.header-btn {
margin-left: 12px;
}
}
.detail-content-left-scroll {
height: calc(100% - 25px - 40px);
width: calc(100% - 20px);
display: inline-block;
margin: 0 10px 0 10px;
overflow: auto;
background-color: white;
}
.header-btn:first-child {
margin-left: 0;
}
.detail-content-right-scroll {
height: calc(100% - 25px - 40px);
width: calc(100% - 10px);
display: inline-block;
margin-left: 10px;
overflow: auto;
background-color: white;
}
.can-scroll-content {
height: 100%;
overflow: auto;
}
.detail-content-left-item {
padding: 16px 20px;
box-sizing: border-box;
border: 1px solid #EFF1F3;
cursor: pointer;
background-color: white;
}
.detail-content {
height: 100%;
background-color: #eff1f4;
}
.detail-content-right-item {
padding: 16px 20px;
box-sizing: border-box;
border: 1px solid #EFF1F3;
cursor: pointer;
background-color: white;
}
.detail-content-left {
width: 50%;
float: left;
height: 100%;
border-right: 2px #EFF1F3 solid;
box-sizing: border-box;
border-bottom: 2px #EFF1F3 solid;
/*display: flex;*/
}
.detail-content-left-item:last-child {
margin-bottom: 0;
}
.detail-content-right {
width: 50%;
height: 100%;
float: left;
box-sizing: border-box;
border-bottom: 2px #EFF1F3 solid;
/*display: flex;*/
}
.detail-content-item-text {
font-size: 16px;
font-weight: 400;
color: #040B29;
word-break: break-word;
/deep/ table {
.detail-content-left-header {
width: 100%;
font-size: 16px;
font-family: Blue Sky Noto;
font-weight: 400;
color: #040B29;
margin-bottom: 24px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
/deep/ img {
max-width: 100%;
}
}
.detail-content-item-selected {
border: 2px red solid !important;
}
.detail-content-item-saved {
border: 2px #21c9cc solid;
}
::v-deep .delClass {
color: #ff7168;
}
::v-deep .insertClass {
color: green;
}
/deep/ .ant-tree li span.ant-tree-switcher {
float: right;
}
::-webkit-scrollbar {
width: 3px;
}
.part-common {
border-radius: 8px;
background: #FFFFFF;
}
.standard-catalogue {
height: calc(100% - 20px);
width: 200px;
margin: 10px 10px 10px 0;
position: relative;
transition: width .2s linear;
/deep/ .ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected {
background-color: transparent !important;
color: @primary-color;
.box-title-text-remarks {
line-height: 1.4;
display: flex;
/*align-items: center;*/
margin-bottom: 10px;
}
.catalogue-show {
position: absolute;
width: 12px;
height: 24px;
left: 100%;
top: 50%;
transform: translateY(-50%);
background-color: @primary-color;
border-radius: 0 12px 12px 0;
cursor: pointer;
color: white;
.item-model {
width: calc(100% - 232px);
}
.anticon {
left: -2px;
position: absolute;
top: 50%;
transform: translateY(-50%);
.title-text-remarks {
width: 68px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 6px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-button {
height: 38px;
/*margin-top: 2px;*/
}
.remarks {
margin-top: 20px;
width: 50%;
display: inline-block;
padding: 0 32px;
box-sizing: border-box;
}
.itemModel {
width: calc(100% - 232px);
}
.submit-button {
height: 52px;
text-align: right;
padding: 10px 24px;
}
.detail-content-left-container {
height: calc(100% - 65px);
width: calc(100% - 201px);
display: inline-block;
overflow-y: auto;
transition: all 1s;
border-radius: 4px;
scroll-behavior: smooth;
flex: 1;
}
.detail-content-right-container {
height: calc(100% - 65px);
width: calc(100% - 201px);
overflow-y: auto;
display: inline-block;
transition: all 1s;
scroll-behavior: smooth;
flex: 1;
.standard-name {
margin-right: 0;
}
}
}
.hide-catalogue {
width: 0;
min-width: 0;
}
.detail-content-left-scroll {
height: calc(100% - 25px - 40px);
width: calc(100% - 20px);
display: inline-block;
margin: 0 10px 0 10px;
overflow: auto;
background-color: white;
border-radius: 7px;
}
.part-title {
height: 40px;
background: rgba(213, 44, 38, 0.12);
border-radius: 8px 8px 0 0;
line-height: 40px;
padding: 0 24px;
font-size: 16px;
font-family: PingFang SC-Semibold, PingFang SC, sans-serif;
font-weight: 600;
color: #1D2129;
white-space: nowrap;
overflow: hidden;
}
.detail-content-right-scroll {
height: calc(100% - 25px - 40px);
width: calc(100% - 10px);
display: inline-block;
margin-left: 10px;
overflow: auto;
border-radius: 7px;
background-color: white;
}
.has-title-part-content {
height: calc(100% - 40px);
overflow: auto;
padding: 0 20px;
}
.detail-content-left-item {
padding: 16px 20px;
box-sizing: border-box;
border: 1px solid #EFF1F3;
cursor: pointer;
background-color: white;
}
.standard-name {
margin: 10px 10px 5px 10px;
height: 40px;
background: #FFFFFF;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24px;
}
.detail-content-right-item {
padding: 16px 20px;
box-sizing: border-box;
border: 1px solid #EFF1F3;
cursor: pointer;
background-color: white;
}
.standard-name > span {
font-size: 16px;
font-family: PingFang SC-Semibold, PingFang SC, sans-serif;
font-weight: 600;
color: #1D2129;
flex: 1;
width: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: pointer;
}
.detail-content-left-item:last-child {
margin-bottom: 0;
}
.detail-content-item-text {
font-size: 16px;
font-weight: 400;
color: #040B29;
word-break: break-word;
/deep/ table {
width: 100%;
}
/deep/ img {
max-width: 100%;
}
}
.detail-content-item-selected {
border: 2px red solid !important;
}
.detail-content-item-saved {
border: 2px #21c9cc solid;
}
::v-deep .delClass {
color: #ff7168;
}
::v-deep .insertClass {
color: green;
}
/deep/ .ant-tree li span.ant-tree-switcher {
float: right;
}
::-webkit-scrollbar {
width: 3px;
}
.part-common {
border-radius: 8px;
background: #FFFFFF;
}
.standard-catalogue {
height: calc(100% - 83px);
width: 200px;
overflow: auto;
display: inline-block;
margin: 10px 0 10px 0;
position: relative;
transition: width .2s linear;
/deep/ .ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected {
background-color: transparent !important;
color: @primary-color;
}
.catalogue-show {
position: absolute;
width: 12px;
height: 24px;
left: 100%;
top: 50%;
transform: translateY(-50%);
background-color: @primary-color;
border-radius: 0 12px 12px 0;
cursor: pointer;
color: white;
.anticon {
left: -2px;
position: absolute;
top: 50%;
transform: translateY(-50%);
}
}
}
.hide-catalogue {
width: 0;
min-width: 0;
}
.part-title {
height: 40px;
background: rgba(213, 44, 38, 0.12);
border-radius: 8px 8px 0 0;
line-height: 40px;
padding: 0 24px;
font-size: 16px;
font-family: PingFang SC-Semibold, PingFang SC, sans-serif;
font-weight: 600;
color: #1D2129;
white-space: nowrap;
overflow: hidden;
}
.has-title-part-content {
height: calc(100% - 40px);
overflow: auto;
padding: 0 20px;
}
.standard-name {
margin: 10px 10px 5px 10px;
height: 40px;
background: #FFFFFF;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24px;
}
.standard-name > span {
font-size: 16px;
font-family: PingFang SC-Semibold, PingFang SC, sans-serif;
font-weight: 500;
color: #1D2129;
flex: 1;
width: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: pointer;
}
.detail-content-left-title {
height: 50px;
width: calc(100% - 12px);
background: #fff;
margin-top: 8px;
border-radius: 4px;
line-height: 50px;
padding: 0 10px;
box-sizing: border-box;
font-size: 14px;
font-family: PingFang SC-Semibold, PingFang SC, sans-serif;
font-weight: 600;
color: #1D2129;
}
.detail-content-right-title{
height: 50px;
width: calc(100% - 2px);
background: #fff;
margin-top: 8px;
border-radius: 4px;
line-height: 50px;
padding: 0 10px;
box-sizing: border-box;
font-size: 14px;
font-family: PingFang SC-Semibold, PingFang SC, sans-serif;
font-weight: 600;
color: #1D2129;
}
.detail-content-button{
text-align: right;
padding-right: 16px;
}
</style>
jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue
+62 -62
View File
@@ -33,7 +33,7 @@
:can-drag="true"
:loading="loadingLeft"
:pagination="false"
:scroll="{x: '100%',y:340}"
:scroll="{x: '100%',y:'calc(100vh - 400px)'}"
rowKey="id"
:data-source="dataSourceLeft"
:row-selection="{ selectedRowKeys: selectedRowKeysLeft, onChange: onSelectChangeLeft, columnTitle:' ', type: 'radio'}"
@@ -88,7 +88,7 @@
:can-drag="true"
:loading="loadingRight"
:pagination="false"
:scroll="{x: '100%',y:340}"
:scroll="{x: '100%',y:'calc(100vh - 400px)'}"
rowKey="id"
:data-source="dataSourceRight"
:row-selection="{ selectedRowKeys: selectedRowKeysRight, onChange: onSelectChangeRight, columnTitle:' ', type: 'radio'}"
@@ -112,21 +112,21 @@
</div>
</div>
<div class="remarks">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<div class="box-title-text-remarks">
<div class="title-text-remarks" :title="$t('docTool.comparison.remarkInfo')">
<span>{{ $t('docTool.comparison.remarkInfo') }}</span>
</div>
<a-form-model-item class="item-model" prop="remark">
<a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.remarkInfo')"
:maxLength="500"
v-model="formInline.remark"
:rows="4" />
</a-form-model-item>
</div>
</a-form-model>
</div>
<!-- <div class="remarks">-->
<!-- <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">-->
<!-- <div class="box-title-text-remarks">-->
<!-- <div class="title-text-remarks" :title="$t('docTool.comparison.remarkInfo')">-->
<!-- <span>{{ $t('docTool.comparison.remarkInfo') }}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="item-model" prop="remark">-->
<!-- <a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.remarkInfo')"-->
<!-- :maxLength="500"-->
<!-- v-model="formInline.remark"-->
<!-- :rows="4" />-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-form-model>-->
<!-- </div>-->
</div>
<div class="box-button">
@@ -346,55 +346,55 @@ export default {
this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared'))
return
}
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.loading = true
const query = {
leftStandard: this.selectedRowsLeft[0].id,
rightStandard: this.selectedRowsRight[0].id,
remark: this.formInline.remark
}
if (type === 'comparisonOfTerms') {
submitItemComparison(query).then((res) => {
if (res.success) {
this.loading = false
this.$message.success(this.$t('operationSuccessful'))
this.$router.push({
path: '/documentTool/comparisonOfTerms',
query: {
id: res.result,
infoIdLeft: this.selectedRowsLeft[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 {
this.loading = false
this.$message.warning(res.message)
this.loading = true
const query = {
leftStandard: this.selectedRowsLeft[0].id,
rightStandard: this.selectedRowsRight[0].id,
remark: this.formInline.remark
}
if (type === 'comparisonOfTerms') {
submitItemComparison(query).then((res) => {
if (res.success) {
this.loading = false
this.$message.success(this.$t('operationSuccessful'))
this.$router.push({
path: '/documentTool/comparisonOfTerms',
query: {
id: res.result,
infoIdLeft: this.selectedRowsLeft[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 {
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)
this.loading = false
this.$message.warning(res.message)
}
})
} 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,
infoNameLeft: this.selectedRowsLeft[0].title,
infoNumberLeft: this.selectedRowsLeft[0].serialNumber,
infoNameRight: this.selectedRowsRight[0].title,
infoNumberRight: this.selectedRowsRight[0].serialNumber
}
})
} else {
this.loading = false
this.$message.warning(res.message)
}
}
})
})
}
},
getListLeft () {
const queryParam = JSON.parse(JSON.stringify(this.queryParamLeft))
@@ -498,8 +498,8 @@ export default {
.detail-content-box {
display: flex;
height: calc(100% - 152px);
min-height: calc(340px + 46px + 40px + 72px + 48px);
height: calc(100% - 12px);
/*min-height: calc(340px + 46px + 40px + 72px + 48px);*/
}
.detail-content-left {