Merge branch 'nbs' into dev

This commit is contained in:
tian.guangyuan
2020-03-27 16:41:36 +08:00

View File

@@ -354,13 +354,13 @@ export default {
this.$toast('终止年月必须大于起始年月')
return
}
if(this.children[0] !== undefined && this.eduAge(this.form.educationalAgeOne,this.children[0].familyAge)){
if(this.children[0] != undefined && this.eduAge(this.form.educationalAgeOne,this.children[0].familyAge)){
return false
}
if(this.children[1] !== undefined && this.eduAge(this.form.educationalAgeTwo,this.children[1].familyAge)){
if(this.children[1] != undefined && this.eduAge(this.form.educationalAgeTwo,this.children[1].familyAge)){
return false
}
if(this.children[2] !== undefined && this.eduAge(this.form.educationalAgeThree,this.children[2].familyAge)){
if(this.children[2] != undefined && this.eduAge(this.form.educationalAgeThree,this.children[2].familyAge)){
return false
}
let form = utils.deepCopy(this.form)
@@ -390,6 +390,9 @@ export default {
})
},
eduAge(num, age){
if(num == undefined || num == ''){
return false
}
num = num-0;
if(num < age || num > 85){
this.$toast("您子女的教育年龄不能小于他的年龄且不能超过85岁");