合并

dist/static/css/chunk-d4a89ac0.a9a88b9f.css → dist/static/css/chunk-5b92f5dd.75a13c68.css

@@ -1 +1 @@
-.newBand[data-v-68b120bd]{display:inline-block}[data-v-68b120bd] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-68b120bd]{display:inline-block}.lookTitle[data-v-68b120bd]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-68b120bd]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-68b120bd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+.newBand[data-v-ee50da0c]{display:inline-block}[data-v-ee50da0c] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-ee50da0c]{display:inline-block}.lookTitle[data-v-ee50da0c]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-ee50da0c]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-ee50da0c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -908,7 +908,7 @@ export default {
         },
         data: qs.stringify(cleanDeep(data)),
         url,
-        responseType: "blob",
+        responseType: "json",
       };
       this.$confirm("您确定导出报表", "提示", {
         confirmButtonText: "确定",
@@ -918,30 +918,36 @@ export default {
         .then(() => {
           load.startLoading();
           axios(options).then((res) => {
-            let blob = new Blob([res.data], {
-              // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-              type: "application/vnd.ms-excel;charset=utf-8",
-              //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-            });
-            let objectUrl = URL.createObjectURL(blob);
-            let link = document.createElement("a");
-            let nowTime = new Date();
-            let ymd =
-              nowTime.getFullYear() +
-              "" +
-              (nowTime.getMonth() + 1) +
-              "" +
-              nowTime.getDate() +
-              "" +
-              nowTime.getHours() +
-              "" +
-              nowTime.getMinutes();
-            let fname = "报表导出" + new Date().getTime() + ".xls"; //下载文件的名字
-            link.href = objectUrl;
-            link.setAttribute("download", fname);
-            document.body.appendChild(link);
-            link.click();
             load.endLoading();
+            if (res.data.code == 200) {
+              this.$message.info(res.data.data);
+            } else {
+              this.$message.error(res.data.msg);
+            }
+            // let blob = new Blob([res.data], {
+            //   // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+            //   type: "application/vnd.ms-excel;charset=utf-8",
+            //   //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+            // });
+            // let objectUrl = URL.createObjectURL(blob);
+            // let link = document.createElement("a");
+            // let nowTime = new Date();
+            // let ymd =
+            //   nowTime.getFullYear() +
+            //   "" +
+            //   (nowTime.getMonth() + 1) +
+            //   "" +
+            //   nowTime.getDate() +
+            //   "" +
+            //   nowTime.getHours() +
+            //   "" +
+            //   nowTime.getMinutes();
+            // let fname = "报表导出" + new Date().getTime() + ".xls"; //下载文件的名字
+            // link.href = objectUrl;
+            // link.setAttribute("download", fname);
+            // document.body.appendChild(link);
+            // link.click();
+            // load.endLoading();
           });
         })
         .catch(() => {});