diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index ab417dbc2..baa9cb66b 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -79,7 +79,7 @@ export const importTemplate = () => { // 导入地址 export const importUrl = '/wms/itembasic/import' -// 查询物料基本信息列表 +// 查询物料类型为成品/半成品的信息列表 export const selectItembasicPageToFgAndSemibasicPage = async (params) => { if (params.isSearch) { const data = {...params} @@ -87,4 +87,14 @@ export const selectItembasicPageToFgAndSemibasicPage = async (params) => { } else { return await request.get({ url: `/wms/itembasic/itembasicPageToFgAndSemi`, params }) } +} + +// 查询物料类型为原料/半成品的信息列表 +export const selectTypeToItembasic = async (params) => { + if (params.isSearch) { + const data = {...params} + return request.post({ url: '/wms/itembasic/pageTypeToItembasicSenior', data }) + } else { + return await request.get({ url: `/wms/itembasic/pageTypeToItembasic`, params }) + } } \ No newline at end of file diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts index 00c6b1b40..6dc20de14 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts +++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts @@ -30,20 +30,7 @@ export const Bom = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '物料基础信息', // 查询弹窗标题 searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - action: '==', - isSearch: true, - isMainValue: false - },{ - key: 'enableMake', - value: 'TRUE', - action: '==', - isSearch: true, - isMainValue: false - }] + searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage, // 查询弹窗所需分页方法 } } }, @@ -63,14 +50,7 @@ export const Bom = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '物料基础信息', // 查询弹窗标题 searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - action: '==', - isSearch: true, - isMainValue: false - }] + searchPage: ItembasicApi.selectTypeToItembasic, // 查询弹窗所需分页方法 } } },