Merge branch 'live' into edit

src/views/stock/check/detail.vue

@@ -101,7 +101,6 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/stock/check/detail";
 import addEdit from "./components/addEdit";
 import resultUplod from "./components/resultUplod";
-import { getToken } from "@/utils/auth";
 import urlConfig from "@/apis/url-config";
 import { mapGetters } from "vuex";
 
@@ -187,11 +186,10 @@ export default {
         let httpType = `aplication/zip`;
         let model = {
           id: this.queryId,
-          token: getToken(),
         };
         axios({
           method: "post",
-          url: urlConfig.baseURL + "admin/checkexport",
+          url: this.fileUrl + "admin/checkexport",
           responseType: "blob",
           data: model,
           headers: {
@@ -207,18 +205,18 @@ export default {
               let aLink = document.createElement("a");
               aLink.style.display = "none";
               aLink.href = url;
-              aLink.setAttribute("download", `提成数据报表.zip`);
+              aLink.setAttribute("download", `${message}.zip`);
               document.body.appendChild(aLink);
               aLink.click();
               document.body.removeChild(aLink); //下载完成移除元素
               window.URL.revokeObjectURL(url); //释放掉blob对象
 
-              this.$message.success(message + `信息导出成功！`);
+              this.$message.success(`${message}导出成功！`);
               setTimeout(() => {
                 this.loading = false;
               }, 500);
             } else {
-              // this.$message.error(res.data.message);
+              this.$message.error(res.data.message);
               setTimeout(() => {
                 this.loading = false;
               }, 500);
@@ -229,51 +227,6 @@ export default {
             this.loading = false;
           });
       }
-      // if (!this.loading) {
-      //   this.loading = true;
-      //   let httpType = `aplication/zip`;
-      //   let model = {
-      //     id: this.queryId,
-      //     token: getToken(),
-      //   };
-      //   axios({
-      //     method: "post",
-      //     url: this.fileUrl + "admin/checkexport",
-      //     responseType: "blob",
-      //     data: model,
-      //     headers: {
-      //       Accept: httpType,
-      //     },
-      //   })
-      //     .then((res) => {
-      //       if (res && res.status == 200 && res.data) {
-      //         let blob = new Blob([res.data], {
-      //           type: httpType,
-      //         });
-      //         let url = window.URL.createObjectURL(blob);
-      //         let aLink = document.createElement("a");
-      //         aLink.style.display = "none";
-      //         aLink.href = url;
-      //         aLink.setAttribute("download", `${message}.zip`);
-      //         document.body.appendChild(aLink);
-      //         aLink.click();
-      //         document.body.removeChild(aLink); //下载完成移除元素
-      //         window.URL.revokeObjectURL(url); //释放掉blob对象
-      //         this.$message.success(message + `信息导出成功！`);
-      //         setTimeout(() => {
-      //           this.loading = false;
-      //         }, 500);
-      //       } else {
-      //         this.$message.error(`信息导出失败！`);
-      //         setTimeout(() => {
-      //           this.loading = false;
-      //         }, 500);
-      //       }
-      //     })
-      //     .catch((error) => {
-      //       this.loading = false;
-      //     });
-      // }
     },
     async deleteById(message) {
       const res = await asyncRequest.delete({ id: this.queryId });

src/views/stock/check/index.vue

@@ -133,6 +133,7 @@
                     重置
                   </el-button>
                 </el-col>
+
                 <el-col
                   :span="3"
                   style="width: 66px; float: right"
@@ -205,7 +206,6 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/stock/check";
 import addModel from "./addModel";
 import { mapGetters } from "vuex";
-
 export default {
   name: "check",
   mixins: [mixinPage, resToken],
@@ -336,7 +336,7 @@ export default {
 
   methods: {
     restSearch() {
-        // 表格 - 分页
+      // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
@@ -378,6 +378,7 @@ export default {
         await this.searchList();
       }
     },
+
     async searchList() {
       if (
         (this.parmValue.start !== "" && this.parmValue.end === "") ||