审计日志并入系统管理、规范项目成员获取逻辑

frontend/src/components/CommentList.vue

@@ -30,7 +30,7 @@ import { ElMessage } from "element-plus";
 import { fetchComments, createComment } from "../api/comments";
 import { useStudyStore } from "../store/study";
 import { listMembers } from "../api/members";
-import { displayDateTime, displayUser } from "../utils/display";
+import { displayDateTime, displayUser, getMemberDisplayName } from "../utils/display";
 
 interface Props {
   studyId: string;
@@ -72,8 +72,8 @@ const loadMembers = async () => {
 
 const memberMap = computed(() =>
   members.value.reduce<Record<string, string>>((acc, cur) => {
-    const username = cur?.user?.display_name || cur?.user?.username || cur?.username;
-    if (cur?.user_id) acc[cur.user_id] = username || cur.user_id;
+    const username = getMemberDisplayName(cur);
+    if (cur?.user_id && username) acc[cur.user_id] = username;
     return acc;
   }, {})
 );

frontend/src/components/Layout.vue

@@ -27,6 +27,10 @@
             <el-icon><Suitcase /></el-icon>
             <span>项目管理</span>
           </el-menu-item>
+          <el-menu-item v-if="isAdmin" index="/admin/audit-logs">
+            <el-icon><Document /></el-icon>
+            <span>审计日志</span>
+          </el-menu-item>
         </template>
         
         <template v-if="study.currentStudy">
@@ -77,10 +81,6 @@
             <el-icon><Notebook /></el-icon>
             <span>知识库</span>
           </el-menu-item>
-          <el-menu-item v-if="isAdmin || isPm" index="/study/audit-logs">
-            <el-icon><Document /></el-icon>
-            <span>审计日志</span>
-          </el-menu-item>
         </template>
       </el-menu>
     </el-aside>

frontend/src/components/attachments/AttachmentList.vue

@@ -51,7 +51,7 @@ import { formatFileSize } from "./attachmentUtils";
 import { useAuthStore } from "../../store/auth";
 import { useStudyStore } from "../../store/study";
 import { listMembers } from "../../api/members";
-import { displayDateTime, displayUser } from "../../utils/display";
+import { displayDateTime, displayUser, getMemberDisplayName, getUserDisplayName } from "../../utils/display";
 
 const props = defineProps<{
   studyId: string;
@@ -90,12 +90,12 @@ const loadMembers = async () => {
 
 const uploaderLabel = (row: any) => {
   const memberMap = members.value.reduce<Record<string, string>>((acc, cur) => {
-    const username = cur?.user?.display_name || cur?.user?.username || cur?.username;
-    if (cur?.user_id) acc[cur.user_id] = username || cur.user_id;
+    const username = getMemberDisplayName(cur);
+    if (cur?.user_id && username) acc[cur.user_id] = username;
     return acc;
   }, {});
   if (row?.uploaded_by && typeof row.uploaded_by === "object") {
-    return row.uploaded_by.display_name || row.uploaded_by.username || row.uploaded_by.id || "—";
+    return getUserDisplayName(row.uploaded_by) || row.uploaded_by.id || "—";
   }
   return displayUser(row.uploaded_by_id || row.uploaded_by, { members: memberMap });
 };

frontend/src/router/index.ts

@@ -191,12 +191,6 @@ const routes: RouteRecordRaw[] = [
         component: Verification,
         meta: { title: "核查进度", requiresStudy: true },
       },
-      {
-        path: "study/audit-logs",
-        name: "AuditLogs",
-        component: AuditLogs,
-        meta: { title: "审计日志", requiresStudy: true },
-      },
     ],
   },
   {
@@ -234,6 +228,12 @@ const routes: RouteRecordRaw[] = [
         component: AdminSites,
         meta: { title: "中心管理", requiresAdmin: true },
       },
+      {
+        path: "audit-logs",
+        name: "AdminAuditLogs",
+        component: AuditLogs,
+        meta: { title: "审计日志", requiresAdmin: true },
+      },
     ],
   },
   {
@@ -261,6 +261,9 @@ router.beforeEach(async (to, _from, next) => {
       auth.logout();
     }
   }
+  if (token && !studyStore.currentStudy) {
+    await studyStore.ensureDefaultStudy();
+  }
   if (!to.meta.public && !token) {
     next({ path: "/login" });
     return;
@@ -287,6 +290,10 @@ router.beforeEach(async (to, _from, next) => {
     next({ path: "/workbench" });
     return;
   }
+  if (to.path === "/workbench" && studyStore.currentStudy) {
+    next({ path: "/study/home" });
+    return;
+  }
   next();
 });
 

frontend/src/store/study.ts

@@ -1,5 +1,6 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
+import { fetchStudies } from "../api/studies";
 import type { Study } from "../types/api";
 
 const STUDY_KEY = "ctms_current_study";
@@ -32,6 +33,21 @@ export const useStudyStore = defineStore("study", () => {
     currentStudyRole.value = savedRole || null;
   };
 
+  const ensureDefaultStudy = async () => {
+    if (currentStudy.value) return currentStudy.value;
+    try {
+      const { data } = await fetchStudies();
+      const items = (data as any).items || [];
+      if (items.length) {
+        setCurrentStudy(items[0] as Study);
+        return items[0] as Study;
+      }
+    } catch {
+      return null;
+    }
+    return null;
+  };
+
   const clearCurrentStudy = () => {
     currentStudy.value = null;
     currentStudyRole.value = null;
@@ -54,6 +70,7 @@ export const useStudyStore = defineStore("study", () => {
     setCurrentStudy,
     setCurrentStudyRole,
     loadCurrentStudy,
+    ensureDefaultStudy,
     clearCurrentStudy,
   };
 });

frontend/src/utils/display/index.ts

@@ -9,6 +9,23 @@ export const displayEnum = (enumMap: Record<string, string>, value?: string | nu
   return enumMap[value] || displayFallback;
 };
 
+export const getUserDisplayName = (user?: any) => {
+  if (!user) return null;
+  return user.display_name || user.full_name || user.username || user.email || null;
+};
+
+export const getMemberDisplayName = (member?: any) => {
+  if (!member) return null;
+  return (
+    getUserDisplayName(member.user) ||
+    member.display_name ||
+    member.full_name ||
+    member.username ||
+    member.email ||
+    null
+  );
+};
+
 export const displayUser = (
   userId?: string | null,
   opts?: { users?: Record<string, string>; members?: Record<string, string> }

frontend/src/utils/permission.ts

@@ -3,7 +3,7 @@ import { useAuthStore } from "../store/auth";
 import { useStudyStore } from "../store/study";
 
 const PERMISSIONS: Record<string, string[]> = {
-  "milestone.create": ["ADMIN", "PM"],
+  "milestone.create": ["ADMIN", "PM", "CRA", "PV", "IMP"],
   "subject.create": ["ADMIN", "PM", "CRA"],
   "subject.enroll": ["ADMIN", "PM", "CRA"],
   "subject.complete": ["ADMIN", "PM", "CRA"],
@@ -26,7 +26,7 @@ const PERMISSIONS: Record<string, string[]> = {
 };
 
 const REASONS: Record<string, string> = {
-  "milestone.create": "仅项目负责人可以维护里程碑",
+  "milestone.create": "仅项目成员可维护里程碑",
   "subject.enroll": "仅 PM/CRA 可更新受试者状态",
   "subject.complete": "仅 PM/CRA 可更新受试者状态",
   "subject.drop": "仅 PM/CRA 可更新受试者状态",

frontend/src/views/FaqDetail.vue

@@ -117,7 +117,7 @@ import {
   setFaqStatus,
 } from "../api/faqs";
 import { listMembers } from "../api/members";
-import { displayDateTime, displayUser } from "../utils/display";
+import { displayDateTime, displayUser, getMemberDisplayName, getUserDisplayName } from "../utils/display";
 import { useAuthStore } from "../store/auth";
 import { usePermission } from "../utils/permission";
 import FaqItemForm from "../components/FaqItemForm.vue";
@@ -185,16 +185,28 @@ const bestReply = computed(() => {
 
 const memberMap = computed(() =>
   members.value.reduce<Record<string, string>>((acc, cur) => {
-    const username = cur?.user?.display_name || cur?.user?.username || cur?.username;
-    if (cur?.user_id) acc[cur.user_id] = username || cur.user_id;
+    const username = getMemberDisplayName(cur);
+    if (cur?.user_id && username) acc[cur.user_id] = username;
     return acc;
   }, {})
 );
 
 const userMap = computed(() => {
-  if (!auth.user?.id) return {};
-  const name = auth.user.display_name || auth.user.username || auth.user.id;
-  return { [auth.user.id]: name };
+  const map: Record<string, string> = {};
+  if (auth.user?.id) {
+    const name = getUserDisplayName(auth.user) || auth.user.id;
+    map[auth.user.id] = name;
+  }
+  const push = (id?: string | null, name?: string | null) => {
+    if (!id || !name) return;
+    map[id] = name;
+  };
+  push(item.value?.created_by, item.value?.created_by_name || item.value?.created_by_display_name || item.value?.created_by_email);
+  replies.value.forEach((r) => {
+    push(r?.created_by, r?.created_by_name || r?.created_by_display_name || r?.created_by_email);
+    push(r?.quote?.created_by, r?.quote?.created_by_name || r?.quote?.created_by_display_name || r?.quote?.created_by_email);
+  });
+  return map;
 });
 
 const categoryName = computed(() => {

frontend/src/views/MilestoneDetail.vue

@@ -79,7 +79,7 @@ import {
   getMilestoneStatusLabel,
   getMilestoneTypeLabel,
 } from "../dictionaries/milestone.dict";
-import { displayDate, displayUser } from "../utils/display";
+import { displayDate, displayUser, getMemberDisplayName, getUserDisplayName } from "../utils/display";
 
 const route = useRoute();
 const study = useStudyStore();
@@ -134,17 +134,17 @@ const siteName = (row: any) => {
 
 const ownerName = (ownerId: string) => {
   const memberMap = members.value.reduce<Record<string, string>>((acc, cur) => {
-    const username = cur?.user?.display_name || cur?.user?.full_name || cur?.user?.username || cur?.username;
-    if (cur?.user_id) acc[cur.user_id] = username || cur.user_id;
-    if (cur?.id) acc[cur.id] = username || cur.id;
+    const username = getMemberDisplayName(cur);
+    if (cur?.user_id && username) acc[cur.user_id] = username;
+    if (cur?.id && username) acc[cur.id] = username;
     return acc;
   }, {});
   
   const owner = milestone.value?.owner;
-  const nameFromObject = owner?.display_name || owner?.full_name || owner?.username;
+  const nameFromObject = getUserDisplayName(owner);
   if (nameFromObject) return nameFromObject;
   
-  return memberMap[ownerId] || ownerId || "—";
+  return memberMap[ownerId] || "—";
 };
 
 onMounted(async () => {

frontend/src/views/Milestones.vue

@@ -83,7 +83,7 @@ import {
   getMilestoneStatusLabel,
   getMilestoneTypeLabel,
 } from "../dictionaries/milestone.dict";
-import { displayDate, displayUser } from "../utils/display";
+import { displayDate, displayUser, getMemberDisplayName } from "../utils/display";
 
 const study = useStudyStore();
 const router = useRouter();
@@ -150,14 +150,8 @@ const statusColor = (v: string) => getMilestoneStatusColor(v);
 
 const memberMap = computed(() =>
   members.value.reduce<Record<string, string>>((acc, cur) => {
-    const username =
-      cur?.user?.full_name ||
-      cur?.user?.display_name ||
-      cur?.user?.username ||
-      cur?.user?.email ||
-      cur?.username ||
-      cur?.email;
-    if (cur?.user_id) acc[cur.user_id] = username || cur.user_id;
+    const username = getMemberDisplayName(cur);
+    if (cur?.user_id && username) acc[cur.user_id] = username;
     return acc;
   }, {})
 );

frontend/src/views/Verification.vue

@@ -77,7 +77,7 @@ import { useAuthStore } from "../store/auth";
 import VerificationTable from "../components/VerificationTable.vue";
 import SiteSelect from "../components/selectors/SiteSelect.vue";
 import SubjectSelect from "../components/selectors/SubjectSelect.vue";
-import { displayDate } from "../utils/display";
+import { displayDate, getMemberDisplayName } from "../utils/display";
 
 const study = useStudyStore();
 const auth = useAuthStore();
@@ -188,9 +188,9 @@ const subjectMap = computed(() =>
 
 const verifierMap = computed(() =>
   members.value.reduce<Record<string, string>>((acc, cur) => {
-    const username = cur?.user?.display_name || cur?.user?.full_name || cur?.user?.username || cur?.username;
-    if (cur?.user_id) acc[cur.user_id] = username || cur.user_id;
-    if (cur?.id) acc[cur.id] = username || cur.id;
+    const username = getMemberDisplayName(cur);
+    if (cur?.user_id && username) acc[cur.user_id] = username;
+    if (cur?.id && username) acc[cur.id] = username;
     return acc;
   }, {})
 );

frontend/src/views/admin/AuditLogs.vue

@@ -151,13 +151,12 @@ const eventTypeOptions = Object.entries(auditDict).map(([value, cfg]) => ({
 }));
 const userOptions = computed(() => users.value.map((u: any) => ({ label: u.username, value: u.id })));
 const isAdmin = computed(() => auth.user?.role === "ADMIN");
-const canProjectExport = computed(() => !!study.currentStudy && (auth.user?.role === "ADMIN" || auth.user?.role === "PM" || study.currentStudyRole === "PM"));
+const canProjectExport = computed(() => !!study.currentStudy && auth.user?.role === "ADMIN");
 
 const ensureAccess = () => {
   const role = auth.user?.role;
-  const studyRole = study.currentStudyRole;
-  if (!(role === "ADMIN" || role === "PM" || studyRole === "PM")) {
-    router.replace("/study/home");
+  if (role !== "ADMIN") {
+    router.replace("/admin/users");
   }
 };