diff --git a/src/api/wms/issueRequestMain/index.ts b/src/api/wms/issueRequestMain/index.ts index 40d37e803..b319da323 100644 --- a/src/api/wms/issueRequestMain/index.ts +++ b/src/api/wms/issueRequestMain/index.ts @@ -61,7 +61,10 @@ export const updateIssueRequestMain = async (data: IssueRequestMainVO) => { export const deleteIssueRequestMain = async (id: number) => { return await request.delete({ url: `/wms/issue-request-main/delete?id=` + id }) } - +// 获取默认包装规格 +export const getPackUnit = async (data) => { + return await request.post({ url: `/wms/issue-request-main/getPackUnit`, data }) +} // 导出发料申请主 Excel export const exportIssueRequestMain = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 0aca9f690..d32b0d392 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -169,12 +169,31 @@ const onEnter = async (field,value) => { }]) } } +// 获取默认包装规格 +const getDefaultPackUnit = async (packUnitList)=>{ + console.log('获取默认包装规格',packUnitList) + let res = await IssueRequestMainApi.getPackUnit({ + list:packUnitList + }) + console.log('res',res) + if(res&&res.list.length>0){ + tableData.value.forEach(item=>{ + if(!item['packUnit']){ + let findItem = res.list.find(item1=>item1.itemCode == item.itemCode) + if(findItem){ + item['packUnit'] = findItem['packUnit'] + } + } + }) + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(async() => { if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'itemCode') { + let packUnitList = [] val.forEach(item=>{ let tableForm = JSON.parse(JSON.stringify(tableFormKeys)) if (tableData.value.length > 0) { @@ -185,8 +204,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => const newRow = JSON.parse(JSON.stringify({...tableForm,...item})) newRow['itemCode'] = item['code'] newRow['uom'] = item['uom'] + packUnitList.push({ + itemCode:item['code'], + workshopCode:formRef.formModel['workshopCode'],//车间代码 + productionLineCode:formRef.formModel['productionLineCode'],//生产线代码 + workStationCode:formRef.formModel['workStationCode'],//工位代码 + }) tableData.value.push(newRow) }) + getDefaultPackUnit(packUnitList) }else if(formField == 'packUnit'){ row['packQty'] = val[0]['packQty'] row[formField] = val[0][searchField]