diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 3c66794e2..acb8c0307 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -775,6 +775,7 @@ export default { 系统提示:'System Prompt', 是否为此数据生成标签:'Do you generate labels for this data?', 是否修改物料包装标包数量:'Do you want to modify the quantity of material packaging?', + 包装规格1和包装规格2不能相同:'Package specification 1 and package specification 2 must be different', 是否处理所选中数据:'Do you process the selected data?', 发货:'shipments', 标签信息:'Label information', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index d31022a59..3d30b4673 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -775,6 +775,7 @@ export default { 系统提示:'系统提示', 是否为此数据生成标签:'是否为此数据生成标签', 是否修改物料包装标包数量:'是否修改物料包装标包数量', + 包装规格1和包装规格2不能相同:'包装规格1和包装规格2不能相同', 是否处理所选中数据:'是否处理所选中数据', 发货:'发货', 标签信息:'标签信息', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index bda6f6835..acf40550b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -793,6 +793,10 @@ const submitFormLabel = async (formType, data) => { console.log("formType==",formType) console.log("data==",data) data.subList = detatableData.tableList + if(detatableData.tableList.find(item=>item.secondPackUnit==item.packUnit)){ + message.warning(t('ts.包装规格1和包装规格2不能相同')) + return + } // 校验物料包装规格数量是否修改 let flag = false; await SupplierdeliverRequestMainApi.checkPackQty(data).then(async res => {