From cd5cdf66daaec7db44e2f2a680e5980af45e4569 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 5 Nov 2024 14:02:49 +0800 Subject: [PATCH] =?UTF-8?q?YT-663=E6=96=B0=E5=A2=9E=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=EF=BC=8C=E6=8A=A5=E5=8C=85=E8=A3=85=E5=8F=B7?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=EF=BC=8C=E8=BF=99=E5=87=A0=E4=B8=AA=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E9=83=BD=E6=9C=89=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20@=E5=BC=A0=E7=AB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRequestMain/index.vue | 2 +- .../inventorymoveRequestMain/index.vue | 26 +++++++++---------- .../inventorymoveRequestMainHOLDWIP/index.vue | 24 ++++++++--------- .../inventorymoveRequestMainMOVE/index.vue | 22 ++++++++-------- .../inventorymoveRequestMainOKHOLD/index.vue | 26 +++++++++---------- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index cc95c2b3c..267b3907d 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -136,7 +136,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //到货主代码 row['toOwnerCode'] = val[0]['code'] }else if(formField == 'itemCode'){ - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) + val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) if(val.length==0) return val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 2ae34438a..895ec3c2f 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -354,8 +354,8 @@ const fromManagementPrecision = ref('') const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(async() => { if (type == 'tableForm') { - if(formField == 'itemCode'){ - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) + if (formField == 'itemCode') { + val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) if(val.length==0) return val.forEach(async item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) @@ -738,17 +738,17 @@ const submitForm = async (formType, submitData) => { } data.businessType = businessType.value data.subList = tableData.value // 拼接子表数据参数 - let isExist = false - tableData.value.forEach(item => { - let rs = tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode) ) - console.log(rs,5666); - if(rs.length > 1) isExist = true - }) - if (isExist) { - formRef.value.formLoading = false - isExist = false - return message.warning('包装号重复') - } + // let isExist = false + // tableData.value.forEach(item => { + // let rs = tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode) ) + // console.log(rs,5666); + // if(rs.length > 1) isExist = true + // }) + // if (isExist) { + // formRef.value.formLoading = false + // isExist = false + // return message.warning('物料号重复') + // } flag.value = false data.subList.forEach(item => { console.log(556565,item); diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index eb96510e4..4b4450b94 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -297,7 +297,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => console.log(formField) if (type == 'tableForm') { if (formField == 'itemCode') { - val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus'])) + val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus'])) if (val.length == 0) return val.forEach(item => { const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item })) @@ -642,17 +642,17 @@ const submitForm = async (formType, submitData) => { } data.businessType = businessType.value data.subList = tableData.value // 拼接子表数据参数 - let isExist = false - tableData.value.forEach(item => { - let rs = tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode) ) - console.log(rs,5666); - if(rs.length > 1) isExist = true - }) - if (isExist) { - formRef.value.formLoading = false - isExist = false - return message.warning('包装号重复') - } + // let isExist = false + // tableData.value.forEach(item => { + // let rs = tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode) ) + // console.log(rs,5666); + // if(rs.length > 1) isExist = true + // }) + // if (isExist) { + // formRef.value.formLoading = false + // isExist = false + // return message.warning('物料号重复') + // } flag.value = false data.subList.forEach(item => { console.log(556565,item); diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index f5ad6cd68..a84c7e501 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -312,7 +312,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(async() => { if (type == 'tableForm') { if(formField == 'itemCode'){ - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) + val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) if(val.length==0) return val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) @@ -708,16 +708,16 @@ const submitForm = async (formType, submitData) => { return } data.subList = tableData.value // 拼接子表数据参数 - let isExist = false - tableData.value.forEach(item => { - let rs = tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode) ) - if(rs.length > 1) isExist = true - }) - if (isExist) { - formRef.value.formLoading = false - isExist = false - return message.warning('包装号重复') - } + // let isExist = false + // tableData.value.forEach(item => { + // let rs = tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode) ) + // if(rs.length > 1) isExist = true + // }) + // if (isExist) { + // formRef.value.formLoading = false + // isExist = false + // return message.warning('物料号重复') + // } flag.value = false data.subList.forEach(item => { if(fromInventoryStatus.value){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index a1e237350..e0dd56649 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -317,7 +317,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(async() => { if (type == 'tableForm') { if(formField == 'fromBatch'){ - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) + val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) if(val.length==0) return const toLocationCode =formRef.formModel.toLocationCode//主数据选择的到库位代码 @@ -712,18 +712,18 @@ const submitForm = async (formType, submitData) => { message.warning("数量不能大于库存数量") return } - let isExist = false - tableData.value.forEach(item => { - item['toLocationCode'] = toLocationCode - let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) ) - console.log(rs,5666); - if(rs.length > 1) isExist = true - }) - if (isExist) { - formRef.value.formLoading = false - isExist = false - return message.warning('包装号重复') - } + // let isExist = false + // tableData.value.forEach(item => { + // item['toLocationCode'] = toLocationCode + // let rs = tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode) ) + // console.log(rs,5666); + // if(rs.length > 1) isExist = true + // }) + // if (isExist) { + // formRef.value.formLoading = false + // isExist = false + // return message.warning('物料号重复') + // } flag.value = false data.subList.forEach(item => { console.log(556565,item);