Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/api/wms/accountcalendar/index.ts

@@ -46,8 +46,13 @@ export const deleteAccountcalendar = async (id: number) => {
 
 // 导出账期日历 Excel
 export const exportAccountcalendar = async (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 })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/wms/currencyexchange/index.ts

@@ -43,8 +43,13 @@ export const deleteCurrencyexchange = async (id: number) => {
 
 // 导出货币转换 Excel
 export const exportCurrencyexchange = async (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 })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/wms/systemcalendar/index.ts

@@ -43,8 +43,13 @@ export const deleteSystemcalendar = async (id: number) => {
 
 // 导出系统日历 Excel
 export const exportSystemcalendar = async (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 })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

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: '替代计量单位',

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 {

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 {

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 {