diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 9b381a0fe..530ff93fb 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -249,14 +249,14 @@ - + - +
- * + * {{$t('ParameterNo')}}
@@ -271,7 +271,7 @@
- * + * {{$t('NParameterName')}}
@@ -448,7 +448,6 @@ export default { } else if (long && long == 'en-us') { this.cut = 'en' } - console.log(this.cut) }, methods: { getcontentListedEdit() { @@ -595,6 +594,7 @@ export default { item1.description= '' // 描述 } }) + console.log(this.contentList) }; }) @@ -644,6 +644,11 @@ export default { // } else { // value.technologyTerritory = value.technologyTerritory.split(',') // } + if(this.formInline.controlType == 11){ + this.required = false + }else{ + this.required = true + } this.formInline = value this.title = this.$t('edit') this.flag = 0 @@ -674,41 +679,44 @@ export default { return } let falg = 1 - this.contentList.forEach((item,index) => { - let reg = /^[0-9a-zA-Z-/. ]{1,}$/ - // 编号的限制 - if(item.paramsNumber == '' || item.paramsNumber === undefined) { - this.$message.warning(this.$t('standard')+this.$t('cannotEmpty')) - falg = 0 - return - } else if(item.paramsNumber.length > 15){ - this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'15'+this.$t('Characters')) - falg = 0 - return - } else if(item.paramsNumber.match(reg) === null) { - this.$message.warning(this.$t('standard')+this.$t('onlyThree')) - falg = 0 - return - } - // 参数名称的限制 - if(item.paramsName == '' || item.paramsName === undefined) { - this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty')) - falg = 0 - return - } else if(item.paramsName.length > 100){ - this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters')) - falg = 0 - return - } - if(item.description !== undefined && item.description !== null){ - // 参数说明的限制 - if(item.description.length > 2000){ - this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'2000'+this.$t('Characters')) + if(this.formInline.controlType != 11){ + this.contentList.forEach((item,index) => { + let reg = /^[0-9a-zA-Z-/. ]{1,}$/ + // 编号的限制 + if(item.paramsNumber == '' || item.paramsNumber === undefined ) { + this.$message.warning(this.$t('standard')+this.$t('cannotEmpty')) + falg = 0 + return + } else if(item.paramsNumber.length > 15){ + this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'15'+this.$t('Characters')) + falg = 0 + return + } else if(item.paramsNumber.match(reg) === null) { + this.$message.warning(this.$t('standard')+this.$t('onlyThree')) falg = 0 return } - } - }) + // 参数名称的限制 + if(item.paramsNumber == '' || item.paramsNumber === undefined) { + this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty')) + falg = 0 + return + } else if(item.paramsName.length > 100){ + this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters')) + falg = 0 + return + } + if(item.description !== undefined && item.description !== null){ + // 参数说明的限制 + if(item.description.length > 2000){ + this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'2000'+this.$t('Characters')) + falg = 0 + return + } + } + }) + } + if(falg === 1) { this.$refs.ruleForm.validate(valid => { if (valid) {