伦理与启动管理-简单优化

frontend/src/components/MilestoneForm.vue

@@ -6,7 +6,17 @@
       </el-form-item>
       <el-form-item label="类型" prop="type">
         <el-select v-model="form.type" placeholder="请选择">
-          <el-option v-for="item in types" :key="item" :label="item" :value="item" />
+          <el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="中心" prop="site_id">
+        <el-select v-model="form.site_id" placeholder="请选择中心" filterable>
+          <el-option v-for="s in sites" :key="s.id" :label="s.name || s.id" :value="s.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="负责人" prop="owner_id">
+        <el-select v-model="form.owner_id" placeholder="请选择负责人" filterable>
+          <el-option v-for="m in memberOptions" :key="m.value" :label="m.label" :value="m.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="计划日期" prop="planned_date">
@@ -17,7 +27,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="form.status" placeholder="请选择">
-          <el-option v-for="item in statuses" :key="item" :label="item" :value="item" />
+          <el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="notes">
@@ -37,10 +47,14 @@ import type { FormInstance, FormRules } from "element-plus";
 import { ElMessage } from "element-plus";
 import { createMilestone, updateMilestone } from "../api/milestones";
 import { useStudyStore } from "../store/study";
+import { milestoneStatusOptions, milestoneTypeOptions } from "../dictionaries/milestone.dict";
 
 interface Props {
   modelValue: boolean;
   milestone?: Record<string, any>;
+  sites?: any[];
+  members?: any[];
+  users?: any[];
 }
 
 const props = defineProps<Props>();
@@ -53,12 +67,14 @@ const visible = computed({
   set: (v: boolean) => emit("update:modelValue", v),
 });
 
-const types = ["ETHICS_SUBMISSION", "ETHICS_APPROVAL", "SIV", "FPI", "LPI", "DBL", "CSR"];
-const statuses = ["NOT_STARTED", "IN_PROGRESS", "DONE", "BLOCKED"];
+const types = milestoneTypeOptions;
+const statuses = milestoneStatusOptions;
 
 const form = reactive({
   name: "",
   type: "",
+  site_id: "",
+  owner_id: "",
   planned_date: "",
   actual_date: "",
   status: "NOT_STARTED",
@@ -68,6 +84,8 @@ const form = reactive({
 const rules: FormRules = {
   name: [{ required: true, message: "请输入名称", trigger: "blur" }],
   type: [{ required: true, message: "请选择类型", trigger: "change" }],
+  site_id: [{ required: true, message: "请选择中心", trigger: "change" }],
+  owner_id: [{ required: true, message: "请选择负责人", trigger: "change" }],
   planned_date: [{ required: true, message: "请选择计划日期", trigger: "change" }],
 };
 
@@ -75,12 +93,32 @@ const submitting = ref(false);
 
 const isEdit = computed(() => !!props.milestone);
 
+const memberOptions = computed(() => {
+  const userMap = (props.users || []).reduce<Record<string, string>>((acc, cur: any) => {
+    if (cur?.id) acc[cur.id] = cur.username || cur.id;
+    return acc;
+  }, {});
+  const memberList = (props.members || []).filter((m: any) => m.is_active !== false);
+  if (memberList.length) {
+    return memberList.map((m: any) => ({
+      value: m.user_id,
+      label: userMap[m.user_id] || m.username || m.user_id,
+    }));
+  }
+  return (props.users || []).map((u: any) => ({
+    value: u.id,
+    label: u.username || u.id,
+  }));
+});
+
 watch(
   () => props.milestone,
   (val) => {
     if (val) {
       form.name = val.name || "";
       form.type = val.type || "";
+      form.site_id = val.site_id || "";
+      form.owner_id = val.owner_id || "";
       form.planned_date = val.planned_date || "";
       form.actual_date = val.actual_date || "";
       form.status = val.status || "NOT_STARTED";
@@ -88,6 +126,8 @@ watch(
     } else {
       form.name = "";
       form.type = "";
+      form.site_id = "";
+      form.owner_id = "";
       form.planned_date = "";
       form.actual_date = "";
       form.status = "NOT_STARTED";
@@ -111,10 +151,14 @@ const onSubmit = async () => {
     }
     submitting.value = true;
     try {
+      const payload = {
+        ...form,
+        actual_date: form.actual_date || null,
+      };
       if (isEdit.value && props.milestone) {
-        await updateMilestone(study.currentStudy.id, props.milestone.id, form);
+        await updateMilestone(study.currentStudy.id, props.milestone.id, payload);
       } else {
-        await createMilestone(study.currentStudy.id, form);
+        await createMilestone(study.currentStudy.id, payload);
       }
       ElMessage.success("提交成功");
       emit("success");