diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue index 9ffa880..45fc52e 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -5,15 +5,15 @@ - - + - - + @@ -118,7 +118,7 @@ export default { columns: [ // 旧文档文本号 { - title: this.$t('docTool.comparison.oldDocumentTextNumber'), + title: '标准编号1', dataIndex: 'serialNumberLeft', width: 170, ellipsis: true, @@ -126,34 +126,34 @@ export default { }, // 旧文档文本名称 { - title: this.$t('docTool.comparison.oldDocumentTextName'), + title: '标准名称1', dataIndex: 'titleLeft', width: 170, scopedSlots: { customRender: 'oldTextDetail' } }, // 旧文本状态 { - title: this.$t('docTool.comparison.oldTextState'), + title: '文本状态', width: 150, dataIndex: 'fileTypeLeft_dictText' }, // 新文档文本号 { - title: this.$t('docTool.comparison.newDocumentTextNumber'), + title: '标准编号2', dataIndex: 'serialNumberRight', width: 170, scopedSlots: { customRender: 'newTextDetail' } }, // 新文档文本名称 { - title: this.$t('docTool.comparison.newDocumentTextName'), + title: '标准名称2', dataIndex: 'titleRight', width: 170, scopedSlots: { customRender: 'newTextDetail' } }, // 新文本状态 { - title: this.$t('docTool.comparison.newTextState'), + title: '文本状态', width: 150, dataIndex: 'fileTypeRight_dictText' }, diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue index 1959d8d..c007d6b 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue @@ -4,6 +4,15 @@ :loading="loading" need-custom-back-func @back="handleBack"> +
@@ -447,6 +456,9 @@ export default { item.closeBtn = false item.addModalState = false // } + }, + handleExportXls () { + }, modalSave (item) { const query = { diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue index dee7443..99d1245 100644 --- a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue +++ b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue @@ -7,6 +7,13 @@
{{$route.query.titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + $route.query.titleRight + ' ' + $route.query.serialNumberRight}} + + 导出比对结果 +
= 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 () { - 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 param = {} if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {