diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index e57b2268b..fbc619e43 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -695,6 +695,15 @@ const submitFormLabel = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + let messageList = [] + detatableData.tableList.forEach(item=>{ + if(item['packUnit'] == item['secondPackUnit']){ + messageList.push(item['itemCode']) + } + }) + if(messageList.length>0){ + message.error(`物料${messageList.join(',')}包装规格1和包装规格2不能相同`) + } try { detatableData.tableList.forEach(async (item) => { // 创建标签 要物料库区配置表中 入库包装规格 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 951cf42af..6ae43110c 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -2074,6 +2074,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( //表单校验 export const ProductreceiptRequestLabelRules = reactive({ + secondPackUnit: [ + { required: true, message: '请选择包装规格2', trigger: 'change' } + ], supplierItemCode: [ { required: true, message: '请选择供应商', trigger: 'change' } ],