diff --git a/manager/src/api/order.js b/manager/src/api/order.js
index b57ab1e2..4981a96d 100644
--- a/manager/src/api/order.js
+++ b/manager/src/api/order.js
@@ -78,6 +78,11 @@ export const getOrderList = (params) => {
return getRequest(`/order/order`, params)
}
+// 导出订单列表
+export const exportOrder = (params) => {
+ return getRequest(`/order/order/queryExportOrder`, params,'blob')
+}
+
// 订单付款
export const orderPay = (sn) => {
return postRequest(`/order/order/${sn}/pay`)
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 21cbc505..0b8c503b 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -79,15 +79,7 @@
>
-
-
-
+
@@ -391,20 +383,35 @@ export default {
},
// 导出订单
async exportOrder() {
- const params = JSON.parse(JSON.stringify(this.searchForm));
- params.pageNumber = 1;
- params.pageSize = 10000;
- const result = await API_Order.getOrderList(params);
- if (result.success) {
- if (result.result.records.length === 0) {
- this.$Message.warning("暂无待发货订单");
- return [];
- } else {
- return result.result.records;
- }
- } else {
- this.$Message.warning("导出订单失败,请重试");
+ if(this.searchForm.startDate==""||this.searchForm.endDate==""){
+ this.$Message.error("必须选择时间范围,搜索后进行导出!");
+ }else{
+ API_Order.exportOrder(this.searchForm)
+ .then((res) => {
+ const blob = new Blob([res], {
+ type: "application/vnd.ms-excel;charset=utf-8",
+ });
+ //对于
标签,只有 Firefox 和 Chrome(内核) 支持 download 属性
+ //IE10以上支持blob但是依然不支持download
+ if ("download" in document.createElement("a")) {
+ //支持a标签download的浏览器
+ const link = document.createElement("a"); //创建a标签
+ link.download = "订单列表.xlsx"; //a标签添加属性
+ link.style.display = "none";
+ link.href = URL.createObjectURL(blob);
+ document.body.appendChild(link);
+ link.click(); //执行下载
+ URL.revokeObjectURL(link.href); //释放url
+ document.body.removeChild(link); //释放标签
+ } else {
+ navigator.msSaveBlob(blob, fileName);
+ }
+ })
+ .catch((err) => {
+ console.log(err);
+ });
}
+
},
// 订单筛选
orderStatusClick(item) {
diff --git a/seller/src/api/order.js b/seller/src/api/order.js
index a5af0d19..a5fbd578 100644
--- a/seller/src/api/order.js
+++ b/seller/src/api/order.js
@@ -32,6 +32,11 @@ export const getOrderList = params => {
return getRequest(`/order/order`, params);
};
+// 导出订单列表
+export const exportOrder = (params) => {
+ return getRequest(`/order/order/queryExportOrder`, params,'blob')
+};
+
// 获取普通订单详细信息
export const getOrderDetail = sn => {
return getRequest(`/order/order/${sn}`);
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 487ecd98..146ef7a7 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -73,18 +73,20 @@
-
-
-
-
+
+
+
+
+
+