From fb69770e9b9f52df16bca70a20d0007b95aded5c Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 18 Dec 2023 14:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=8E=E5=A2=9E=E5=8A=A0BOM=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productrepairRequestMain/index.ts | 5 ++ .../productrepairRequestMain/index.vue | 50 ++++++++++++++----- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/src/api/wms/productrepairRequestMain/index.ts b/src/api/wms/productrepairRequestMain/index.ts index 032fe2afa..17eb6d660 100644 --- a/src/api/wms/productrepairRequestMain/index.ts +++ b/src/api/wms/productrepairRequestMain/index.ts @@ -94,3 +94,8 @@ export const agreeProductrepairRequestMain = async (id) => { export const handleProductrepairRequestMain = async (id) => { return await request.put({ url: `/wms/productrepair-request-main/handle?id=` + id }) } + +// 修改制品返修BOM数据 +export const updateProductscrapDetailRequestBom = async (id, data) => { + return await request.post({ url: `/wms/productrepair-request-main/updateBom?id=`+id, data }) +} diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index d4ebf28aa..579681b76 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -106,6 +106,8 @@ import * as ProductrepairRequestMainApi from '@/api/wms/productrepairRequestMain import * as ProductrepairRequestDetailApi from '@/api/wms/productrepairRequestDetaila' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as BomDismantleApi from '@/api/wms/bomDismantle' +import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb"; +import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain"; // 制品返修申请 @@ -135,6 +137,8 @@ const buttondataTable = ref([{ const DialogTitle = ref('Bom信息') const bomModelVisible = ref(false) const tableListBom = ref() +const lsBomSave = ref() +const rowId = ref() const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({ getListApi: BomDismantleApi.getBomDismantlePage }) @@ -150,12 +154,17 @@ const buttonBaseClickBom = (val) => { if (val == 'save') { // 根据 填写的数量 为基准 不填写数量的忽略 tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0)) - tableData.value.forEach((item, index) => { - if(tableListBom.value[0].rowId == index) { - item.childList = tableListBom.value - } - }) - console.log(157, tableData.value) + if(lsBomSave.value){ + tableData.value.forEach((item, index) => { + if(tableListBom.value[0].rowId == index) { + item.childList = tableListBom.value + } + }) + }else { + // 详情下的 bom编辑功能 调用接口 保存数据 + ProductrepairRequestMainApi.updateProductscrapDetailRequestBom(rowId.value, tableListBom.value) + message.success(t('common.updateSuccess')) + } bomModelVisible.value = false } // 关闭 @@ -209,6 +218,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['workStationCode'] = val[0]['code'] } else if(formField == 'formField'){ row['workStationCode'] = val[0]['code'] + } else if(formField == 'bomVersion'){ + row['bomVersion'] = val[0]['version'] } else { row[formField] = val[0][searchField] } @@ -224,13 +235,23 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] - setV['containerNumber'] = val[0]['containerNumber'] - setV['itemCode'] = val[0]['itemCode'] - setV['packingNumber'] = val[0]['packingNumber'] - setV['batch'] = val[0]['batch'] - setV['uom'] = val[0]['uom'] - setV['inventoryStatus'] = val[0]['inventoryStatus'] - setV['fromLocationCode'] = val[0]['locationCode'] + if(formField == 'packingNumber'){ + setV['containerNumber'] = val[0]['containerNumber'] + setV['itemCode'] = val[0]['itemCode'] + setV['packingNumber'] = val[0]['packingNumber'] + setV['batch'] = val[0]['batch'] + setV['uom'] = val[0]['uom'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['fromLocationCode'] = val[0]['locationCode'] + } else if(formField == 'productionLineCode'){ + setV['productionLineCode'] = val[0]['code'] + } else if(formField == 'workStationCode'){ + setV['workStationCode'] = val[0]['code'] + } else if(formField == 'formField'){ + setV['workStationCode'] = val[0]['code'] + } else if(formField == 'bomVersion'){ + setV['bomVersion'] = val[0]['version'] + } formRef.setValues(setV) }) } @@ -390,12 +411,14 @@ const handleHandle = async (id: number) => { const formRef = ref() const openForm =async (type: string, row?: number) => { tableData.value = [] // 重置明细数据 + lsBomSave.value = true formRef.value.open(type, row) } /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { + lsBomSave.value = false detailRef.value.openDetail(row, titleName, titleValue) } @@ -501,6 +524,7 @@ const tableFormButton = async (val , row) => { bomVersion: row.bomVersion, masterId: row.id } + rowId.value = row.id await getDetailListBom() } }