|
...
|
...
|
@@ -145,10 +145,10 @@ |
|
|
|
<el-dialog title="权限设置" :visible.sync="roleFormVisible" :close-on-click-modal="false">
|
|
|
|
<el-form :model="roleEditForm" label-width="80px" ref="roleEditForm" >
|
|
|
|
<el-form-item label="ID">
|
|
|
|
<span>{{roleEditForm.userId}}</span>
|
|
|
|
<span>{{roleEditForm.id}}</span>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="账号">
|
|
|
|
<span>{{roleEditForm.username}}</span>
|
|
|
|
<span>{{roleEditForm.loginName}}</span>
|
|
|
|
</el-form-item>
|
|
|
|
<el-tree :data="roles" :props="treeDefaultProps" default-expand-all show-checkbox highlight-current check-strictly node-key="roleId" ref="tree" @check-change="treeHandleCheckChange">
|
|
|
|
</el-tree>
|
|
...
|
...
|
@@ -205,20 +205,26 @@ |
|
|
|
mobile: '',
|
|
|
|
id: '',
|
|
|
|
companyId:'',
|
|
|
|
loginFlag: ''
|
|
|
|
loginFlag: '',
|
|
|
|
officeId: '',
|
|
|
|
createBy: '',
|
|
|
|
updateBy: ''
|
|
|
|
},
|
|
|
|
|
|
|
|
addFormVisible: false,//新增界面是否显示
|
|
|
|
addLoading: false,
|
|
|
|
addFormRules: {
|
|
|
|
username: [
|
|
|
|
{ required: true, message: '请输入姓名,用户名长度在5-11位,支持英文和数字', trigger: 'blur' },
|
|
|
|
loginName: [
|
|
|
|
{ required: true, message: '请输入登录账户名称,用户名长度在5-11位,支持英文和数字', trigger: 'blur' },
|
|
|
|
],
|
|
|
|
password: [
|
|
|
|
{ required: true, message: '请输入密码,用户名长度在6-18位,支持英文和数字和非空字符', trigger: 'blur'}
|
|
|
|
],
|
|
|
|
companyId: [
|
|
|
|
{ required: true, message: '请选择所属您的所属公司', trigger: 'blur' },
|
|
|
|
],
|
|
|
|
name: [
|
|
|
|
{ required: true, message: '请输入姓名', trigger: 'blur' },
|
|
|
|
]
|
|
|
|
},
|
|
|
|
//用户角色配置
|
|
...
|
...
|
@@ -231,11 +237,14 @@ |
|
|
|
address: '',
|
|
|
|
email: '',
|
|
|
|
mobile: '',
|
|
|
|
companyId:''
|
|
|
|
companyId:'',
|
|
|
|
officeId: '',
|
|
|
|
createBy: '',
|
|
|
|
updateBy: ''
|
|
|
|
},
|
|
|
|
roleEditForm: {
|
|
|
|
userId: 1,
|
|
|
|
username: "",
|
|
|
|
id: '',
|
|
|
|
loginName: "",
|
|
|
|
roles: []
|
|
|
|
},
|
|
|
|
roles: [],
|
|
...
|
...
|
@@ -295,7 +304,7 @@ |
|
|
|
}).then(() => {
|
|
|
|
this.listLoading = true;
|
|
|
|
//NProgress.start();
|
|
|
|
let para = { userId: row.id };
|
|
|
|
let para = { id: row.id };
|
|
|
|
removeUser(para).then((res) => {
|
|
|
|
this.listLoading = false;
|
|
|
|
//NProgress.done();
|
|
...
|
...
|
@@ -370,7 +379,10 @@ |
|
|
|
address: '',
|
|
|
|
email: '',
|
|
|
|
mobile: '',
|
|
|
|
companyId:''
|
|
|
|
companyId:'',
|
|
|
|
officeId: '5e95a0f081c64fce9f85d59e18cfdc5f',
|
|
|
|
createBy: JSON.parse(sessionStorage.getItem('user')).id,
|
|
|
|
updateBy: JSON.parse(sessionStorage.getItem('user')).id
|
|
|
|
};
|
|
|
|
},
|
|
|
|
//编辑
|
|
...
|
...
|
@@ -468,7 +480,7 @@ |
|
|
|
roleEditSubmit: function () {
|
|
|
|
this.$confirm('确认提交吗？', '提示', {}).then(() => {
|
|
|
|
// this.editLoading = true;
|
|
|
|
let userId = this.roleEditForm.userId;
|
|
|
|
let userId = this.roleEditForm.id;
|
|
|
|
let roleIds = this.$refs.tree.getCheckedKeys();
|
|
|
|
let para = {userId,roleIds};
|
|
|
|
setUserRole(para).then((res) => {
|
...
|
...
|
|
