Merge branch 'wyfMain-dev'
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
This commit is contained in:
commit
d13ae03355
@ -917,7 +917,7 @@ const init = async () => {
|
||||
depTreeMyList.value = []
|
||||
crumbs.value = []
|
||||
|
||||
await getDepsTreeMy2()
|
||||
await getDepsTreeMy2(state.chooseMode)
|
||||
if (depTreeMyList.value.length) {
|
||||
if (state.chooseMode === 1) {
|
||||
// 部门选择模式才创建 all 节点
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -37,34 +37,36 @@ export const useGroupTypeStore = createGlobalState(() => {
|
||||
depTreeMyList.value = res.data.nodes
|
||||
}
|
||||
}
|
||||
// userInfo?.value?.ID
|
||||
const getDepsTreeMy2 = async () => {
|
||||
const isHasRes = await userHasPermission({
|
||||
erpUserId: userInfo?.value?.ID,
|
||||
ruleUrl: [
|
||||
"auth_chat_app_create_all_dept",
|
||||
"auth_chat_app_create_limit_dept"
|
||||
]
|
||||
})
|
||||
let pramas = { nowUserId : 0 }
|
||||
if (isHasRes.code === 200) {
|
||||
if (isHasRes.data.auth_chat_app_create_all_dept) {
|
||||
pramas = {
|
||||
nowUserId : 0
|
||||
}
|
||||
} else{
|
||||
if (isHasRes.data.auth_chat_app_create_limit_dept) {
|
||||
pramas = {
|
||||
nowUserId : userInfo?.value?.ID
|
||||
// userInfo?.value?.ID
|
||||
const getDepsTreeMy2 = async (chooseMode) => {
|
||||
let params = { nowUserId: 0 }
|
||||
if (chooseMode === 1) {
|
||||
const isHasRes = await userHasPermission({
|
||||
erpUserId: userInfo?.value?.ID,
|
||||
ruleUrl: [
|
||||
'auth_chat_app_create_all_dept',
|
||||
'auth_chat_app_create_limit_dept',
|
||||
],
|
||||
})
|
||||
if (isHasRes.code === 200) {
|
||||
if (isHasRes.data.auth_chat_app_create_all_dept) {
|
||||
params = {
|
||||
nowUserId: 0,
|
||||
}
|
||||
} else {
|
||||
pramas = {
|
||||
nowUserId : 0
|
||||
if (isHasRes.data.auth_chat_app_create_limit_dept) {
|
||||
params = {
|
||||
nowUserId: userInfo?.value?.ID,
|
||||
}
|
||||
} else {
|
||||
params = {
|
||||
nowUserId: 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const res = await departmentV2TreeAll2(pramas)
|
||||
const res = await departmentV2TreeAll2(params)
|
||||
if (res.status === 0) {
|
||||
depTreeMyList.value = res.data.nodes
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user