From fd2a3db385b58ec8eb9f1db2bf5d1c1452944f76 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 21 Aug 2024 19:31:49 +0800
Subject: [PATCH] =?UTF-8?q?HL-5298=20=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E5=85=A8=E9=83=A8=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchaseMainWms/index.ts                        | 6 +++---
 .../supplierdeliver/purchaseMainWms/index.vue               | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/purchaseMainWms/index.ts b/src/api/wms/purchaseMainWms/index.ts
index 1d82d82c7..31812e5e7 100644
--- a/src/api/wms/purchaseMainWms/index.ts
+++ b/src/api/wms/purchaseMainWms/index.ts
@@ -73,10 +73,10 @@ export const witPurchaseMain = async (id: number) => {
 // 导出采购订单主 Excel
 export const exportPurchaseMain = async (params) => {
   if (params.isSearch) {
-    const data = {...params}
-    return await request.downloadPost({ url: `/wms/purchase-main/export-excel-senior`, data })
+    const data = { ...params }
+    return await request.downloadPost({ url: `/wms/purchase-main/export-excel-seniorWMS`, data })
   } else {
-    return await request.download({ url: `/wms/purchase-main/export-excel`, params })
+    return await request.download({ url: `/wms/purchase-main/excelWMS`, params })
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
index bad192360..9af189025 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
@@ -412,7 +412,11 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   }
   const searchList = (model)=>{
     selectionRows.value = []
-    setSearchParams(model)
+    const model1 = {
+      ...model
+    }
+    model1.itemTypeList =model.itemTypeList.filter(item=>item)
+    setSearchParams(model1)
   }
   const selectionRows = ref<any>([])
   const getSelectionRows = (currentPage,currentPageSelectionRows) => {