From f80a55f665f9bb526254391d80cfe5988d7de8a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 1 Mar 2024 10:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E6=96=87=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E5=BE=97=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentComparison/DocumentComparison.vue | 20 ++++++------
 .../DocumentDataComparison.vue                | 12 +++++++
 .../comparisonTermsView.vue                   | 10 ++++++
 .../documentSplit/DocumentSplitDetail.vue     | 31 ++++++++++++++++++-
 4 files changed, 62 insertions(+), 11 deletions(-)

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 @@
         <a-row :gutter="24">
           <!--文本号-->
           <a-col :md="6" :sm="8">
-            <a-form-item :label="$t('docTool.comparison.textNumber')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
-              <a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textNumber')"
+            <a-form-item :label="'标准编号'" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
+              <a-input :placeholder="$t('pleaseEnter') + '标准编号'"
                        v-model="queryParam.serialNumber"></a-input>
             </a-form-item>
           </a-col>
           <!--文本名称-->
           <a-col :md="6" :sm="8">
-            <a-form-item :label="$t('docTool.comparison.textName')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
-              <a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textName')"
+            <a-form-item :label="'标准名称'" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
+              <a-input :placeholder="$t('pleaseEnter') + '标准名称'"
                        v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
@@ -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">
+    <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="detail-content">
         <!--左边的文档-->
@@ -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 @@
     <div class="can-scroll-content">
       <div class="can-scroll-content-header">
          {{$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>
         <j-table
           ref="table"
@@ -115,6 +122,9 @@ export default {
     },
     viewDifferenceModalForm () {
       this.loadData()
+    },
+    handleExportXls () {
+
     }
   }
 }
diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
index b332dad..1d6ae11 100644
--- a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
@@ -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 () {
-      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) {