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

This commit is contained in:
wangyifeng 2025-03-20 19:13:11 +08:00
commit d13ae03355
3 changed files with 545 additions and 659 deletions

View File

@ -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

View File

@ -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
}