Browse Source

Merge branch 'dev'

戴艳蓉 3 years ago
parent
commit
8dc906da1e

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-6db9e388.d4daf504.css


BIN
dist/static/css/chunk-7276db90.32d7a339.css.gz → dist/static/css/chunk-6db9e388.d4daf504.css.gz


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


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


BIN
dist/static/js/app.75c5a4fe.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6db9e388.8119246b.js


BIN
dist/static/js/chunk-6db9e388.8119246b.js.gz


BIN
dist/static/js/chunk-7276db90.ff151a46.js.gz


+ 2 - 2
src/views/search/commission/index.vue

@@ -425,10 +425,10 @@ export default {
                   aLink.setAttribute(
                     "download",
                     `提成数据报表${
-                      this.parmValue.hk_start !== "" &&
+                      this.parmValue.qrd_start !== "" &&
                       this.parmValue.hk_start !== ""
                         ? title1 + "&&" + title2
-                        : this.parmValue.hk_start !== ""
+                        : this.parmValue.qrd_start !== ""
                         ? title1
                         : title2
                     }.zip`

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