From 388b833467b3473a78e8233af4a63369efdf3a55 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 30 Oct 2024 10:37:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E8=BD=AC=E7=BA=BF=E8=BE=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainHOLDWIP/index.vue | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index 0bf4677a0..1a7b895a6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -293,13 +293,14 @@ const fromManagementPrecision = ref('') const toManagementPrecision = ref('') // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { - nextTick(() => { + nextTick(async () => { + console.log(formField) if (type == 'tableForm') { - if(formField == 'fromPackingNumber'){ - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) - if(val.length==0) return - val.forEach(item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + if (formField == 'fromPackingNumber') { + val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch'] && item1['fromPackingNumber'] == item['packingNumber'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus'])) + if (val.length == 0) return + val.forEach(item => { + const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item })) newRow['fromPackingNumber'] = item['packingNumber'] newRow['fromContainerNumber'] = item['containerNumber'] newRow['itemCode'] = item['itemCode'] @@ -308,16 +309,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] - + newRow['toInventoryStatus'] = "OK" //HoldtoWipRequestMain 隔离转线边 tableData.value.push(newRow) }) - }else if(formField == 'toLocationCode'){//到库位代码 - debugger - //从批次 - await ruleApi.getManagementPrecision({ - itemCodes: [row['itemCode']], - locationCode:row['fromLocationCode'] + } else if (formField == 'toLocationCode') {//到库位代码 + //从批次 + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode: row['fromLocationCode'] }).then((res) => { fromManagementPrecision.value = res[0].ManagementPrecision }) @@ -325,23 +325,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (fromManagementPrecision.value == 'BY_QUANTITY') {//如果从批次+物料管理精度是按数量 //到批次 await ruleApi.getManagementPrecision({ - itemCodes: [row['itemCode']], - locationCode:row['locationCode'] - }).then((res) => { - toManagementPrecision.value = res[0].ManagementPrecision - }) - if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次 - if(newRow['fromBatch']==''){ - newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 + itemCodes: [row['itemCode']], + locationCode: row['locationCode'] + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + }) + if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次 + if (row['fromBatch'] == '') { + row['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 + } + row['fromBatchFormItemType'] = 'FormDate' + row['disabled_fromBatch'] = false + } else { + row['fromBatchFormItemType'] = '' + row['disabled_fromBatch'] = true } - newRow['fromBatchFormItemType'] = 'FormDate' - newRow['disabled_fromBatch'] = false - }else { - newRow['fromBatchFormItemType'] = '' - newRow['disabled_fromBatch'] = true - } - } else { - row[formField] = val[0][searchField] + } else { + row[formField] = val[0][searchField] + } } } else { const setV = {}