Bladeren bron

Merge branch 'sit'

lucky 2 jaren geleden
bovenliggende
commit
a84c569f37
30 gewijzigde bestanden met toevoegingen van 18 en 17 verwijderingen
  1. 0 0
      dist/index.html
  2. 0 0
      dist/static/css/chunk-1aa51d9f.403f9687.css
  3. BIN
      dist/static/css/chunk-1aa51d9f.403f9687.css.gz
  4. 0 0
      dist/static/js/app.1a145be6.js
  5. BIN
      dist/static/js/app.1a145be6.js.gz
  6. BIN
      dist/static/js/app.e5aeaf1f.js.gz
  7. 0 0
      dist/static/js/chunk-0b024dde.8a83fcbf.js
  8. 0 0
      dist/static/js/chunk-15caf0ce.11c4a5cc.js
  9. 0 0
      dist/static/js/chunk-1aa51d9f.68925379.js
  10. BIN
      dist/static/js/chunk-1aa51d9f.68925379.js.gz
  11. 0 0
      dist/static/js/chunk-1c777704.79339173.js
  12. 0 0
      dist/static/js/chunk-1d0a69b6.c0665910.js
  13. 0 0
      dist/static/js/chunk-215bfed5.18bd0762.js
  14. BIN
      dist/static/js/chunk-215bfed5.18bd0762.js.gz
  15. 0 0
      dist/static/js/chunk-44401bcc.fb102cf5.js
  16. 0 0
      dist/static/js/chunk-4ff11544.f294bf12.js
  17. 0 0
      dist/static/js/chunk-7a946667.f287d190.js
  18. 0 0
      dist/static/js/chunk-7a946667.f287d190.js.gz
  19. 0 0
      dist/static/js/chunk-a4a85b14.cc8d91e9.js
  20. 0 0
      dist/static/js/chunk-aa660142.8382e5a4.js
  21. 0 0
      dist/static/js/chunk-aa660142.8382e5a4.js.gz
  22. 0 0
      dist/static/js/chunk-b7f101b0.8651d032.js
  23. 0 0
      dist/static/js/chunk-ee636058.26387023.js
  24. 0 0
      dist/static/js/chunk-libs.2f6ba53d.js
  25. 0 0
      dist/static/js/chunk-libs.2f6ba53d.js.gz
  26. 5 5
      src/views/reportQuery/financeReport/history-data.vue
  27. 5 4
      src/views/reportQuery/financeReport/index.vue
  28. 2 2
      src/views/reportQuery/financeReport/pre-export.vue
  29. 3 3
      src/views/reportQuery/financeReport/real-time-export-new.vue
  30. 3 3
      src/views/reportQuery/financeReport/real-time-export.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-1aa51d9f.403f9687.css


BIN
dist/static/css/chunk-215bfed5.a01701d9.css.gz → dist/static/css/chunk-1aa51d9f.403f9687.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1a145be6.js


BIN
dist/static/js/app.1a145be6.js.gz


BIN
dist/static/js/app.e5aeaf1f.js.gz


+ 0 - 0
dist/static/js/chunk-0b024dde.74597cc7.js → dist/static/js/chunk-0b024dde.8a83fcbf.js


+ 0 - 0
dist/static/js/chunk-15caf0ce.9459e3ce.js → dist/static/js/chunk-15caf0ce.11c4a5cc.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1aa51d9f.68925379.js


BIN
dist/static/js/chunk-1aa51d9f.68925379.js.gz


+ 0 - 0
dist/static/js/chunk-1c777704.5b175cc8.js → dist/static/js/chunk-1c777704.79339173.js


+ 0 - 0
dist/static/js/chunk-1d0a69b6.f937bf2c.js → dist/static/js/chunk-1d0a69b6.c0665910.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-215bfed5.18bd0762.js


BIN
dist/static/js/chunk-215bfed5.18bd0762.js.gz


+ 0 - 0
dist/static/js/chunk-44401bcc.0a5accae.js → dist/static/js/chunk-44401bcc.fb102cf5.js


+ 0 - 0
dist/static/js/chunk-4ff11544.5f956d5b.js → dist/static/js/chunk-4ff11544.f294bf12.js


+ 0 - 0
dist/static/js/chunk-7a946667.6847e4bc.js → dist/static/js/chunk-7a946667.f287d190.js


+ 0 - 0
dist/static/js/chunk-7a946667.6847e4bc.js.gz → dist/static/js/chunk-7a946667.f287d190.js.gz


+ 0 - 0
dist/static/js/chunk-a4a85b14.582c3571.js → dist/static/js/chunk-a4a85b14.cc8d91e9.js


+ 0 - 0
dist/static/js/chunk-aa660142.9d946b3c.js → dist/static/js/chunk-aa660142.8382e5a4.js


+ 0 - 0
dist/static/js/chunk-aa660142.9d946b3c.js.gz → dist/static/js/chunk-aa660142.8382e5a4.js.gz


+ 0 - 0
dist/static/js/chunk-b7f101b0.8919805f.js → dist/static/js/chunk-b7f101b0.8651d032.js


+ 0 - 0
dist/static/js/chunk-ee636058.02107612.js → dist/static/js/chunk-ee636058.26387023.js


+ 0 - 0
dist/static/js/chunk-libs.f1d2ac0f.js → dist/static/js/chunk-libs.2f6ba53d.js


+ 0 - 0
dist/static/js/chunk-libs.f1d2ac0f.js.gz → dist/static/js/chunk-libs.2f6ba53d.js.gz


+ 5 - 5
src/views/reportQuery/financeReport/history-data.vue

@@ -28,7 +28,7 @@
               <el-col :span="12" style="width: 355px">
                 <el-alert
                   :closable="false"
-                  title="申请导出后,文件会在几分钟后生成!"
+                  title="申请下载后,文件会在几分钟后生成!"
                   type="warning"
                 >
                 </el-alert>
@@ -67,7 +67,7 @@
       <template #operation="{ scope }">
         <el-tooltip
           effect="dark"
-          content="申请导出"
+          content="申请下载"
           placement="top"
           v-if="
             scope.row.status !== '1'
@@ -78,7 +78,7 @@
         <el-tooltip
           v-if="scope.row.status == '2'"
           effect="dark"
-          content="导出"
+          content="下载"
           placement="top"
         >
           <i
@@ -125,7 +125,7 @@ export default {
         { id: "0", label: "待申请", type: "info" },
         { id: "1", label: "系统处理中", type: "warning" },
         { id: "2", label: "已完成", type: "success" },
-        { id: "3", label: "导出失败", type: "danger" },
+        { id: "3", label: "下载失败", type: "danger" },
       ],
       loading: true,
       showModel: false,
@@ -222,7 +222,7 @@ export default {
         aEle.href = this.fileUrl + content; // content为后台返回的下载地址
         aEle.click(); // 设置点击事件
         // document.body.removeChild(aEle); //下载完成移除元素
-        this.$message.success(`导出成功!`);
+        this.$message.success(`下载成功!`);
         setTimeout(() => {
           this.loading = false;
         }, 500);

+ 5 - 4
src/views/reportQuery/financeReport/index.vue

@@ -3,20 +3,21 @@
     <div
       v-loading="loading"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      style="margin-top:25px"
     >
       <el-tabs type="border-card" v-model="activeName">
-        <!-- <el-tab-pane label="实时导出" name="1">
+        <!-- <el-tab-pane label="实时下载" name="1">
           <real-time-export />
         </el-tab-pane> -->
-         <el-tab-pane label="实时导出-新" name="1">
+         <el-tab-pane label="延时下载" name="1">
           <real-time-export-new />
         </el-tab-pane>
-        <!-- <el-tab-pane label="预约导出" name="3">
+        <!-- <el-tab-pane label="预约下载" name="3">
           <pre-export />
         </el-tab-pane> -->
 
 
-        <!-- <el-tab-pane label="往年数据导出" name="4">
+        <!-- <el-tab-pane label="往年数据下载" name="4">
           <history-data />
         </el-tab-pane> -->
       </el-tabs>

+ 2 - 2
src/views/reportQuery/financeReport/pre-export.vue

@@ -61,7 +61,7 @@
           </el-tooltip>
           <el-tooltip
             effect="dark"
-            content="导出"
+            content="下载"
             placement="top"
             v-if="
               scope.row.status == '2'
@@ -153,7 +153,7 @@ export default {
         let aEle = document.createElement("a"); // 创建a标签
         aEle.href = this.fileUrl + content; // content为后台返回的下载地址
         aEle.click(); // 设置点击事件
-        this.$message.success(`导出成功!`);
+        this.$message.success(`下载成功!`);
         setTimeout(() => {
           this.loading = false;
         }, 500);

+ 3 - 3
src/views/reportQuery/financeReport/real-time-export-new.vue

@@ -4,7 +4,7 @@
       <el-col :span="12" style="width: 355px">
         <el-alert
           :closable="false"
-          title="申请导出后,文件会在几分钟后生成!"
+          title="申请下载后,文件会在几分钟后生成!"
           type="warning"
         >
         </el-alert>
@@ -62,7 +62,7 @@
           </el-tooltip>
           <el-tooltip
             effect="dark"
-            content="导出"
+            content="下载"
             placement="top"
             v-if="
  scope.row.status == '2'
@@ -154,7 +154,7 @@ export default {
         let aEle = document.createElement("a"); // 创建a标签
         aEle.href = this.fileUrl + content; // content为后台返回的下载地址
         aEle.click(); // 设置点击事件
-        this.$message.success(`导出成功!`);
+        this.$message.success(`下载成功!`);
         setTimeout(() => {
           this.loading = false;
         }, 500);

+ 3 - 3
src/views/reportQuery/financeReport/real-time-export.vue

@@ -23,7 +23,7 @@
               :size="searchSize"
 
               @click="batchExport(item.value)"
-              >导出</el-button
+              >下载</el-button
             >
             <el-button
               type="warning"
@@ -224,7 +224,7 @@ export default {
       return this.options.findIndex((v1) => v1.value === value);
     },
     /**
-     * 批量导出开票信息
+     * 批量下载开票信息
      * * @param {Array} selection //选中的对账编码
      */
     async batchExport(type) {
@@ -270,7 +270,7 @@ export default {
                 document.body.removeChild(aLink); //下载完成移除元素
                 window.URL.revokeObjectURL(url); //释放掉blob对象
 
-                this.$message.success(title + `信息导出成功!`);
+                this.$message.success(title + `信息下载成功!`);
                 setTimeout(() => {
                   this.loading = false;
                 }, 500);

Some files were not shown because too many files changed in this diff