|
@@ -22,13 +22,12 @@
|
|
|
</a-form-item>
|
|
</a-form-item>
|
|
|
</a-col>
|
|
</a-col>
|
|
|
<a-col :md="8" :sm="24">
|
|
<a-col :md="8" :sm="24">
|
|
|
- <a-form-item label="身份">
|
|
|
|
|
- <a-select v-model="queryParam.identityType" placeholder="请选择">
|
|
|
|
|
|
|
+ <a-form-item label="角色">
|
|
|
|
|
+ <a-select v-model="queryParam.roleId" placeholder="请选择" allowClear>
|
|
|
<a-select-option
|
|
<a-select-option
|
|
|
- v-for="(item,index) in identityTypeList"
|
|
|
|
|
- :key="index"
|
|
|
|
|
- :label="item.label"
|
|
|
|
|
- :value="parseInt(item.value)">{{ item.label }}
|
|
|
|
|
|
|
+ v-for="item in roleList"
|
|
|
|
|
+ :key="item.roleId"
|
|
|
|
|
+ :value="item.roleId">{{ item.roleName }}
|
|
|
</a-select-option>
|
|
</a-select-option>
|
|
|
</a-select>
|
|
</a-select>
|
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -136,8 +135,6 @@ export default {
|
|
|
treeData: [],
|
|
treeData: [],
|
|
|
expandedKeys: [],
|
|
expandedKeys: [],
|
|
|
autoExpandParent: true,
|
|
autoExpandParent: true,
|
|
|
- identityTypeMap: {},
|
|
|
|
|
- identityTypeList: [],
|
|
|
|
|
jobTypeMap: {},
|
|
jobTypeMap: {},
|
|
|
rightSelectDept: null,
|
|
rightSelectDept: null,
|
|
|
// 查询参数
|
|
// 查询参数
|
|
@@ -234,8 +231,6 @@ export default {
|
|
|
created () {
|
|
created () {
|
|
|
this.tableOption()
|
|
this.tableOption()
|
|
|
this.getRoles()
|
|
this.getRoles()
|
|
|
- this.identityTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SYS_USER_IDENTITY_TYPE)
|
|
|
|
|
- this.identityTypeList = this.DictCache.getChildrenList(this.DictCache.TYPE.SYS_USER_IDENTITY_TYPE)
|
|
|
|
|
this.jobTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SYS_USER_JOB_TYPE)
|
|
this.jobTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SYS_USER_JOB_TYPE)
|
|
|
getDeptTree().then(res => {
|
|
getDeptTree().then(res => {
|
|
|
this.treeData = res.data
|
|
this.treeData = res.data
|