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

This commit is contained in:
hanshaozhuang
2022-07-15 17:40:33 +08:00
@@ -832,7 +832,21 @@
}
},
props: {},
watch: {},
watch: {
'addForm.esMatingRelations': {
handler: function(val) {
if(val && val !== ''){
if(val.indexOf(",") !== -1){
const list = val.split(",")
const filterList = list.filter(s => s !== 'null');
this.addForm.esMatingRelations = filterList.join(",");
}else if(val === 'null'){
this.addForm.esMatingRelations = "";
}
}
}
},
},
methods: {
workChange (data) {
this.workGroupList = data