diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index df62da9f..cc2c1c43 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -26,17 +26,17 @@ - + - + - + @@ -45,9 +45,9 @@ 比如牛奶有瓶和箱两种单位,12瓶=1箱,这就构成了多单位,多单位中有个换算比例"> - - + +
@@ -386,13 +386,28 @@ name:{ rules: [ { required: true, message: '请输入名称!' }, - { min: 2, max: 60, message: '长度在 2 到 60 个字符', trigger: 'blur' } + { max: 100, message: '长度请小于100个字符', trigger: 'blur' } + ] + }, + standard:{ + rules: [ + { max: 50, message: '长度请小于50个字符', trigger: 'blur' } + ] + }, + model:{ + rules: [ + { max: 50, message: '长度请小于50个字符', trigger: 'blur' } ] }, unit:{ rules: [ { required: true, message: '请输入单位!' } ] + }, + unitId:{ + rules: [ + { required: true, message: '请选择多单位!' } + ] } }, url: { @@ -551,10 +566,6 @@ }, /** 发起新增或修改的请求 */ requestAddOrEdit(formData) { - if(formData.unit === '' && formData.unitId === '') { - this.$message.warning('抱歉,单位为必填项!'); - return; - } if(formData.meList.length === 0) { this.$message.warning('抱歉,请输入条码信息!'); return;