From 880f1fe5a7d83f8ab2843e23830633a206035bae Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Mon, 27 Mar 2023 22:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BAExcel?=
 =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mallplusui-web-admin/src/api/order.js               | 2 +-
 mallplusui-web-admin/src/api/orderStatistic.js      | 2 +-
 mallplusui-web-admin/src/views/oms/order/index1.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mallplusui-web-admin/src/api/order.js b/mallplusui-web-admin/src/api/order.js
index 8e6b5e5..90bd1ad 100644
--- a/mallplusui-web-admin/src/api/order.js
+++ b/mallplusui-web-admin/src/api/order.js
@@ -78,7 +78,7 @@ export function orderData(params) {
 
 export function exportExcel(params) {
 	return request({
-		  baseURL: '/api',
+		  // baseURL: '/api',
 		url: '/oms/OmsOrder/exportExcel',
 		method: 'post',
 		responseType: 'blob', // 表明返回服务器返回的数据类型
diff --git a/mallplusui-web-admin/src/api/orderStatistic.js b/mallplusui-web-admin/src/api/orderStatistic.js
index de1e0e1..f7730d9 100644
--- a/mallplusui-web-admin/src/api/orderStatistic.js
+++ b/mallplusui-web-admin/src/api/orderStatistic.js
@@ -85,7 +85,7 @@ export function orderData(params) {
 
 export function exportExcel(params) {
 	return request({
-		 baseURL: '/api',
+		 // baseURL: '/api',
 		url: '/oms/OmsOrder/exportExcel2',
 		method: 'post',
 		responseType: 'blob', // 表明返回服务器返回的数据类型
diff --git a/mallplusui-web-admin/src/views/oms/order/index1.vue b/mallplusui-web-admin/src/views/oms/order/index1.vue
index 2eb0e7e..15aa926 100644
--- a/mallplusui-web-admin/src/views/oms/order/index1.vue
+++ b/mallplusui-web-admin/src/views/oms/order/index1.vue
@@ -125,7 +125,7 @@
 				<el-button style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
 					导出Excel
 				</el-button>
-				<el-button v-show="status==0||status==2" style="margin-top: -5px;" type="primary" class="btn-add"
+				<el-button v-show="status==2" style="margin-top: -5px;" type="primary" class="btn-add"
 					@click="doBatch()" size="small">
 					批量发货
 				</el-button>