diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts index c889e2dff..f6f5f1726 100644 --- a/src/api/mes/processroute/index.ts +++ b/src/api/mes/processroute/index.ts @@ -87,6 +87,11 @@ export const getProcessBomList = async (params) => { return await request.get({ url: `/mes/common/getBomListByProductAndProcess`,params}) } +// 查询产品bom的工序物料列表 +export const getBomListByProductBomAndProcess = async (params) => { + return await request.get({ url: `/mes/common/getBomListByProductBomAndProcess`,params}) +} + export const getWorkstationPage = async (code:String) => { return await request.get({ url: `/mes/workstation/page?pageSize=25&processCode=`+code}) } diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 08cdcd6bb..1b6d72818 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -189,6 +189,7 @@ const tableProcess = ref() const productData = ref({ name: '', code: '', desc1: '--' }) //产品数据 const materialData=ref() const mouldData = ref() +//const bomVersion=ref() const page=ref({ total:0, current:1, @@ -327,6 +328,7 @@ const getProcessBomList = async (pcode,processCode) => { processCode:processCode } return await ProcessrouteApi.getProcessBomList(params); + //return await ProcessrouteApi.getBomListByProductBomAndProcess(params); } /** 查询模具基本信息列表 */ const getPatternPage = async (code) => { @@ -363,10 +365,10 @@ const nodeClick = (e, x, y, node, view) => { currentNode.value.name=node.attrs.title.text Promise.all([ getProcessInfo(node.id), - getProcessBomList(productCode.value,node.id), + getProcessBomList(productCode.value,node.id),// rowData.value getPatternPage(node.id), getWorkstationPage(node.id) - ]).then(([processInfoList,basicBom, patternPage,workstationInfoList]) => { + ]).then(([processInfo,basicBom, patternPage,workstationInfoList]) => { // 在这里处理所有异步操作的结果 //message.info(JSON.stringify(processIndoList)) //console.log('basicBom',basicBom) diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts index e2f1f9ee8..7f02e7bed 100644 --- a/src/views/mes/processroute/processroute.data.ts +++ b/src/views/mes/processroute/processroute.data.ts @@ -97,6 +97,13 @@ export const Processroute = useCrudSchemas(reactive([ } } }, + // { + // label: 'BOM版本号', + // field: 'BOMVersion', + // sort: 'custom', + // value: '1', + // isSearch: false, + // }, // { // label: '版本号', // field: 'routeVersion',