From c5298daa3b5cb80427e1c79929824cc3010f6788 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sat, 17 Aug 2024 10:47:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?HL-5354=20=E8=A3=85=E9=85=8D=E5=88=B6?= =?UTF-8?q?=E5=93=81=E4=B8=8A=E6=9E=B6=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productputawayRecordDetail/index.ts | 2 +- src/api/wms/productputawayRecordMain/index.ts | 8 +++++++- .../stockup/stockupMainJob/index.vue | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/api/wms/productputawayRecordDetail/index.ts b/src/api/wms/productputawayRecordDetail/index.ts index 4464c5c7e..5b46db206 100644 --- a/src/api/wms/productputawayRecordDetail/index.ts +++ b/src/api/wms/productputawayRecordDetail/index.ts @@ -54,7 +54,7 @@ export const getProductputawayRecordDetailPage = async (params) => { // 查询制品上架记录子列表 export const getProductputawayRecordDetailPageAssemble = async (params) => { -   params.type = 'assemble' + params.type = 'assemble' if (params.isSearch) { const cmd = { 'column':'type', diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts index 897de3153..f411cfb30 100644 --- a/src/api/wms/productputawayRecordMain/index.ts +++ b/src/api/wms/productputawayRecordMain/index.ts @@ -74,8 +74,14 @@ export const deleteProductputawayRecordMain = async (id: number) => { // 导出制品上架记录主 Excel export const exportProductputawayRecordMain = async (params) => { - params.type = 'predict' + 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.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data }) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index 92a3e9db4..1551887fb 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -142,7 +142,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-job-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-main-job:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 From bb01965e61ae11d48efa97843d371726c08b9621 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sat, 17 Aug 2024 11:00:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?HL-5400=20=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index c68de58d5..542698de4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -305,6 +305,15 @@ const handleExport = async () => { // 筛选提交 const searchFormClick = (searchData) => { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + if (!Array.isArray(searchData.filters)) { + searchData.filters = []; + } + searchData.filters.push(cmd) tableObject.params = { isSearch: true, filters: searchData.filters From ebc5855f54b78b3341256b83c3f3b800aafc2ea9 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 11:05:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E7=89=88-=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMainNew/index.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index d065fb8d6..81a5268d7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -83,7 +83,7 @@ - +