From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/views/systemManage/userManage/index.vue |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue
index c21b3c1..d530bf6 100644
--- a/src/views/systemManage/userManage/index.vue
+++ b/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

--
Gitblit v1.9.2