1

src/main.js

@@ -15,7 +15,7 @@ import useUserStore from "/src/store/modules/user";
 
 // 注册指令
 import plugins from "./plugins"; // plugins
-import { download, post, postFile, get, getFile, postUploadFile } from "/src/utils/request";
+import { download, post, postFile, get, getFile, postUploadFile, postUploadAndDownloadFile } from "/src/utils/request";
 
 // svg图标
 import "virtual:svg-icons-register";
@@ -71,6 +71,7 @@ app.config.globalProperties.get = get;
 app.config.globalProperties.post = post;
 app.config.globalProperties.postFile = postFile;
 app.config.globalProperties.postUploadFile = postUploadFile;
+app.config.globalProperties.postUploadAndDownloadFile = postUploadAndDownloadFile;
 app.config.globalProperties.getFile = getFile;
 app.config.globalProperties.download = download;
 app.config.globalProperties.parseTime = parseTime;

src/utils/request.js

@@ -266,6 +266,25 @@ export function postUploadFile(url, data = {}, method) {
       headers: {
         "Content-Type": "multipart/form-data",
       },
+    })
+      .then((res) => {
+        resolve(res);
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  });
+}
+
+export function postUploadAndDownloadFile(url, data = {}, method) {
+  return new Promise((resolve, reject) => {
+    service({
+      method: method || "post",
+      url: url,
+      data: data,
+      headers: {
+        "Content-Type": "multipart/form-data",
+      },
       responseType: "blob",
     })
       .then((res) => {

src/views/production/warehouse/finished-parts-storage/index.vue

@@ -292,7 +292,7 @@ const giveawayServerLog = (params) => {
   let file = params.file;
   let formFile = new FormData();
   formFile.append("file", file);
-  proxy.postUploadFile("/inventoryFinishedOrder/erpExcelExport", formFile).then(
+  proxy.postUploadAndDownloadFile("/inventoryFinishedOrder/erpExcelExport", formFile).then(
     (res) => {
       ElMessage({ message: "操作成功", type: "success" });
       proxy.downloadFile(res, "成品库明细-" + moment().format("yyyy-MM-DD") + ".xlsx");

src/views/production/warehouse/purchase-stock-pending/add.vue

@@ -177,7 +177,6 @@ const uploadServerLog = (params) => {
   proxy.postUploadFile("/purchasePendingStorage/purchaseArrivalImport", formFile).then(
     (res) => {
       ElMessage({ message: "导入成功", type: "success" });
-      console.log(res);
       formData.data.purchasePendingStorageBomList = res.data;
       loadingUpload.value = false;
       openUpload.value = false;