Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-09-22 11:06:17 +08:00
@@ -919,10 +919,9 @@
}
},
getRule(){
if (this.formTongGuo.approvalOpinion === '0') {
this.rules.commentText[0].required = false;
this.$refs.formTongGuo.clearValidate('commentText')
if (this.formTongGuo.approvalOpinion === 0) {
this.rules.commentText[0].required = false;
this.$refs.formTongGuo.clearValidate('commentText')
}else {
this.rules.commentText[0].required = true;
}
@@ -1055,11 +1054,12 @@
this.handleSubmit()
},
handle2(){
this.formTongGuo.approvalOpinion = 0
this.handleSubmit()
this.formTongGuo.approvalOpinion = 0
this.handleSubmit()
},
handleSubmit() {
const val= this.form.country;
this.getRule()
const val= this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.form.country = val.join(",");