修改全文对比得细节问题
This commit is contained in:
@@ -5,15 +5,15 @@
|
|||||||
<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('docTool.comparison.textNumber')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
<a-form-item :label="'标准编号'" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
||||||
<a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textNumber')"
|
<a-input :placeholder="$t('pleaseEnter') + '标准编号'"
|
||||||
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('docTool.comparison.textName')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
<a-form-item :label="'标准名称'" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
|
||||||
<a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textName')"
|
<a-input :placeholder="$t('pleaseEnter') + '标准名称'"
|
||||||
v-model="queryParam.title"></a-input>
|
v-model="queryParam.title"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
@@ -118,7 +118,7 @@ export default {
|
|||||||
columns: [
|
columns: [
|
||||||
// 旧文档文本号
|
// 旧文档文本号
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.oldDocumentTextNumber'),
|
title: '标准编号1',
|
||||||
dataIndex: 'serialNumberLeft',
|
dataIndex: 'serialNumberLeft',
|
||||||
width: 170,
|
width: 170,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
@@ -126,34 +126,34 @@ export default {
|
|||||||
},
|
},
|
||||||
// 旧文档文本名称
|
// 旧文档文本名称
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.oldDocumentTextName'),
|
title: '标准名称1',
|
||||||
dataIndex: 'titleLeft',
|
dataIndex: 'titleLeft',
|
||||||
width: 170,
|
width: 170,
|
||||||
scopedSlots: { customRender: 'oldTextDetail' }
|
scopedSlots: { customRender: 'oldTextDetail' }
|
||||||
},
|
},
|
||||||
// 旧文本状态
|
// 旧文本状态
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.oldTextState'),
|
title: '文本状态',
|
||||||
width: 150,
|
width: 150,
|
||||||
dataIndex: 'fileTypeLeft_dictText'
|
dataIndex: 'fileTypeLeft_dictText'
|
||||||
},
|
},
|
||||||
// 新文档文本号
|
// 新文档文本号
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.newDocumentTextNumber'),
|
title: '标准编号2',
|
||||||
dataIndex: 'serialNumberRight',
|
dataIndex: 'serialNumberRight',
|
||||||
width: 170,
|
width: 170,
|
||||||
scopedSlots: { customRender: 'newTextDetail' }
|
scopedSlots: { customRender: 'newTextDetail' }
|
||||||
},
|
},
|
||||||
// 新文档文本名称
|
// 新文档文本名称
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.newDocumentTextName'),
|
title: '标准名称2',
|
||||||
dataIndex: 'titleRight',
|
dataIndex: 'titleRight',
|
||||||
width: 170,
|
width: 170,
|
||||||
scopedSlots: { customRender: 'newTextDetail' }
|
scopedSlots: { customRender: 'newTextDetail' }
|
||||||
},
|
},
|
||||||
// 新文本状态
|
// 新文本状态
|
||||||
{
|
{
|
||||||
title: this.$t('docTool.comparison.newTextState'),
|
title: '文本状态',
|
||||||
width: 150,
|
width: 150,
|
||||||
dataIndex: 'fileTypeRight_dictText'
|
dataIndex: 'fileTypeRight_dictText'
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,6 +4,15 @@
|
|||||||
:loading="loading"
|
:loading="loading"
|
||||||
need-custom-back-func
|
need-custom-back-func
|
||||||
@back="handleBack">
|
@back="handleBack">
|
||||||
|
<template v-slot:titleRightCustom>
|
||||||
|
<a-button icon="upload"
|
||||||
|
type="primary"
|
||||||
|
ghost
|
||||||
|
style="margin-left: 6px"
|
||||||
|
@click="handleExportXls">
|
||||||
|
导出比对结果
|
||||||
|
</a-button>
|
||||||
|
</template>
|
||||||
<div class="can-scroll-content">
|
<div class="can-scroll-content">
|
||||||
<div class="detail-content">
|
<div class="detail-content">
|
||||||
<!--左边的文档-->
|
<!--左边的文档-->
|
||||||
@@ -447,6 +456,9 @@ export default {
|
|||||||
item.closeBtn = false
|
item.closeBtn = false
|
||||||
item.addModalState = false
|
item.addModalState = false
|
||||||
// }
|
// }
|
||||||
|
},
|
||||||
|
handleExportXls () {
|
||||||
|
|
||||||
},
|
},
|
||||||
modalSave (item) {
|
modalSave (item) {
|
||||||
const query = {
|
const query = {
|
||||||
|
|||||||
@@ -7,6 +7,13 @@
|
|||||||
<div class="can-scroll-content">
|
<div class="can-scroll-content">
|
||||||
<div class="can-scroll-content-header">
|
<div class="can-scroll-content-header">
|
||||||
{{$route.query.titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + $route.query.titleRight + ' ' + $route.query.serialNumberRight}}
|
{{$route.query.titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + $route.query.titleRight + ' ' + $route.query.serialNumberRight}}
|
||||||
|
<a-button icon="upload"
|
||||||
|
type="primary"
|
||||||
|
ghost
|
||||||
|
style="margin-left: 6px"
|
||||||
|
@click="handleExportXls">
|
||||||
|
导出比对结果
|
||||||
|
</a-button>
|
||||||
</div>
|
</div>
|
||||||
<j-table
|
<j-table
|
||||||
ref="table"
|
ref="table"
|
||||||
@@ -115,6 +122,9 @@ export default {
|
|||||||
},
|
},
|
||||||
viewDifferenceModalForm () {
|
viewDifferenceModalForm () {
|
||||||
this.loadData()
|
this.loadData()
|
||||||
|
},
|
||||||
|
handleExportXls () {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -642,11 +642,40 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
getNowDate () {
|
||||||
|
var date = new Date()
|
||||||
|
var sign2 = ':'
|
||||||
|
var year = date.getFullYear() // 年
|
||||||
|
var month = date.getMonth() + 1 // 月
|
||||||
|
var day = date.getDate() // 日
|
||||||
|
var hour = date.getHours() // 时
|
||||||
|
var minutes = date.getMinutes() // 分
|
||||||
|
var seconds = date.getSeconds() // 秒
|
||||||
|
// 给一位数的数据前面加 “0”
|
||||||
|
if (month >= 1 && month <= 9) {
|
||||||
|
month = '0' + month
|
||||||
|
}
|
||||||
|
if (day >= 0 && day <= 9) {
|
||||||
|
day = '0' + day
|
||||||
|
}
|
||||||
|
if (hour >= 0 && hour <= 9) {
|
||||||
|
hour = '0' + hour
|
||||||
|
}
|
||||||
|
if (minutes >= 0 && minutes <= 9) {
|
||||||
|
minutes = '0' + minutes
|
||||||
|
}
|
||||||
|
if (seconds >= 0 && seconds <= 9) {
|
||||||
|
seconds = '0' + seconds
|
||||||
|
}
|
||||||
|
return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* 导出
|
* 导出
|
||||||
*/
|
*/
|
||||||
handleExportXls () {
|
handleExportXls () {
|
||||||
const fileName = this.$route.query.infoNumber + ' ' + this.$route.query.standardName
|
// + ' ' + this.$route.query.standardName
|
||||||
|
|
||||||
|
const fileName = this.$route.query.infoNumber + ' ' + this.getNowDate()
|
||||||
const fileSuffix = '.zip'
|
const fileSuffix = '.zip'
|
||||||
const param = {}
|
const param = {}
|
||||||
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
|
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user