修改未完成

2026-07-29 18:15:59 +08:00
parent 6fbcf21024
commit 8c2355a52c
59 changed files with 7995 additions and 1118 deletions
@@ -158,69 +158,59 @@ const trailIndex = ref(-1);
 const memberRequestController = createRequestController();
 let loadSequence = 0;

-const details = computed(() =>
-  member.value
-    ? [
-        { label: "别名", value: member.value.aliasName },
-        { label: "字辈", value: member.value.generationName },
-        { label: "性别（字典值）", value: member.value.sex },
-        { label: "人物状态（字典值）", value: member.value.personStatus },
-        {
-          label: "出生日期",
-          value:
-            member.value.status === "forbidden"
-              ? "按权限隐藏"
-              : member.value.birthDate,
-        },
-        {
-          label: "出生农历",
-          value:
-            member.value.status === "forbidden"
-              ? "按权限隐藏"
-              : member.value.birthLunar,
-        },
-        { label: "生卒信息", value: member.value.years },
-        {
-          label: "出生地",
-          value:
-            member.value.status === "forbidden"
-              ? "按权限隐藏"
-              : member.value.birthplace,
-        },
-        {
-          label: "逝世农历",
-          value:
-            member.value.status === "forbidden"
-              ? "按权限隐藏"
-              : member.value.deathLunar,
-        },
-        {
-          label: "逝世地",
-          value:
-            member.value.status === "forbidden"
-              ? "按权限隐藏"
-              : member.value.deathPlace,
-        },
-        {
-          label: "安葬地",
-          value:
-            member.value.status === "forbidden"
-              ? "按权限隐藏"
-              : member.value.burialPlace,
-        },
-        { label: "配偶", value: member.value.spouseNames },
-        { label: "所属支系", value: member.value.branch },
-        {
-          label: "生平",
-          value:
-            member.value.status === "forbidden"
-              ? "按权限隐藏"
-              : member.value.biography,
-        },
-        { label: "备注", value: member.value.remark },
-      ]
-    : [],
-);
+const dictionaryLabel = (value, labels) => labels[String(value || "")] || "";
+const isDeceased = computed(() => member.value?.personStatus === "1");
+const details = computed(() => {
+  if (!member.value) return [];
+  const protectedValue = (value) =>
+    member.value.status === "forbidden" ? "按权限隐藏" : value;
+  return [
+    { label: "别名", value: member.value.aliasName },
+    { label: "字辈", value: member.value.generationName },
+    {
+      label: "性别",
+      value: dictionaryLabel(member.value.sex, {
+        0: "男",
+        1: "女",
+        2: "未知",
+      }),
+    },
+    {
+      label: "人物状态",
+      value: dictionaryLabel(member.value.personStatus, {
+        0: "健在",
+        1: "已故",
+        2: "未知",
+      }),
+    },
+    { label: "出生日期", value: protectedValue(member.value.birthDate) },
+    {
+      label: "出生农历",
+      value: protectedValue(
+        dictionaryLabel(member.value.birthLunar, { 0: "否", 1: "是" }),
+      ),
+    },
+    { label: "生卒信息", value: member.value.years },
+    { label: "出生地", value: protectedValue(member.value.birthplace) },
+    ...(isDeceased.value
+      ? [
+          { label: "逝世日期", value: protectedValue(member.value.deathDate) },
+          {
+            label: "逝世农历",
+            value: protectedValue(
+              dictionaryLabel(member.value.deathLunar, { 0: "否", 1: "是" }),
+            ),
+          },
+          { label: "逝世地", value: protectedValue(member.value.deathPlace) },
+          { label: "安葬地", value: protectedValue(member.value.burialPlace) },
+        ]
+      : []),
+    { label: "配偶", value: member.value.spouseNames },
+    { label: "所属支系", value: member.value.branch },
+    { label: "生平", value: protectedValue(member.value.biography) },
+    { label: "备注", value: member.value.remark },
+  ];
+});
 const canPreviewEdit = computed(() => memberState.value === "detail");
 const restrictedCopy = computed(() =>
  member.value?.status === "forbidden"
@@ -377,6 +367,14 @@ onShow(() => {
  const result = consumeNavigationResult("T03");
  if (result?.operation === "member-open-requested" && result.entityId) {
    void openRelative(result.entityId);
+    return;
+  }
+  if (
+    result?.operation === "member-updated" &&
+    result.refresh &&
+    result.entityId === String(personId.value)
+  ) {
+    void loadMember(result.entityId, { preserveCurrent: true });
  }
 });