From 6ef5c4dd80fd8725bef0c927b559125ab4bd0c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 4 Jan 2024 20:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=9F=A5=E8=AF=A2=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=20=E4=BC=98=E5=8C=96=20=E7=AD=9B=E9=80=89=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=B7=BB=E5=8A=A0=E5=BC=B9=E7=AA=97=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productionlineitem/index.ts | 9 ++++++++- .../SearchTable/src/SearchTable.vue | 19 +++++++++++++++++-- .../productionreturnRequestMain.data.ts | 8 ++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts index aeb092309..6b109f42c 100644 --- a/src/api/wms/productionlineitem/index.ts +++ b/src/api/wms/productionlineitem/index.ts @@ -23,7 +23,14 @@ export const getProductionlineitemPage = async (params) => { // 查询生产线物料关系列表——根据 生产线 物品类型为原料和半成品 export const getProductionlineitemPageByItemtype = async (params) => { - return await request.get({ url: `/wms/productionlineitem/pageByItemtype`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionlineitem/pageByItemtypeSenior', data }) + } else { + return await request.get({ url: `/wms/productionlineitem/pageByItemtype`, params }) + } + } // 查询生产线物料关系详情 diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index b54633dfc..66cbfde72 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -87,14 +87,29 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s if (searchCondition) tableObjectRef.value.params = searchCondition; // 获得表格的各种操作 - const { getList, setSearchParams } = tableMethods - setSearchParamsRef.value = setSearchParams + const { getList } = tableMethods + // setSearchParamsRef.value = setSearchParams + setSearchParamsRef.value = tableObject.params getListRef.value = getList getList() } // 筛选提交 const searchFormClick = (searchData) => { + // console.log(99, rowRef.value) + // console.log(100, searchData) + // console.log(101, tableObjectRef.value.params) + + // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters + if (tableObjectRef.value.params) { + Object.keys(tableObjectRef.value.params).forEach(key => { + searchData.filters.push({ + action: "==", + column: key, + value: tableObjectRef.value.params[key] + }) + }); + } tableObjectRef.value.params = { isSearch: true, filters: searchData.filters diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 8009d85ac..ab6d89791 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -546,6 +546,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive