From 975b8a1b1a2c6a51b2299f2a57a673c3f68038c8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 16 Nov 2023 09:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/accountcalendar/index.ts                       | 7 ++++++-
 src/api/wms/currencyexchange/index.ts                      | 7 ++++++-
 src/api/wms/systemcalendar/index.ts                        | 7 ++++++-
 .../basicDataManage/itemManage/itembasic/itembasic.data.ts | 2 +-
 .../systemSetting/accountcalendar/index.vue                | 2 +-
 .../systemSetting/currencyexchange/index.vue               | 2 +-
 .../basicDataManage/systemSetting/systemcalendar/index.vue | 2 +-
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/api/wms/accountcalendar/index.ts b/src/api/wms/accountcalendar/index.ts
index 8239184d2..984d36ba6 100644
--- a/src/api/wms/accountcalendar/index.ts
+++ b/src/api/wms/accountcalendar/index.ts
@@ -46,7 +46,12 @@ export const deleteAccountcalendar = async (id: number) => {
 
 // 导出账期日历 Excel
 export const exportAccountcalendar = async (params) => {
-  return await request.download({ url: `/wms/accountcalendar/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/accountcalendar/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/accountcalendar/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/currencyexchange/index.ts b/src/api/wms/currencyexchange/index.ts
index 7c5c9f0d2..6e0777715 100644
--- a/src/api/wms/currencyexchange/index.ts
+++ b/src/api/wms/currencyexchange/index.ts
@@ -43,7 +43,12 @@ export const deleteCurrencyexchange = async (id: number) => {
 
 // 导出货币转换 Excel
 export const exportCurrencyexchange = async (params) => {
-  return await request.download({ url: `/wms/currencyexchange/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/currencyexchange/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/currencyexchange/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/systemcalendar/index.ts b/src/api/wms/systemcalendar/index.ts
index e7da3af78..0499f49c9 100644
--- a/src/api/wms/systemcalendar/index.ts
+++ b/src/api/wms/systemcalendar/index.ts
@@ -43,7 +43,12 @@ export const deleteSystemcalendar = async (id: number) => {
 
 // 导出系统日历 Excel
 export const exportSystemcalendar = async (params) => {
-  return await request.download({ url: `/wms/systemcalendar/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/systemcalendar/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/systemcalendar/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index d9d207741..70196395b 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -77,7 +77,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 120
-    } ,
+    }
   },
   {
     label: '替代计量单位',
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
index be14e08dd..a8eba149d 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await AccountcalendarApi.exportAccountcalendar(setSearchParams)
+    const data = await AccountcalendarApi.exportAccountcalendar(tableObject.params)
     download.excel(data, '账期日历.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index 27075c47b..342e74b11 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -196,7 +196,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await CurrencyexchangeApi.exportCurrencyexchange(setSearchParams)
+    const data = await CurrencyexchangeApi.exportCurrencyexchange(tableObject.params)
     download.excel(data, '货币转换.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
index 1f1dea4b7..6b2b33554 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await SystemcalendarApi.exportSystemcalendar(setSearchParams)
+    const data = await SystemcalendarApi.exportSystemcalendar(tableObject.params)
     download.excel(data, '系统日历.xls')
   } catch {
   } finally {