diff --git a/src/api/wms/bomDismantle/index.ts b/src/api/wms/bomDismantle/index.ts index 83b2da219..ac6c85ef8 100644 --- a/src/api/wms/bomDismantle/index.ts +++ b/src/api/wms/bomDismantle/index.ts @@ -16,8 +16,17 @@ export const getProductscrapBomDismantlePage = async (params) => { } -export const getProductscrapBomRecordPage = async (params) => { - return await request.get({ url: `/wms/productscrap-request-main/bomRecordPage`, params }) +export const getProductscrapBomRecordPage = async (params1) => { + console.log('getProductscrapBomRecordPage',params1) + let params = {...params1} + if(params.isRecord){ + delete params.isRecord + return await request.get({ url: `/wms/productscrap-request-main/bomRecordPage`, params }) + }else{ + delete params.isRecord + return await request.get({ url: `/wms/productscrap-request-main/bomPage`, params }) + + } } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 4ad831bb4..425c09ee3 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -169,6 +169,7 @@ const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useT getListApi: BomDismantleApi.getProductscrapBomRecordPage }) const { getList:getDetailListBom } = detatableMethodsBom +detatableDataBom.params.isRecord = false /** bom 列表 表单 按钮 */ const ButttondataBom = ref([ defaultButtons.formSaveBtn(null), // 保存 @@ -255,6 +256,7 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> { detatableDataBom.params.bomVersion = row.bomVersion detailQty.value = row.qty bomModelVisible.value = true + detatableDataBom.params.isRecord = false await getDetailListBom() console.log(row.fromLocationCode); detatableDataBom.tableList.forEach(async (item) => { @@ -351,6 +353,7 @@ const tableFormButton = async (val , row) => { } rowId.value = row.masterId detailQty.value = row.qty + detatableDataBom.params.isRecord = true await getDetailListBom() //详情 isShowFooterButtton.value = false