From cac8135fefc7cf422cb26e3026ba22dbdf349f3c Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Thu, 12 Sep 2024 13:18:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productreceiptRecordMain/index.ts | 8 +++++++- .../productreceiptAssembleRecordMain/index.vue | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index 29a791d91..0fe298f8c 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -106,9 +106,15 @@ export const exportProductreceiptRecordMain = async (params) => { export const exportProductreceiptRecordAssembleMain = async (params) => { params.type = 'assemble' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'assemble' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/productreceipt-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params }) } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 64c986e44..9a55e91c3 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -190,7 +190,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:productreceiptAssemble-record-main:export'}), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置