Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

Your Name

2022-05-17 6bb62bb861486fd447f864981e90e9c048472cb8

 src/views/systemManage/userManage/index.vue

@@ -676,6 +676,7 @@
                    idcard:'',
                    email:'',
                    company:'',
                    companyid:'',
                    department:'',
                    job:'',
                    type:'',
@@ -764,6 +765,7 @@
            },
            companyChange(val){
                this.dataForm.company = val.company
                this.dataForm.companyid = val.id
                if (val.ismain === 1) {
                    this.isMain = true;
                }else{
@@ -1028,6 +1030,7 @@
                this.resetDataForm()
                this.dataForm = row
                this.dataForm.password = null
                this.dataForm.companyid = row.companyInfo.id
                this.dialogStatus = 'update'
                this.dialogFormVisible = true
                let ismain = this.companyList.find(item=>item.company === row.company).ismain