Merge pull request 'fix(filling): 修改用户管理归属部门显示' (#1099) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1099
This commit is contained in:
@@ -75,8 +75,8 @@ const schame = computed(() => {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '归属部门',
|
label: '归属部门',
|
||||||
prop: 'departmentId',
|
prop:!authStore.roles.includes('superAdmin') ?'departmentName': 'departmentId',
|
||||||
component: 'el-tree-select',
|
component: !authStore.roles.includes('superAdmin') ?'el-input':'el-tree-select',
|
||||||
props: {
|
props: {
|
||||||
placeholder: '请选择',
|
placeholder: '请选择',
|
||||||
clearable: true,
|
clearable: true,
|
||||||
@@ -247,6 +247,7 @@ const init = async () => {
|
|||||||
getJobOpt()
|
getJobOpt()
|
||||||
]
|
]
|
||||||
const resAll = await Promise.all(reqList)
|
const resAll = await Promise.all(reqList)
|
||||||
|
console.log('resAll',resAll)
|
||||||
localData.departmentIdOpt = resAll[0].data
|
localData.departmentIdOpt = resAll[0].data
|
||||||
localData.subCompanyIdOpt = resAll[1].data
|
localData.subCompanyIdOpt = resAll[1].data
|
||||||
localData.roleOpt = resAll[2].data
|
localData.roleOpt = resAll[2].data
|
||||||
@@ -257,10 +258,11 @@ const getInfo = async () => {
|
|||||||
if (!route.query.id) return
|
if (!route.query.id) return
|
||||||
// 获取详情数据
|
// 获取详情数据
|
||||||
const {data} = await getUserDetail(route.query.id)
|
const {data} = await getUserDetail(route.query.id)
|
||||||
if (data.subCompanyId) {
|
// if (data.subCompanyId) {
|
||||||
const res = await getDeptOpt({subCompanyId: data.subCompanyId})
|
// const res = await getDeptOpt({subCompanyId: data.subCompanyId})
|
||||||
localData.departmentIdOpt = res.data
|
// console.log('getInfo',res)
|
||||||
}
|
// localData.departmentIdOpt = res.data
|
||||||
|
// }
|
||||||
nextTick(() => {
|
nextTick(() => {
|
||||||
form.value.setValues(data)
|
form.value.setValues(data)
|
||||||
currentRoleArray.value = form.value.getValues().roleIds
|
currentRoleArray.value = form.value.getValues().roleIds
|
||||||
|
|||||||
Reference in New Issue
Block a user