diff --git a/src/api/thrsys/thrProductsExport.js b/src/api/thrsys/thrProductsExport.js
index dac0a27e..ad941681 100644
--- a/src/api/thrsys/thrProductsExport.js
+++ b/src/api/thrsys/thrProductsExport.js
@@ -31,3 +31,11 @@ export function exportExcel(query) {
});
}
+export function exportExcelAll(query) {
+ return axios({
+ url: "/udiwms/thrProducts/importLog/exportAll",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/views/thirdSys/product/thrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
index 8b11fc1f..eddb7c33 100644
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -34,8 +34,8 @@
{{ status[scope.row.status] }}
-
-
+
+
下载
diff --git a/src/views/thirdSys/product/thrProductsSelect.vue b/src/views/thirdSys/product/thrProductsSelect.vue
index 422cc234..9090365d 100644
--- a/src/views/thirdSys/product/thrProductsSelect.vue
+++ b/src/views/thirdSys/product/thrProductsSelect.vue
@@ -113,7 +113,7 @@ import {getInvbasdoc} from "@/api/thrsys/getErps";
import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
import {selectIp} from "@/api/system/systemParamConfig";
import thrProductsDetail from "./thrProductsDetail";
-import {exportExcel} from "@/api/thrsys/thrProductsExport"
+import {exportExcel,exportExcelAll} from "@/api/thrsys/thrProductsExport"
import {thrProductUpload} from "@/api/thrsys/smp"
export default {
@@ -155,6 +155,7 @@ export default {
},
thrProductsDetailVisible: false,
thisData: null,
+ multipleSelection: []
};
},
@@ -395,11 +396,32 @@ export default {
selectData.forEach((obj) => {
this.filterQuery.thrProductsEntities.push(obj);
});
- this.allExport();
+ exportExcel(this.filterQuery)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.$message({
+ type: "success",
+ message: "导出成功,后台正在生成Json文件,请稍后刷新查看!",
+ });
+ this.$emit("cancelDialog", true);
+ } else {
+ this.$message({
+ type: "error",
+ message: response.message,
+ });
+ this.$emit("cancelDialog", true);
+ }
+ })
+ .catch(() => {
+ this.$message({
+ type: "error",
+ message: "上传失败",
+ });
+ });
},
allExport() {
this.filterQuery.thrProductsEntities=this.list;
- exportExcel(this.filterQuery)
+ exportExcelAll(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
this.$message({