diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 0b06729cc..a648a54d9 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1210,6 +1210,37 @@ defineExpose({ open }) // 提供 open 方法,用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { + let TransactionType = formData.value.condition[5]['Value'] + if(Array.isArray(TransactionType)){ + TransactionType = TransactionType.join(',') + } + if(TransactionType=='Repleinment'){ + //补料--物料和库位必填 + let msg = '' + let itemCodeType = formData.value.condition[1]['ParamCode'] + let itemCodes = formData.value.condition[1]['Value'] + if(Array.isArray(itemCodes)){ + itemCodes = itemCodes.join(',') + } + let locationCodes = formData.value.configuration.LocationCode + if(Array.isArray(locationCodes)){ + locationCodes = locationCodes.join(',') + } + if(itemCodeType!='ItemCode'){ + msg = '请选择物料' + }else if(itemCodes.trim().length<=0){ + msg = '请您选择物料' + }else if(warehouseType.value!='LocationCode'){ + // 判断库位必填 + msg = '请选择库位' + }else if(locationCodes.trim().length<=0){ + msg = '请您选择库位' + } + if(msg){ + message.error(msg) + return + } + } await blurWarehouse() // await blurTransactionType() if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){ @@ -1231,38 +1262,7 @@ const submitForm = async () => { return } - let TransactionType = formData.value.condition[5]['Value'] - if(Array.isArray(TransactionType)){ - TransactionType = TransactionType.join(',') - } - if(TransactionType=='Repleinment'){ - //补料--物料和库位必填 - let msg = '' - - // 判断物料必填 - let itemCodes = formData.value.condition[1]['Value'] - if(Array.isArray(itemCodes)){ - itemCodes = itemCodes.join(',') - } - if(itemCodes.trim().length<=0){ - msg = '请您选择物料' - }else if(warehouseType.value!='LocationCode'){ - // 判断库位必填 - msg = '请选择库位类型' - }else{ - let locationCodes = formData.value.configuration.LocationCode - if(Array.isArray(locationCodes)){ - locationCodes = locationCodes.join(',') - } - if(locationCodes.trim().length<=0){ - msg = '请您选择库位' - } - } - if(msg){ - message.error(msg) - return - } - } + // 校验表单 if (!formRef) return const valid = await formRef.value.validate()