|
@ -9,11 +9,7 @@ |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item label="角色"> |
|
|
<el-form-item label="角色"> |
|
|
<el-select v-model="search.roleSid" clearable placeholder="请选择"> |
|
|
<el-select v-model="search.roleSid" clearable placeholder="请选择"> |
|
|
<el-option v-for="(item,i) in roleListAll" |
|
|
<el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option> |
|
|
:key="i" |
|
|
|
|
|
:label="item.name" |
|
|
|
|
|
:value="item.sid" |
|
|
|
|
|
></el-option> |
|
|
|
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-button @click="getOrgUserList(1)">查询</el-button> |
|
|
<el-button @click="getOrgUserList(1)">查询</el-button> |
|
@ -47,20 +43,26 @@ |
|
|
<el-table-column prop="name" label="姓名" width="120px" align="center"></el-table-column> |
|
|
<el-table-column prop="name" label="姓名" width="120px" align="center"></el-table-column> |
|
|
<el-table-column prop="departmentName" label="部门" align="center"></el-table-column> |
|
|
<el-table-column prop="departmentName" label="部门" align="center"></el-table-column> |
|
|
<el-table-column prop="postName" label="岗位" align="center"></el-table-column> |
|
|
<el-table-column prop="postName" label="岗位" align="center"></el-table-column> |
|
|
|
|
|
<el-table-column prop="isEnable" label="是否可用" align="center"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<el-switch |
|
|
|
|
|
v-model="scope.row.isEnable" |
|
|
|
|
|
active-value='1' |
|
|
|
|
|
inactive-value='0' |
|
|
|
|
|
active-color="#13ce66" |
|
|
|
|
|
inactive-color="#ff4949" |
|
|
|
|
|
@change="enabledChange($event,scope.row)"> |
|
|
|
|
|
</el-switch> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
</el-table> |
|
|
</el-table> |
|
|
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/> |
|
|
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/> |
|
|
<!-- 角色设置 --> |
|
|
<!-- 角色设置 --> |
|
|
<el-dialog title="设置角色" :visible.sync="roleDialog" width="30%"> |
|
|
<el-dialog title="设置角色" :visible.sync="roleDialog" width="30%"> |
|
|
<el-form :model="roleForm" :rules="rules" ref="roleForm"> |
|
|
<el-form :model="roleForm" :rules="rules" ref="roleForm"> |
|
|
<el-form-item label="角色名称" :label-width="formLabelWidth" prop="roleSid"> |
|
|
<el-form-item label="角色名称" :label-width="formLabelWidth" prop="roleSid"> |
|
|
<el-select v-model="roleForm.roleSid" placeholder="请选择" |
|
|
<el-select v-model="roleForm.roleSid" placeholder="请选择" multiple> |
|
|
multiple |
|
|
<el-option v-for="(item,i) in roleList" :key="i" :label="item.name" :value="item.sid"></el-option> |
|
|
> |
|
|
|
|
|
<el-option v-for="(item,i) in roleList" |
|
|
|
|
|
:key="i" |
|
|
|
|
|
:label="item.name" |
|
|
|
|
|
:value="item.sid" |
|
|
|
|
|
></el-option> |
|
|
|
|
|
</el-select> |
|
|
</el-select> |
|
|
<!--<el-button type="primary" size='mini' @click="toNav('RoleAdminister')" style="margin-left: 10px;" circle icon="el-icon-plus"></el-button>--> |
|
|
<!--<el-button type="primary" size='mini' @click="toNav('RoleAdminister')" style="margin-left: 10px;" circle icon="el-icon-plus"></el-button>--> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
@ -107,11 +109,7 @@ |
|
|
<td>用户类型</td> |
|
|
<td>用户类型</td> |
|
|
<td> |
|
|
<td> |
|
|
<el-select v-model="form.userTypeKey" @change="$forceUpdate()" style="width:300px"> |
|
|
<el-select v-model="form.userTypeKey" @change="$forceUpdate()" style="width:300px"> |
|
|
<el-option |
|
|
<el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value"> |
|
|
v-for="(item, i) in userTypeData" |
|
|
|
|
|
:key="i" |
|
|
|
|
|
:label="item.name" |
|
|
|
|
|
:value="item.value"> |
|
|
|
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</td> |
|
|
</td> |
|
@ -121,11 +119,7 @@ |
|
|
<td> |
|
|
<td> |
|
|
<el-select v-model="form.deptSid" placeholder="请选择" @change="$forceUpdate()" style="width:300px"> |
|
|
<el-select v-model="form.deptSid" placeholder="请选择" @change="$forceUpdate()" style="width:300px"> |
|
|
<el-option hidden :key="form.deptSid" :label="orgName" :value="form.deptSid"></el-option> |
|
|
<el-option hidden :key="form.deptSid" :label="orgName" :value="form.deptSid"></el-option> |
|
|
<el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid" |
|
|
<el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid" :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true' :props="defaultProps" @check-change="checkchange"> |
|
|
:default-checked-keys="checkedId" |
|
|
|
|
|
:default-expand-all='true' :check-strictly='true' |
|
|
|
|
|
:props="defaultProps" @check-change="checkchange" |
|
|
|
|
|
> |
|
|
|
|
|
</el-tree> |
|
|
</el-tree> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</td> |
|
|
</td> |
|
@ -134,12 +128,7 @@ |
|
|
<td>岗位</td> |
|
|
<td>岗位</td> |
|
|
<td> |
|
|
<td> |
|
|
<el-select v-model="form.postSid" @change="$forceUpdate()" style="width:300px"> |
|
|
<el-select v-model="form.postSid" @change="$forceUpdate()" style="width:300px"> |
|
|
<el-option |
|
|
<el-option v-for="(item, i) in postSidData" :key="i" :label="item.name" :value="item.sid"></el-option> |
|
|
v-for="(item, i) in postSidData" |
|
|
|
|
|
:key="i" |
|
|
|
|
|
:label="item.name" |
|
|
|
|
|
:value="item.sid"> |
|
|
|
|
|
</el-option> |
|
|
|
|
|
</el-select> |
|
|
</el-select> |
|
|
<!--<el-input v-model="form.postSid"></el-input>--> |
|
|
<!--<el-input v-model="form.postSid"></el-input>--> |
|
|
</td> |
|
|
</td> |
|
@ -178,9 +167,9 @@ |
|
|
postList, |
|
|
postList, |
|
|
saveOrgRole, |
|
|
saveOrgRole, |
|
|
roleList, |
|
|
roleList, |
|
|
|
|
|
setRoleEnable, |
|
|
userUpdata |
|
|
userUpdata |
|
|
} from '@/api/system/userManage/index.js' |
|
|
} from '@/api/system/userManage/index.js' |
|
|
import {saveSourcesInfo} from "@/api/system/sources"; |
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
data() { |
|
|
data() { |
|
@ -210,18 +199,18 @@ |
|
|
roleListAll: [], |
|
|
roleListAll: [], |
|
|
search: { |
|
|
search: { |
|
|
userName: '', |
|
|
userName: '', |
|
|
roleSid: '', |
|
|
roleSid: '' |
|
|
}, |
|
|
}, |
|
|
props: { |
|
|
props: { |
|
|
value: "sid", |
|
|
value: 'sid', |
|
|
label: "name", |
|
|
label: 'name', |
|
|
children: "orgDepartmentVoList" |
|
|
children: 'orgDepartmentVoList' |
|
|
}, |
|
|
}, |
|
|
treedata: null, |
|
|
treedata: null, |
|
|
page: { |
|
|
page: { |
|
|
total: 0, // 默认数据总数 |
|
|
total: 0, // 默认数据总数 |
|
|
current: 1, // 默认开始页面 |
|
|
current: 1, // 默认开始页面 |
|
|
size: 10, // 每页的数据条数 |
|
|
size: 10 // 每页的数据条数 |
|
|
}, |
|
|
}, |
|
|
userTable: [], |
|
|
userTable: [], |
|
|
clientTable: [], |
|
|
clientTable: [], |
|
@ -230,8 +219,8 @@ |
|
|
roleDialog: false, |
|
|
roleDialog: false, |
|
|
roleList: [], |
|
|
roleList: [], |
|
|
roleForm: { |
|
|
roleForm: { |
|
|
roleSid: "", |
|
|
roleSid: '', |
|
|
userSid: "" |
|
|
userSid: '' |
|
|
}, |
|
|
}, |
|
|
// 部门 |
|
|
// 部门 |
|
|
bm_Dialog: false, |
|
|
bm_Dialog: false, |
|
@ -239,14 +228,10 @@ |
|
|
bm_Form: { departmentSid: '' }, |
|
|
bm_Form: { departmentSid: '' }, |
|
|
bm_List: [], |
|
|
bm_List: [], |
|
|
rules: { |
|
|
rules: { |
|
|
roleSid: [ |
|
|
roleSid: [{ required: true, message: '请选择角色名称', trigger: 'blur' }], |
|
|
{required: true, message: '请选择角色名称', trigger: 'blur'} |
|
|
departmentSid: [{ required: true, message: '请选择部门名称', trigger: 'blur' }] |
|
|
], |
|
|
} |
|
|
departmentSid: [ |
|
|
|
|
|
{required: true, message: '请选择部门名称', trigger: 'blur'} |
|
|
|
|
|
], |
|
|
|
|
|
} |
|
|
} |
|
|
}; |
|
|
|
|
|
}, |
|
|
}, |
|
|
props: ['dataObj'], |
|
|
props: ['dataObj'], |
|
|
watch: { |
|
|
watch: { |
|
@ -254,20 +239,19 @@ |
|
|
handler(val) { |
|
|
handler(val) { |
|
|
this.getOrgUserList() |
|
|
this.getOrgUserList() |
|
|
}, |
|
|
}, |
|
|
deep: true, |
|
|
deep: true |
|
|
}, |
|
|
} |
|
|
}, |
|
|
}, |
|
|
mounted() { |
|
|
mounted() { |
|
|
this.getOrgUserList() |
|
|
this.getOrgUserList() |
|
|
this.getRoleList() |
|
|
this.getRoleList() |
|
|
this.getOrgTree() |
|
|
this.getOrgTree() |
|
|
this.getOrgList() |
|
|
this.getOrgList() |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
// 列表 + 初始化 |
|
|
// 列表 + 初始化 |
|
|
getOrgUserList(flag) { |
|
|
getOrgUserList(flag) { |
|
|
if (flag == '1') { |
|
|
if (flag === '1') { |
|
|
this.page.current = 1 |
|
|
this.page.current = 1 |
|
|
} |
|
|
} |
|
|
let params = this.page |
|
|
let params = this.page |
|
@ -280,10 +264,9 @@ |
|
|
getRoleList() { |
|
|
getRoleList() { |
|
|
var param = {} |
|
|
var param = {} |
|
|
roleList(param).then(res => { |
|
|
roleList(param).then(res => { |
|
|
if (res.code == "200") { |
|
|
if (res.code === '200') { |
|
|
this.roleListAll = res.data |
|
|
this.roleListAll = res.data |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
// 分页 |
|
|
// 分页 |
|
@ -304,7 +287,6 @@ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// getOrgTree({organizationSid: this.$store.getters.userInfo.orgSid}).then(res => { |
|
|
// getOrgTree({organizationSid: this.$store.getters.userInfo.orgSid}).then(res => { |
|
|
// let tree = res.data[0].orgDepartmentVoList |
|
|
// let tree = res.data[0].orgDepartmentVoList |
|
|
// treeArr(tree) |
|
|
// treeArr(tree) |
|
@ -320,7 +302,7 @@ |
|
|
setRole(this.roleForm).then(res => { |
|
|
setRole(this.roleForm).then(res => { |
|
|
this.roleList = res.data |
|
|
this.roleList = res.data |
|
|
for (let i = 0; i < res.data.length; i++) { |
|
|
for (let i = 0; i < res.data.length; i++) { |
|
|
if (res.data[i].checked == '0') { |
|
|
if (res.data[i].checked === '0') { |
|
|
this.roleForm.roleSid.push(res.data[i].sid) |
|
|
this.roleForm.roleSid.push(res.data[i].sid) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -333,7 +315,7 @@ |
|
|
if (valid) { |
|
|
if (valid) { |
|
|
this.roleForm.roleSid = this.roleForm.roleSid.toString() |
|
|
this.roleForm.roleSid = this.roleForm.roleSid.toString() |
|
|
saveOrgRole(this.roleForm).then(res => { |
|
|
saveOrgRole(this.roleForm).then(res => { |
|
|
if (res.code == "200") { |
|
|
if (res.code === '200') { |
|
|
this.roleDialog = false |
|
|
this.roleDialog = false |
|
|
this.getOrgUserList() |
|
|
this.getOrgUserList() |
|
|
this.$message({ |
|
|
this.$message({ |
|
@ -343,9 +325,9 @@ |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
return false; |
|
|
return false |
|
|
} |
|
|
} |
|
|
}); |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
// 设置部门 提交 |
|
|
// 设置部门 提交 |
|
|
saveOrg(formName) { |
|
|
saveOrg(formName) { |
|
@ -353,10 +335,10 @@ |
|
|
if (valid) { |
|
|
if (valid) { |
|
|
let params = { // 请求的参数 |
|
|
let params = { // 请求的参数 |
|
|
departmentSid: this.bm_Form.departmentSid[this.bm_Form.departmentSid.length - 1], |
|
|
departmentSid: this.bm_Form.departmentSid[this.bm_Form.departmentSid.length - 1], |
|
|
staffSid: this.bm_Form.staffSid, |
|
|
staffSid: this.bm_Form.staffSid |
|
|
} |
|
|
} |
|
|
saveDepartment(params).then(res => { |
|
|
saveDepartment(params).then(res => { |
|
|
if (res.code == "200") { |
|
|
if (res.code === '200') { |
|
|
this.getOrgUserList() |
|
|
this.getOrgUserList() |
|
|
this.bm_Dialog = false |
|
|
this.bm_Dialog = false |
|
|
this.$message({ |
|
|
this.$message({ |
|
@ -366,7 +348,7 @@ |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
return false; |
|
|
return false |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
@ -374,7 +356,7 @@ |
|
|
save(formName) { |
|
|
save(formName) { |
|
|
this.form.userType = this.form.userTypeKey; |
|
|
this.form.userType = this.form.userTypeKey; |
|
|
userUpdata(this.form).then(res => { |
|
|
userUpdata(this.form).then(res => { |
|
|
if (res.code == "200") { |
|
|
if (res.code === '200') { |
|
|
this.getOrgUserList() |
|
|
this.getOrgUserList() |
|
|
this.bm_Dialog = false |
|
|
this.bm_Dialog = false |
|
|
this.$message({ |
|
|
this.$message({ |
|
@ -383,7 +365,7 @@ |
|
|
}) |
|
|
}) |
|
|
this.editDialog = false |
|
|
this.editDialog = false |
|
|
} |
|
|
} |
|
|
this.reset(); |
|
|
this.reset() |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
initPwd(row) { |
|
|
initPwd(row) { |
|
@ -396,7 +378,7 @@ |
|
|
this.$message({ |
|
|
this.$message({ |
|
|
type: 'success', |
|
|
type: 'success', |
|
|
message: res.msg |
|
|
message: res.msg |
|
|
}); |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
@ -429,7 +411,7 @@ |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
toNav(src) { |
|
|
toNav(src) { |
|
|
this.$router.push("/" + src); |
|
|
this.$router.push('/' + src) |
|
|
}, |
|
|
}, |
|
|
// 获取部门树形 |
|
|
// 获取部门树形 |
|
|
getOrgList(row) { |
|
|
getOrgList(row) { |
|
@ -445,15 +427,14 @@ |
|
|
}, |
|
|
}, |
|
|
checkchange(data, checked, indeterminate) { |
|
|
checkchange(data, checked, indeterminate) { |
|
|
if (checked) { |
|
|
if (checked) { |
|
|
|
|
|
|
|
|
this.form.deptSid = data.sid |
|
|
this.form.deptSid = data.sid |
|
|
this.orgName = data.name |
|
|
this.orgName = data.name |
|
|
let arr = [] |
|
|
let arr = [] |
|
|
arr = [data.sid]; |
|
|
arr = [data.sid] |
|
|
this.$refs.Tree.setCheckedKeys(arr); |
|
|
this.$refs.Tree.setCheckedKeys(arr) |
|
|
this.form.postSid = '' |
|
|
this.form.postSid = '' |
|
|
this.getPost(data.sid) |
|
|
this.getPost(data.sid) |
|
|
return; |
|
|
return |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
getPost(orgSid) { |
|
|
getPost(orgSid) { |
|
@ -468,8 +449,19 @@ |
|
|
reset() { |
|
|
reset() { |
|
|
this.form = {} |
|
|
this.form = {} |
|
|
}, |
|
|
}, |
|
|
|
|
|
enabledChange(value, row) { |
|
|
|
|
|
setRoleEnable({ |
|
|
|
|
|
sid: row.sid, |
|
|
|
|
|
isEnable: value |
|
|
|
|
|
}).then(res => { |
|
|
|
|
|
this.$message({ |
|
|
|
|
|
type: 'success', |
|
|
|
|
|
message: res.msg |
|
|
|
|
|
}); |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
}; |
|
|
|
|
|
</script> |
|
|
</script> |
|
|
|
|
|
|
|
|
<style scoped="scoped"> |
|
|
<style scoped="scoped"> |
|
|