From e31e71765b43d443648c67607ec1b55e79d9291f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 9 Jan 2024 17:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inspectJobMain/index.ts | 7 ++++++- src/api/wms/inspectRecordMain/index.ts | 9 +++++++-- src/api/wms/inspectRequestMain/index.ts | 7 ++++++- src/api/wms/purchasereturnJobMain/index.ts | 7 ++++++- src/api/wms/purchasereturnRecordMain/index.ts | 9 +++++++-- src/api/wms/putawayJobMain/index.ts | 7 ++++++- src/api/wms/putawayRecordMain/index.ts | 9 +++++++-- src/api/wms/putawayRequestMain/index.ts | 7 ++++++- .../inspect/inspectJobMain/index.vue | 2 +- .../inspect/inspectRecordMain/index.vue | 2 +- .../inspect/inspectRequestMain/index.vue | 2 +- .../purchasereturn/purchasereturnJobMain/index.vue | 2 +- .../purchasereturn/purchasereturnRecordMain/index.vue | 2 +- .../putaway/putawayJobMain/index.vue | 2 +- .../putaway/putawayRecordMain/index.vue | 2 +- .../putaway/putawayRequestMain/index.vue | 2 +- 16 files changed, 59 insertions(+), 19 deletions(-) diff --git a/src/api/wms/inspectJobMain/index.ts b/src/api/wms/inspectJobMain/index.ts index 03bf0b791..1b3a9ee82 100644 --- a/src/api/wms/inspectJobMain/index.ts +++ b/src/api/wms/inspectJobMain/index.ts @@ -82,7 +82,12 @@ export const deleteInspectJobMain = async (id: number) => { // 导出检验任务主 Excel export const exportInspectJobMain = async (params) => { - return await request.download({ url: `/wms/inspect-job-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/inspect-job-main/export-excel-senior`, data }) + } else { + return await request.download({url: `/wms/inspect-job-main/export-excel`, params}) + } } // 下载用户导入模板 diff --git a/src/api/wms/inspectRecordMain/index.ts b/src/api/wms/inspectRecordMain/index.ts index 2e1d233db..381950a0c 100644 --- a/src/api/wms/inspectRecordMain/index.ts +++ b/src/api/wms/inspectRecordMain/index.ts @@ -73,10 +73,15 @@ export const deleteInspectRecordMain = async (id: number) => { // 导出检验记录主 Excel export const exportInspectRecordMain = async (params) => { - return await request.download({ url: `/wms/inspect-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/inspect-record-main/export-excel-senior`, data }) + } else { + return await request.download({url: `/wms/inspect-record-main/export-excel`, params}) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inspect-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/inspectRequestMain/index.ts b/src/api/wms/inspectRequestMain/index.ts index d9b833a56..699ee6ccf 100644 --- a/src/api/wms/inspectRequestMain/index.ts +++ b/src/api/wms/inspectRequestMain/index.ts @@ -67,7 +67,12 @@ export const deleteInspectRequestMain = async (id: number) => { // 导出检验申请主 Excel export const exportInspectRequestMain = async (params) => { - return await request.download({ url: `/wms/inspect-request-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/inspect-request-main/export-excel-senior`, data }) + } else { + return await request.download({url: `/wms/inspect-request-main/export-excel`, params}) + } } // 下载用户导入模板 diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts index ec925e9b4..0c093ba40 100644 --- a/src/api/wms/purchasereturnJobMain/index.ts +++ b/src/api/wms/purchasereturnJobMain/index.ts @@ -81,7 +81,12 @@ export const deletePurchasereturnJobMain = async (id: number) => { // 导出采购退货任务主 Excel export const exportPurchasereturnJobMain = async (params) => { - return await request.download({ url: `/wms/purchasereturn-job-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereturn-job-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereturn-job-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/purchasereturnRecordMain/index.ts b/src/api/wms/purchasereturnRecordMain/index.ts index 47b793bc2..5cd951cf8 100644 --- a/src/api/wms/purchasereturnRecordMain/index.ts +++ b/src/api/wms/purchasereturnRecordMain/index.ts @@ -67,10 +67,15 @@ export const deletePurchasereturnRecordMain = async (id: number) => { // 导出采购退货记录主 Excel export const exportPurchasereturnRecordMain = async (params) => { - return await request.download({ url: `/wms/purchasereturn-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior`, data }) + } else { + return await request.download({url: `/wms/purchasereturn-record-main/export-excel`, params}) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereturn-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts index 6437b8608..adc2cadfc 100644 --- a/src/api/wms/putawayJobMain/index.ts +++ b/src/api/wms/putawayJobMain/index.ts @@ -74,7 +74,12 @@ export const deletePutawayJobMain = async (id: number) => { // 导出上架任务主 Excel export const exportPutawayJobMain = async (params) => { - return await request.download({ url: `/wms/putaway-job-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/putaway-job-main/export-excel-senior`, data }) + } else { + return await request.download({url: `/wms/putaway-job-main/export-excel`, params}) + } } // 下载用户导入模板 diff --git a/src/api/wms/putawayRecordMain/index.ts b/src/api/wms/putawayRecordMain/index.ts index 6f5924db9..c8b1cda50 100644 --- a/src/api/wms/putawayRecordMain/index.ts +++ b/src/api/wms/putawayRecordMain/index.ts @@ -60,10 +60,15 @@ export const deletePutawayRecordMain = async (id: number) => { // 导出上架记录主 Excel export const exportPutawayRecordMain = async (params) => { - return await request.download({ url: `/wms/putaway-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/putaway-record-main/export-excel-senior`, data }) + } else { + return await request.download({url: `/wms/putaway-record-main/export-excel`, params}) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/putaway-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/putawayRequestMain/index.ts b/src/api/wms/putawayRequestMain/index.ts index e8f454d58..af4ba1618 100644 --- a/src/api/wms/putawayRequestMain/index.ts +++ b/src/api/wms/putawayRequestMain/index.ts @@ -58,7 +58,12 @@ export const deletePutawayRequestMain = async (id: number) => { // 导出上架申请主 Excel export const exportPutawayRequestMain = async (params) => { - return await request.download({ url: `/wms/putaway-request-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/putaway-request-main/export-excel-senior`, data }) + } else { + return await request.download({url: `/wms/putaway-request-main/export-excel`, params}) + } } // 下载用户导入模板 diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue index e97dd0f17..cd63ef754 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue @@ -218,7 +218,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams) + const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params) download.excel(data, '检验任务主.xlsx') } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue index 00e0f89e9..994c5b48b 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue @@ -147,7 +147,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams) + const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params) download.excel(data, '检验记录主.xlsx') } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index 663ae49b9..6d1a4fa54 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -284,7 +284,7 @@ await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams) + const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params) download.excel(data, '检验申请主.xlsx') } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index 2f93489e8..f89d2532e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -218,7 +218,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams) + const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params) download.excel(data, '采购退货任务主.xlsx') } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index e4fca8ac9..b60204664 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -141,7 +141,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams) + const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) download.excel(data, '采购退货记录主.xlsx') } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index 9d473aab7..26dd684e7 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -218,7 +218,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams) + const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params) download.excel(data, '上架任务主.xlsx') } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue index 8bed0a9c2..64d90b6df 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue @@ -141,7 +141,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams) + const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params) download.excel(data, '上架记录主.xlsx') } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index 175407576..5b5ccaf90 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -314,7 +314,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams) + const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params) download.excel(data, '上架申请主.xlsx') } catch { } finally {