From b96ac80417abb11c56ac832c992ac33500c3390f Mon Sep 17 00:00:00 2001 From: weibl Date: Mon, 9 Mar 2026 14:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89projectInfo=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ src/utils/task.ts | 5 ++-- src/views/task/projectDetail/index.vue | 24 ++++++++----------- .../projectList/components/projectList.vue | 1 - 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index f60e1385..66714c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ coverage *.sw? *.tsbuildinfo +package-lock.json +yarn.lock diff --git a/src/utils/task.ts b/src/utils/task.ts index 570b6341..013063cc 100644 --- a/src/utils/task.ts +++ b/src/utils/task.ts @@ -3,6 +3,7 @@ import { useDict } from './useDict'; import { getTagKeyMap } from './enum/node'; import { TASK_CALCULATE_STATUS, TASK_PROCESS_STATUS } from './enum/task'; import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant'; +import { getUserId } from './user'; export const disposeSimType = (demandType: string, simType: string) => { if (demandType && simType) { @@ -173,7 +174,7 @@ export const disposeTaskMembers = (disposeKey: string, row: any) => { // 判断登录用户是否是任务的 仿真负责人 或 仿真执行人 export const isSimManagerOrExecutor = (pMemberList: any[], eMemberList: any[]) => { - const currentUserId = localStorage.getItem('USER_ID') || ''; + const currentUserId = getUserId(); const pMemberIds = getMemberListIds(pMemberList); const eMemberIds = getMemberListIds(eMemberList); const pMemberIdArr = pMemberIds.split(','); @@ -183,7 +184,7 @@ export const isSimManagerOrExecutor = (pMemberList: any[], eMemberList: any[]) = // 判断登录用户是否是任务的 仿真专项代表(项目经理) export const isSimProjectManager = (memberList: any[]) => { - const currentUserId = localStorage.getItem('USER_ID') || ''; + const currentUserId = getUserId(); const pMemberIds = getMemberListIds(memberList); const pMemberIdArr = pMemberIds.split(','); return pMemberIdArr.includes(currentUserId); diff --git a/src/views/task/projectDetail/index.vue b/src/views/task/projectDetail/index.vue index 0b0c8412..e0b795e1 100644 --- a/src/views/task/projectDetail/index.vue +++ b/src/views/task/projectDetail/index.vue @@ -224,22 +224,8 @@ const props = defineProps({ type: String, default: '', }, - projectInfo: { - type: Object, - default: () => ({}), - }, }); -// 当前用户是不是项目经理 -const isMember = ref(false); -watch( - () => props.projectInfo, - (newVal) => { - isMember.value = isSimProjectManager(newVal.memberList); - }, - { immediate: true } -); - const emits = defineEmits(['goBack']); // const router = useRouter(); @@ -412,6 +398,16 @@ const projectInfoLoadCompleteFun = () => { // getProjectListApi(); // } // } + +// 当前用户是不是项目经理 +const isMember = ref(false); +watch( + () => currentProjectInfo.memberList, + (newVal) => { + isMember.value = isSimProjectManager(newVal); + }, + { immediate: true } +);