修复前后端显示异常问题(受试者、中心、负责人、日期等)
This commit is contained in:
@@ -33,12 +33,12 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="计划日期" width="140">
|
||||
<template #default="scope">
|
||||
{{ scope.row.planned_date || "—" }}
|
||||
{{ displayDate(scope.row.planned_date) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实际日期" width="140">
|
||||
<template #default="scope">
|
||||
{{ scope.row.actual_date || "—" }}
|
||||
{{ displayDate(scope.row.actual_date) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" width="140">
|
||||
@@ -63,20 +63,18 @@
|
||||
:milestone="editingMilestone"
|
||||
:sites="sites"
|
||||
:members="members"
|
||||
:users="users"
|
||||
@success="loadMilestones"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref } from "vue";
|
||||
import { computed, onMounted, ref } from "vue";
|
||||
import { useRouter } from "vue-router";
|
||||
import { ElMessage } from "element-plus";
|
||||
import { fetchMilestones } from "../api/milestones";
|
||||
import { fetchSites } from "../api/sites";
|
||||
import { listMembers } from "../api/members";
|
||||
import { fetchUsers } from "../api/users";
|
||||
import { useStudyStore } from "../store/study";
|
||||
import PermissionAction from "../components/PermissionAction.vue";
|
||||
import MilestoneForm from "../components/MilestoneForm.vue";
|
||||
@@ -85,6 +83,7 @@ import {
|
||||
getMilestoneStatusLabel,
|
||||
getMilestoneTypeLabel,
|
||||
} from "../dictionaries/milestone.dict";
|
||||
import { displayDate, displayUser } from "../utils/display";
|
||||
|
||||
const study = useStudyStore();
|
||||
const router = useRouter();
|
||||
@@ -92,7 +91,6 @@ const router = useRouter();
|
||||
const milestones = ref<any[]>([]);
|
||||
const sites = ref<any[]>([]);
|
||||
const members = ref<any[]>([]);
|
||||
const users = ref<any[]>([]);
|
||||
const loading = ref(false);
|
||||
const showForm = ref(false);
|
||||
const editingMilestone = ref<any | null>(null);
|
||||
@@ -130,15 +128,6 @@ const loadMembers = async () => {
|
||||
}
|
||||
};
|
||||
|
||||
const loadUsers = async () => {
|
||||
try {
|
||||
const { data } = await fetchUsers({ limit: 500 });
|
||||
users.value = (data as any).items || data || [];
|
||||
} catch {
|
||||
users.value = [];
|
||||
}
|
||||
};
|
||||
|
||||
const openCreate = () => {
|
||||
editingMilestone.value = null;
|
||||
showForm.value = true;
|
||||
@@ -153,24 +142,34 @@ onMounted(() => {
|
||||
loadMilestones();
|
||||
loadSites();
|
||||
loadMembers();
|
||||
loadUsers();
|
||||
});
|
||||
|
||||
const typeLabel = (v: string) => getMilestoneTypeLabel(v);
|
||||
const statusLabel = (v: string) => getMilestoneStatusLabel(v);
|
||||
const statusColor = (v: string) => getMilestoneStatusColor(v);
|
||||
|
||||
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;
|
||||
return acc;
|
||||
}, {})
|
||||
);
|
||||
|
||||
const siteName = (row: any) => {
|
||||
if (row?.site?.name) return row.site.name;
|
||||
const id = row?.site_id || row?.center_id;
|
||||
const name = id ? sites.value.find((s: any) => s.id === id)?.name : row?.site_name;
|
||||
return name || "—";
|
||||
};
|
||||
|
||||
const ownerName = (ownerId: string) => {
|
||||
if (!ownerId) return "未指定";
|
||||
const member = members.value.find((m: any) => m.user_id === ownerId);
|
||||
const user = users.value.find((u: any) => u.id === ownerId);
|
||||
return user?.username || member?.username || ownerId || "未指定";
|
||||
const fromPayload = milestones.value.find((m) => m.owner_id === ownerId)?.owner;
|
||||
return (
|
||||
fromPayload?.display_name ||
|
||||
fromPayload?.username ||
|
||||
displayUser(ownerId, { members: memberMap.value })
|
||||
);
|
||||
};
|
||||
|
||||
const goDetail = (row: any) => {
|
||||
|
||||
Reference in New Issue
Block a user