update 文档比对
This commit is contained in:
@@ -322,18 +322,6 @@ export const constantRouterMap = [
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
// 文档对比-发起对比
|
|
||||||
{
|
|
||||||
path: '/initiateDocumentComparison',
|
|
||||||
name: 'initiateDocumentComparison',
|
|
||||||
component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/modules/InitiateComparison')
|
|
||||||
},
|
|
||||||
// 文档对比-发起对比
|
|
||||||
{
|
|
||||||
path: '/documentDataComparison',
|
|
||||||
name: 'documentDataComparison',
|
|
||||||
component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/modules/DocumentDataComparison')
|
|
||||||
},
|
|
||||||
// 文档对比-对比结果
|
// 文档对比-对比结果
|
||||||
{
|
{
|
||||||
path: '/comparisonResults',
|
path: '/comparisonResults',
|
||||||
|
|||||||
+17
-28
@@ -3,18 +3,21 @@
|
|||||||
<div class="table-page-search-wrapper">
|
<div class="table-page-search-wrapper">
|
||||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
|
<!--编号-->
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<a-form-item :label="$t('number')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
<a-form-item :label="$t('number')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
||||||
<a-input :placeholder="$t('pleaseEnter') + $t('number')"
|
<a-input :placeholder="$t('pleaseEnter') + $t('number')"
|
||||||
v-model="queryParam.serialNumber"></a-input>
|
v-model="queryParam.serialNumber"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<!--标题-->
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<a-form-item :label="$t('title')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
<a-form-item :label="$t('title')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
||||||
<a-input :placeholder="$t('pleaseEnter') + $t('title')"
|
<a-input :placeholder="$t('pleaseEnter') + $t('title')"
|
||||||
v-model="queryParam.title"></a-input>
|
v-model="queryParam.title"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<!--发布情况-->
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<a-form-item :label="$t('docTool.comparison.releaseSituation')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
<a-form-item :label="$t('docTool.comparison.releaseSituation')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
||||||
<j-dict-select-tag v-model="queryParam.releaseState"
|
<j-dict-select-tag v-model="queryParam.releaseState"
|
||||||
@@ -32,15 +35,10 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="table-operator">
|
<div class="table-operator">
|
||||||
<!-- v-has="'documentComparison:Initiate'"-->
|
<!-- v-has="'documentComparison:Initiate'"-->
|
||||||
<div @click="initiatingProcessClick" class="operator-text">
|
<a-button icon="block" type="primary" ghost @click="initiatingProcessClick">{{ $t('docTool.comparison.initiateComparison') }}
|
||||||
<a-icon type="block"/>
|
</a-button>
|
||||||
{{$t('docTool.comparison.initiateComparison')}}
|
|
||||||
</div>
|
|
||||||
<!-- v-has="'documentComparison:batchDelete'"-->
|
<!-- v-has="'documentComparison:batchDelete'"-->
|
||||||
<div @click="batchDelete" class="operator-text">
|
<a-button type="primary" icon="delete" ghost @click="batchDel" v-has="'split:sarFileSplitInfo:deleteBatch'">{{ $t('batchDelete') }}</a-button>
|
||||||
<a-icon type="delete"/>
|
|
||||||
{{$t('batchDelete')}}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<j-table
|
<j-table
|
||||||
@@ -63,7 +61,8 @@
|
|||||||
|
|
||||||
<a-dropdown v-if="record.createBy === userInfoQuery.username || administrators">
|
<a-dropdown v-if="record.createBy === userInfoQuery.username || administrators">
|
||||||
<a class="ant-dropdown-link">
|
<a class="ant-dropdown-link">
|
||||||
{{ $t('more') }} <a-icon type="down"/>
|
{{ $t('more') }}
|
||||||
|
<a-icon type="down" />
|
||||||
</a>
|
</a>
|
||||||
<a-menu slot="overlay">
|
<a-menu slot="overlay">
|
||||||
<a-menu-item>
|
<a-menu-item>
|
||||||
@@ -94,11 +93,11 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { postAction, deleteAction } from '@/api/manage'
|
import { postAction, deleteAction } from '../../../api/manage.js'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
import JDictSelectTag from '@/components/dict/JDictSelectTag'
|
import JDictSelectTag from '../../../components/dict/JDictSelectTag.vue'
|
||||||
import JTable from '@/components/jero/JTable'
|
import JTable from '../../../components/jero/JTable.vue'
|
||||||
import { JeroListMixin } from '../../mixins/JeroListMixin'
|
import { JeroListMixin } from '../../../mixins/JeroListMixin.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DocumentComparison',
|
name: 'DocumentComparison',
|
||||||
@@ -137,7 +136,6 @@ export default {
|
|||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: this.$t('number') + ' 1',
|
title: this.$t('number') + ' 1',
|
||||||
align: 'left',
|
|
||||||
dataIndex: 'serialNumberLeft',
|
dataIndex: 'serialNumberLeft',
|
||||||
width: 170,
|
width: 170,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
@@ -145,7 +143,6 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('title') + ' 1',
|
title: this.$t('title') + ' 1',
|
||||||
align: 'left',
|
|
||||||
dataIndex: 'titleLeft',
|
dataIndex: 'titleLeft',
|
||||||
width: 170,
|
width: 170,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
@@ -153,14 +150,12 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.textStatus') + ' 1',
|
title: this.$t('docTool.comparison.textStatus') + ' 1',
|
||||||
align: 'left',
|
width: 150,
|
||||||
width: 200,
|
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'fileTypeLeft'
|
dataIndex: 'fileTypeLeft'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('number') + ' 2',
|
title: this.$t('number') + ' 2',
|
||||||
align: 'left',
|
|
||||||
dataIndex: 'serialNumberRight',
|
dataIndex: 'serialNumberRight',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'serialNumberRight' },
|
scopedSlots: { customRender: 'serialNumberRight' },
|
||||||
@@ -168,7 +163,6 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('title') + ' 2',
|
title: this.$t('title') + ' 2',
|
||||||
align: 'left',
|
|
||||||
dataIndex: 'titleRight',
|
dataIndex: 'titleRight',
|
||||||
scopedSlots: { customRender: 'serialNumberRight' },
|
scopedSlots: { customRender: 'serialNumberRight' },
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
@@ -176,35 +170,30 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.textStatus') + ' 2',
|
title: this.$t('docTool.comparison.textStatus') + ' 2',
|
||||||
align: 'left',
|
width: 150,
|
||||||
width: 200,
|
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'fileTypeRight'
|
dataIndex: 'fileTypeRight'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.releaseSituation'),
|
title: this.$t('docTool.comparison.releaseSituation'),
|
||||||
align: 'left',
|
|
||||||
width: 170,
|
width: 170,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'releaseStateTitle'
|
dataIndex: 'releaseStateTitle'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('creator'),
|
title: this.$t('creator'),
|
||||||
align: 'left',
|
width: 150,
|
||||||
width: 170,
|
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'createBy'
|
dataIndex: 'createBy'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('remarks'),
|
title: this.$t('remarks'),
|
||||||
align: 'left',
|
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
width: 270,
|
width: 270,
|
||||||
dataIndex: 'remark'
|
dataIndex: 'remark'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('operation'),
|
title: this.$t('operation'),
|
||||||
align: 'center',
|
|
||||||
fixed: 'right',
|
fixed: 'right',
|
||||||
width: 310,
|
width: 310,
|
||||||
scopedSlots: { customRender: 'operation' }
|
scopedSlots: { customRender: 'operation' }
|
||||||
@@ -319,7 +308,7 @@ export default {
|
|||||||
// 发起对比按钮点击
|
// 发起对比按钮点击
|
||||||
initiatingProcessClick () {
|
initiatingProcessClick () {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: '/initiateDocumentComparison'
|
path: '/documentTool/InitiateComparison'
|
||||||
})
|
})
|
||||||
// let newUrl = this.$router.resolve({
|
// let newUrl = this.$router.resolve({
|
||||||
// path: '/initiateDocumentComparison'
|
// path: '/initiateDocumentComparison'
|
||||||
@@ -366,5 +355,5 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
@import '~@assets/less/common.less';
|
@import '~../../../assets/less/common.less';
|
||||||
</style>
|
</style>
|
||||||
+40
-73
@@ -1,33 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
<a-spin :spinning="loading">
|
<internal-detail-page :title="$t('docTool.comparison.documentComparison')" :content-padding="0" :loading="loading">
|
||||||
<div class="doc-detail-wrap">
|
<template v-slot:titleRightCustom>
|
||||||
<div class="doc-detail-header" style="position: fixed;top: 0">
|
<a-button class="header-btn" type="primary" icon="eye" ghost @click="viewTheComparisonResultsClick">
|
||||||
<div class="doc-detail-title">
|
|
||||||
<span style="line-height: 66px;display: inline-block;float: left" @click="goBack">
|
|
||||||
<a-icon type="arrow-left" style="margin-right: 6px;"/>
|
|
||||||
</span>
|
|
||||||
<span> {{$t('docTool.comparison.documentComparison')}}</span>
|
|
||||||
</div>
|
|
||||||
<div class="doc-detail-right">
|
|
||||||
<div @click="viewTheComparisonResultsClick" class="operator-text-text"
|
|
||||||
:title="$t('docTool.comparison.viewTheComparisonResults')">
|
|
||||||
<a-icon type="eye"/>
|
|
||||||
{{ $t('docTool.comparison.viewTheComparisonResults') }}
|
{{ $t('docTool.comparison.viewTheComparisonResults') }}
|
||||||
</div>
|
</a-button>
|
||||||
<div @click="addFullTextCommentClick" class="operator-text-text"
|
<a-button class="header-btn" type="primary" icon="message" ghost @click="addFullTextCommentClick">
|
||||||
:title="$t('docTool.comparison.addFullTextComment')">
|
|
||||||
<a-icon type="message"/>
|
|
||||||
{{ $t('docTool.comparison.addFullTextComment') }}
|
{{ $t('docTool.comparison.addFullTextComment') }}
|
||||||
</div>
|
</a-button>
|
||||||
<div @click="turnOffAutomaticMatchingClick" class="operator-text-text"
|
<a-button class="header-btn" type="primary" :icon="isMatching?'close-circle':'check-circle'" ghost @click="turnOffAutomaticMatchingClick">
|
||||||
:title="isMatching ? $t('docTool.comparison.turnOffAutomaticMatching'):$t('docTool.comparison.turnOnAutoMatch')">
|
|
||||||
<a-icon :type="isMatching?'close-circle':'check-circle'"/>
|
|
||||||
{{ isMatching ? $t('docTool.comparison.turnOffAutomaticMatching') : $t('docTool.comparison.turnOnAutoMatch') }}
|
{{ isMatching ? $t('docTool.comparison.turnOffAutomaticMatching') : $t('docTool.comparison.turnOnAutoMatch') }}
|
||||||
</div>
|
</a-button>
|
||||||
</div>
|
</template>
|
||||||
</div>
|
<div class="can-scroll-content">
|
||||||
<div class="detail-content">
|
<div class="detail-content">
|
||||||
<div class="detail-content-cont">
|
|
||||||
<div class="detail-content-left">
|
<div class="detail-content-left">
|
||||||
<div class="detail-content-left-header"
|
<div class="detail-content-left-header"
|
||||||
:title="resultData.serialNumberLeft + resultData.fileNameLeft">
|
:title="resultData.serialNumberLeft + resultData.fileNameLeft">
|
||||||
@@ -88,6 +73,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="remarks">
|
<div class="remarks">
|
||||||
<a-form-model :model="formInline"
|
<a-form-model :model="formInline"
|
||||||
class="formAdd" :rules="rules"
|
class="formAdd" :rules="rules"
|
||||||
@@ -105,26 +91,27 @@
|
|||||||
</div>
|
</div>
|
||||||
</a-form-model>
|
</a-form-model>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="submit-button">
|
<div class="submit-button">
|
||||||
<a-button style="margin-right: 10px"
|
<a-button style="margin-right: 10px" type="primary" @click="consistentAssessmentClick()">{{ $t('docTool.comparison.consistentAssessment') }}
|
||||||
type="primary" @click="consistentAssessmentClick()">{{$t('docTool.comparison.consistentAssessment')}}
|
|
||||||
</a-button>
|
</a-button>
|
||||||
<a-button type="primary" @click="submit()">{{ $t('preservation') }}</a-button>
|
<a-button type="primary" @click="submit()">{{ $t('preservation') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<comparison-add-full-comment ref="comparisonAddFullComment"></comparison-add-full-comment>
|
<comparison-add-full-comment ref="comparisonAddFullComment"></comparison-add-full-comment>
|
||||||
</a-spin>
|
</internal-detail-page>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { postAction, getAction } from '@/api/manage'
|
import { postAction, getAction } from '../../../api/manage.js'
|
||||||
// 添加全文评论弹框
|
// 添加全文评论弹框
|
||||||
import ComparisonAddFullComment from './ComparisonAddFullComment'
|
import ComparisonAddFullComment from '../modules/ComparisonAddFullComment.vue'
|
||||||
|
import InternalDetailPage from '../../../components/InternalDetailPage.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DocumentDataComparison',
|
name: 'DocumentDataComparison',
|
||||||
components: { ComparisonAddFullComment },
|
components: { ComparisonAddFullComment, InternalDetailPage },
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
formInline: {},
|
formInline: {},
|
||||||
@@ -409,30 +396,19 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
.doc-detail-wrap {
|
.header-btn {
|
||||||
.doc-detail-header {
|
margin-left: 12px;
|
||||||
width: 100%;
|
}
|
||||||
z-index: 1000;
|
|
||||||
height: 68px;
|
|
||||||
line-height: 68px;
|
|
||||||
padding: 0 0 0 32px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
border-bottom: 2px #eff1f3 solid;
|
|
||||||
background: #fff;
|
|
||||||
|
|
||||||
.doc-detail-title {
|
.header-btn:first-child {
|
||||||
display: inline-block;
|
margin-left: 0;
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
font-size: 20px;
|
|
||||||
font-weight: 400;
|
|
||||||
color: #040B29;
|
|
||||||
line-height: 68px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.can-scroll-content {
|
||||||
|
height: calc(100% - 52px);
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.doc-detail-right {
|
.doc-detail-right {
|
||||||
width: 600px;
|
width: 600px;
|
||||||
line-height: 68px;
|
line-height: 68px;
|
||||||
@@ -452,36 +428,32 @@ export default {
|
|||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.detail-content {
|
.detail-content {
|
||||||
padding-top: 68px;
|
height: calc(100% - 131px);
|
||||||
background: #fff;
|
|
||||||
padding-bottom: 30px;
|
|
||||||
overflow-y: auto;
|
|
||||||
&-cont {
|
|
||||||
width: 100%;
|
|
||||||
overflow: hidden;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
|
||||||
&-left {
|
&-left {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
height: calc(100vh - 210px);
|
height: 100%;
|
||||||
border-right: 2px #EFF1F3 solid;
|
border-right: 2px #EFF1F3 solid;
|
||||||
padding: 24px 32px;
|
padding: 24px 32px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border-bottom: 2px #EFF1F3 solid;
|
border-bottom: 2px #EFF1F3 solid;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-right {
|
&-right {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
height: calc(100vh - 210px);
|
height: 100%;
|
||||||
padding: 24px 32px;
|
padding: 24px 32px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border-bottom: 2px #EFF1F3 solid;
|
border-bottom: 2px #EFF1F3 solid;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-left-header {
|
&-left-header {
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-left-header-text {
|
&-left-header-text {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@@ -499,6 +471,7 @@ export default {
|
|||||||
height: 520px;
|
height: 520px;
|
||||||
float: left;
|
float: left;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
/deep/ .ant-tree-node-content-wrapper {
|
/deep/ .ant-tree-node-content-wrapper {
|
||||||
display: inline-block !important;
|
display: inline-block !important;
|
||||||
color: #040B29 !important;
|
color: #040B29 !important;
|
||||||
@@ -543,14 +516,8 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.submit-button {
|
.submit-button {
|
||||||
width: 100%;
|
height: 52px;
|
||||||
height: 60px;
|
|
||||||
text-align: right;
|
text-align: right;
|
||||||
padding: 14px 32px 0;
|
padding: 10px 24px;
|
||||||
box-sizing: border-box;
|
|
||||||
border-top: 2px #eff1f3 solid;
|
|
||||||
background: #ffffff;
|
|
||||||
position: fixed;
|
|
||||||
bottom: 0;
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
+32
-58
@@ -1,15 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="doc-detail-wrap">
|
<internal-detail-page :title="$t('docTool.comparison.initiateComparison')" :content-padding="0" :loading="loading">
|
||||||
<div class="doc-detail-header">
|
<div class="can-scroll-content">
|
||||||
<div class="doc-detail-title">
|
<div class="detail-content-box">
|
||||||
<span style="line-height: 66px;display: inline-block;float: left" @click="goBack">
|
|
||||||
<a-icon type="arrow-left" style="margin-right: 6px;"/>
|
|
||||||
</span>
|
|
||||||
<span> {{$t('docTool.comparison.initiateComparison')}}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="detail-content">
|
|
||||||
<div style="width: 100%;height: auto;overflow: hidden">
|
|
||||||
<div class="detail-content-left">
|
<div class="detail-content-left">
|
||||||
<a-form layout="inline" @keyup.enter.native="searchQueryLeft">
|
<a-form layout="inline" @keyup.enter.native="searchQueryLeft">
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
@@ -55,7 +47,8 @@
|
|||||||
@click="selectLeftClick(selectedRowsLeft[0])"
|
@click="selectLeftClick(selectedRowsLeft[0])"
|
||||||
:title="selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
|
:title="selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
|
||||||
:class="{'box-button-standard-right-color':selectedRowsLeft[0]}">
|
:class="{'box-button-standard-right-color':selectedRowsLeft[0]}">
|
||||||
{{selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')}}
|
{{ selectedRowsLeft[0] ? selectedRowsLeft[0].serialNumber + ' ' + selectedRowsLeft[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')
|
||||||
|
}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -104,11 +97,13 @@
|
|||||||
@click="selectLeftClick(selectedRowsRight[0])"
|
@click="selectLeftClick(selectedRowsRight[0])"
|
||||||
:title="selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
|
:title="selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
|
||||||
:class="{'box-button-standard-right-color':selectedRowsRight[0]}">
|
:class="{'box-button-standard-right-color':selectedRowsRight[0]}">
|
||||||
{{selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')}}
|
{{ selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')
|
||||||
|
}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="remarks">
|
<div class="remarks">
|
||||||
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
|
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
|
||||||
<div class="box-title-text-remarks">
|
<div class="box-title-text-remarks">
|
||||||
@@ -124,30 +119,31 @@
|
|||||||
</div>
|
</div>
|
||||||
</a-form-model>
|
</a-form-model>
|
||||||
</div>
|
</div>
|
||||||
<div class="submit-button">
|
|
||||||
<a-button class="box-button" type="primary" @click="submit">{{$t('docTool.comparison.initiateDocumentComparison')}}</a-button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="box-button">
|
||||||
|
<a-button type="primary" @click="submit">{{ $t('docTool.comparison.initiateDocumentComparison') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
<!-- <JLoading :loading="loading">{{$t('pleaseWaitWhileRunning')}}</JLoading>-->
|
|
||||||
<div id="images">
|
<div id="images">
|
||||||
<div class="image" v-viewer="{movable: false}">
|
<div class="image" v-viewer="{movable: false}">
|
||||||
<img v-show="image" :src="imageUrl">
|
<img v-show="image" :src="imageUrl">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</internal-detail-page>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import JTable from '@/components/jero/JTable'
|
import JTable from '../../../components/jero/JTable.vue'
|
||||||
import { getAction, downloadFile, getFileAccessHttpUrl } from '@/api/manage'
|
import { getAction, downloadFile, getFileAccessHttpUrl } from '../../../api/manage.js'
|
||||||
import { previewPdf } from '@/utils/previewPdf'
|
import { previewPdf } from '../../../utils/previewPdf.js'
|
||||||
import { Base64 } from 'js-base64'
|
import { Base64 } from 'js-base64'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
|
|
||||||
|
import InternalDetailPage from '../../../components/InternalDetailPage.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'InitiateComparison',
|
name: 'InitiateComparison',
|
||||||
components: { JTable },
|
components: { JTable, InternalDetailPage },
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
loading: false,
|
loading: false,
|
||||||
@@ -347,7 +343,7 @@ export default {
|
|||||||
},
|
},
|
||||||
submit () {
|
submit () {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: '/documentDataComparison',
|
path: '/documentTool/DocumentDataComparison'
|
||||||
})
|
})
|
||||||
// if (!this.selectedRowsRight[0] || !this.selectedRowsLeft[0]) {
|
// if (!this.selectedRowsRight[0] || !this.selectedRowsLeft[0]) {
|
||||||
// this.$message.warning(this.$t('pleaseSelectTheDataCompared'))
|
// this.$message.warning(this.$t('pleaseSelectTheDataCompared'))
|
||||||
@@ -470,59 +466,33 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
@import'~@assets/less/common.less';
|
@import '~../../../assets/less/common.less';
|
||||||
|
|
||||||
.doc-detail-wrap {
|
.can-scroll-content {
|
||||||
padding-bottom: 20px;
|
height: calc(100% - 52px);
|
||||||
position: relative;
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.doc-detail-header {
|
.detail-content-box {
|
||||||
width: 100%;
|
|
||||||
z-index: 1000;
|
|
||||||
height: 68px;
|
|
||||||
line-height: 68px;
|
|
||||||
padding: 0 0 0 32px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
height: calc(100% - 152px);
|
||||||
border-bottom: 2px #eff1f3 solid;
|
|
||||||
background: #fff;
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
|
|
||||||
.doc-detail-title {
|
|
||||||
display: inline-block;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
font-size: 20px;
|
|
||||||
font-weight: 400;
|
|
||||||
color: #040B29;
|
|
||||||
line-height: 68px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.detail-content {
|
|
||||||
padding-top: 68px;
|
|
||||||
}
|
|
||||||
.detail-content-left {
|
.detail-content-left {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: left;
|
|
||||||
border-right: 2px #EFF1F3 solid;
|
border-right: 2px #EFF1F3 solid;
|
||||||
padding: 24px 32px;
|
padding: 24px 32px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border-bottom: 2px #EFF1F3 solid;
|
border-bottom: 2px #EFF1F3 solid;
|
||||||
height: 610px;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.detail-content-right {
|
.detail-content-right {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: left;
|
|
||||||
padding: 24px 32px;
|
padding: 24px 32px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border-bottom: 2px #EFF1F3 solid;
|
border-bottom: 2px #EFF1F3 solid;
|
||||||
height: 610px;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box-title-text-remarks {
|
.box-title-text-remarks {
|
||||||
@@ -545,6 +515,11 @@ export default {
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.box-button {
|
||||||
|
padding: 10px 24px;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
.box-button-standard {
|
.box-button-standard {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
@@ -586,7 +561,6 @@ export default {
|
|||||||
width: 50%;
|
width: 50%;
|
||||||
padding: 0 32px;
|
padding: 0 32px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin-bottom: 60px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-model {
|
.item-model {
|
||||||
+6
-6
@@ -93,14 +93,14 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import '@assets/less/common.less'
|
import '../../../assets/less/common.less'
|
||||||
import JTable from '@/components/jero/JTable'
|
import JTable from '../../../components/jero/JTable.vue'
|
||||||
// 拆分已入库文本弹框
|
// 拆分已入库文本弹框
|
||||||
import SplitText from './modules/SplitText'
|
import SplitText from '../modules/SplitText.vue'
|
||||||
// 导入拆分结果弹框
|
// 导入拆分结果弹框
|
||||||
import ImportResult from './modules/ImportResult'
|
import ImportResult from '../modules/ImportResult.vue'
|
||||||
import { JeroListMixin } from '../../mixins/JeroListMixin.js'
|
import { JeroListMixin } from '../../../mixins/JeroListMixin.js'
|
||||||
import { releaseSplitStandard } from '../../api/documentToolApi.js'
|
import { releaseSplitStandard } from '../../../api/documentToolApi.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DocumentSplit',
|
name: 'DocumentSplit',
|
||||||
+11
-11
@@ -180,21 +180,21 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import InternalDetailPage from '../../components/InternalDetailPage.vue'
|
import InternalDetailPage from '../../../components/InternalDetailPage.vue'
|
||||||
import JTable from '../../components/jero/JTable.vue'
|
import JTable from '../../../components/jero/JTable.vue'
|
||||||
// 条款添加
|
// 条款添加
|
||||||
import SplitAddForm from './modules/SplitAddForm.vue'
|
import SplitAddForm from '../modules/SplitAddForm.vue'
|
||||||
// 条款内容弹框
|
// 条款内容弹框
|
||||||
import SplitClauseDetail from './modules/SplitClauseDetail.vue'
|
import SplitClauseDetail from '../modules/SplitClauseDetail.vue'
|
||||||
// 添加左侧树节点弹框
|
// 添加左侧树节点弹框
|
||||||
import SplitDetailNodeAdd from './modules/SplitDetailNodeAdd.vue'
|
import SplitDetailNodeAdd from '../modules/SplitDetailNodeAdd.vue'
|
||||||
// 批量设置弹框
|
// 批量设置弹框
|
||||||
import SplitDetailBatchSetting from './modules/SplitDetailBatchSetting.vue'
|
import SplitDetailBatchSetting from '../modules/SplitDetailBatchSetting.vue'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
import { postAction, getAction, downloadFile } from '../../api/manage.js'
|
import { postAction, getAction } from '../../../api/manage.js'
|
||||||
import { ConfigurableTableMixin } from '../../mixins/ConfigurableTableMixin.js'
|
import { ConfigurableTableMixin } from '../../../mixins/ConfigurableTableMixin.js'
|
||||||
import { getDocSplitTableHeader, getDocSplitSearch } from '../../api/documentToolApi.js'
|
import { getDocSplitTableHeader, getDocSplitSearch } from '../../../api/documentToolApi.js'
|
||||||
import Search from '../../components/customField/Search.vue'
|
import Search from '../../../components/customField/Search.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DocumentSplitDetail',
|
name: 'DocumentSplitDetail',
|
||||||
@@ -554,7 +554,7 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
@import '~../../assets/less/common.less';
|
@import '~@assets/less/common.less';
|
||||||
|
|
||||||
.page-left-right-layout {
|
.page-left-right-layout {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
Reference in New Issue
Block a user