Merge remote-tracking branch 'origin/master'

jero-web/src/components/jero/JUpload.vue

@@ -493,7 +493,7 @@ export default {
      */
     handleDownload (file) {
       // 下载文件
-      downloadFile(`/sys/common/download/${file.response.result.id}`, file.name)
+      downloadFile(`/sys/common/downloadWithoutWaterMark/${file.response.result.id}`, file.name)
     }
   },
   mounted () {

jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue

@@ -458,7 +458,8 @@ export default {
       // }
     },
     handleExportXls () {
-      const fileName = '全文比对信息'
+
+      const fileName = this.$route.query.infoNumberLeft + ' - ' + this.$route.query.infoNumberRight + '比对结果'
       const fileSuffix = '.xls'
       const param = {}
       param.id = this.$route.query.id

jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue

@@ -6,7 +6,7 @@
                         @back="handleBack">
     <div class="can-scroll-content">
       <div class="can-scroll-content-header">
-         {{$route.query.titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + $route.query.titleRight + ' ' + $route.query.serialNumberRight}}
+         {{titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + titleRight + ' ' + $route.query.serialNumberRight}}
         <a-button icon="upload"
                   type="primary"
                   ghost
@@ -49,6 +49,8 @@ export default {
     return {
       loading: false,
       resultData: {},
+      titleLeft: this.$route.query.titleLeft || '',
+      titleRight: this.$route.query.titleRight || '',
       columns: [
         {
           title: '旧条款号',
@@ -125,8 +127,7 @@ export default {
       this.loadData()
     },
     handleExportXls () {
-
+      const fileName = this.$route.query.serialNumberLeft + ' - ' + this.$route.query.serialNumberRight + '比对结果'
-      const fileName = '条款比对信息'
       const fileSuffix = '.xlsx'
       const param = {}
       param.standHisId = this.standHisId