From a3ee87d62ccecc2e1e0b4f2f0cb8875a5efa88c8 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 13 五月 2022 14:51:20 +0800
Subject: [PATCH] 用户相关部门
---
src/views/systemManage/userManage/index.vue | 3 +++
src/views/login/register.vue | 2 ++
src/views/contractor/userManage/index.vue | 8 +++++---
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/contractor/userManage/index.vue b/src/views/contractor/userManage/index.vue
index a710a11..c08449a 100644
--- a/src/views/contractor/userManage/index.vue
+++ b/src/views/contractor/userManage/index.vue
@@ -565,7 +565,7 @@
return message
},
parseType(type){
- let typeList = [{id:1,name:'超级管理员'},{id:2,name:'管理员'},{id:3,name:'普通用户'}]
+ let typeList = [{id:2,name:'管理员'},{id:3,name:'普通用户'}]
if(type){
let a = typeList.find(item => item.id === type)
return a.name
@@ -676,6 +676,7 @@
idcard:'',
email:'',
company:'',
+ companyid:'',
department:'',
job:'',
type:'',
@@ -723,7 +724,7 @@
isanalysis: [{ required: true, message: '是否气体检测中心不能为空', trigger: 'change' }]
},
isList:[{id:1,name:'是'},{id:0,name:'否'}],
- typeList:[{id:1,name:'超级管理员'},{id:2,name:'管理员'},{id:3,name:'普通用户'}],
+ typeList:[{id:2,name:'管理员'},{id:3,name:'普通用户'}],
dialogUserRoleFormVisible: false,
userRoleDataForm: {
userRoles: [],
@@ -732,7 +733,6 @@
userRoleDataFormRules: {
userRoles: [{ type: 'array', required: true, message: '角色不能为空', trigger: 'change' }]
},
- typeList:[{id:1,name:'超级管理员'},{id:2,name:'管理员'},{id:3,name:'普通用户'}],
roleList: [],
passwordType: 'password',
confirmPasswordType: 'password',
@@ -764,6 +764,7 @@
},
companyChange(val){
this.dataForm.company = val.company
+ this.dataForm.companyid = val.id
if (val.ismain === 1) {
this.isMain = true;
}else{
@@ -1026,6 +1027,7 @@
showEditHandle: function(row) {
this.resetDataForm()
this.dataForm = row
+ this.dataForm.companyid = row.companyInfo.id
this.dataForm.password = null
this.dialogStatus = 'update'
this.dialogFormVisible = true
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index c3c8547..e781520 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -98,6 +98,7 @@
password:'',
idcard:'',
company:'',
+ companyid:'',
department:'',
job:''
},
@@ -171,6 +172,7 @@
},
companyChange(val){
this.registerForm.company = val.company
+ this.registerForm.companyid = val.id
if (val.ismain === 1) {
this.isMain = true;
}else{
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