修复前后端显示异常问题(受试者、中心、负责人、日期等)
This commit is contained in:
@@ -12,14 +12,18 @@
|
||||
<el-table :data="attachments" v-loading="loading" style="width: 100%">
|
||||
<el-table-column prop="filename" label="文件名" min-width="200" />
|
||||
<el-table-column label="大小" width="120">
|
||||
<template #default="scope">{{ formatFileSize(scope.row.file_size) }}</template>
|
||||
<template #default="scope">{{ formatFileSize(scope.row.file_size ?? scope.row.size) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="上传人" width="180">
|
||||
<template #default="scope">
|
||||
{{ uploaderLabel(scope.row) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="uploaded_at" label="上传时间" width="180" />
|
||||
<el-table-column prop="uploaded_at" label="上传时间" width="180">
|
||||
<template #default="scope">
|
||||
{{ displayDateTime(scope.row.uploaded_at) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="180">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" size="small" @click="download(scope.row)">下载</el-button>
|
||||
@@ -46,8 +50,8 @@ import AttachmentUploader from "./AttachmentUploader.vue";
|
||||
import { formatFileSize } from "./attachmentUtils";
|
||||
import { useAuthStore } from "../../store/auth";
|
||||
import { useStudyStore } from "../../store/study";
|
||||
import { fetchUsers } from "../../api/users";
|
||||
import { listMembers } from "../../api/members";
|
||||
import { displayDateTime, displayUser } from "../../utils/display";
|
||||
|
||||
const props = defineProps<{
|
||||
studyId: string;
|
||||
@@ -59,7 +63,6 @@ const attachments = ref<any[]>([]);
|
||||
const loading = ref(false);
|
||||
const auth = useAuthStore();
|
||||
const study = useStudyStore();
|
||||
const users = ref<any[]>([]);
|
||||
const members = ref<any[]>([]);
|
||||
|
||||
const load = async () => {
|
||||
@@ -75,15 +78,6 @@ const load = async () => {
|
||||
}
|
||||
};
|
||||
|
||||
const loadUsers = async () => {
|
||||
try {
|
||||
const { data } = await fetchUsers({ limit: 500 });
|
||||
users.value = (data as any).items || data || [];
|
||||
} catch {
|
||||
users.value = [];
|
||||
}
|
||||
};
|
||||
|
||||
const loadMembers = async () => {
|
||||
if (!props.studyId) return;
|
||||
try {
|
||||
@@ -95,15 +89,15 @@ const loadMembers = async () => {
|
||||
};
|
||||
|
||||
const uploaderLabel = (row: any) => {
|
||||
const userMap = users.value.reduce<Record<string, string>>((acc, cur) => {
|
||||
if (cur?.id) acc[cur.id] = cur.username || cur.id;
|
||||
return acc;
|
||||
}, {});
|
||||
const memberMap = members.value.reduce<Record<string, string>>((acc, cur) => {
|
||||
if (cur?.user_id) acc[cur.user_id] = cur.username || cur.user_id;
|
||||
const username = cur?.user?.display_name || cur?.user?.username || cur?.username;
|
||||
if (cur?.user_id) acc[cur.user_id] = username || cur.user_id;
|
||||
return acc;
|
||||
}, {});
|
||||
return userMap[row.uploaded_by] || memberMap[row.uploaded_by] || row.uploaded_by || "-";
|
||||
if (row?.uploaded_by && typeof row.uploaded_by === "object") {
|
||||
return row.uploaded_by.display_name || row.uploaded_by.username || row.uploaded_by.id || "—";
|
||||
}
|
||||
return displayUser(row.uploaded_by_id || row.uploaded_by, { members: memberMap });
|
||||
};
|
||||
|
||||
const download = (row: any) => {
|
||||
@@ -116,7 +110,9 @@ const canDelete = (row: any) => {
|
||||
const userId = auth.user?.id;
|
||||
const role = auth.user?.role;
|
||||
const projectRole = study.currentStudyRole || (study.currentStudy as any)?.role_in_study;
|
||||
return userId === row.uploaded_by || role === "ADMIN" || projectRole === "PM";
|
||||
const ownerId =
|
||||
row.uploaded_by_id || (row.uploaded_by && typeof row.uploaded_by === "object" ? row.uploaded_by.id : row.uploaded_by);
|
||||
return userId === ownerId || role === "ADMIN" || projectRole === "PM";
|
||||
};
|
||||
|
||||
const remove = async (row: any) => {
|
||||
@@ -132,7 +128,7 @@ const remove = async (row: any) => {
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
await Promise.all([loadUsers(), loadMembers()]);
|
||||
await Promise.all([loadMembers()]);
|
||||
load();
|
||||
});
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user