修改未完成

pages/tree/t05-edit-member.vue

@@ -49,12 +49,7 @@
 
         <view class="form-field">
           <text>人物编号</text>
-          <input
-            v-model="editForm.personNo"
-            maxlength="40"
-            placeholder="不填则由服务端生成"
-            placeholder-class="form-placeholder"
-          />
+          <text>{{ originalMember.personNo || "服务端生成" }}</text>
         </view>
         <picker
           :range="sexOptions.map((item) => item.label)"
@@ -68,7 +63,14 @@
             }}</text>
           </view>
         </picker>
+        <view
+          v-if="editForm.bindingMode === 'SPECIFIED'"
+          class="form-field form-field--picker"
+        >
+          <text>身份认领</text><text>已绑定指定用户</text>
+        </view>
         <picker
+          v-else
           :range="bindingModeOptions.map((item) => item.label)"
           :value="optionIndex(bindingModeOptions, editForm.bindingMode)"
           @change="selectBindingMode"
@@ -183,6 +185,7 @@
           />
         </view>
         <picker
+          v-if="isDeceased"
           mode="date"
           :value="editForm.deathDate"
           @change="selectDate('deathDate', $event)"
@@ -193,6 +196,7 @@
           >
         </picker>
         <picker
+          v-if="isDeceased"
           :range="lunarOptions.map((item) => item.label)"
           :value="optionIndex(lunarOptions, editForm.deathLunar)"
           @change="selectOption('deathLunar', lunarOptions, $event)"
@@ -204,7 +208,7 @@
             }}</text>
           </view>
         </picker>
-        <view class="form-field">
+        <view v-if="isDeceased" class="form-field">
           <text>逝世地</text>
           <input
             v-model="editForm.deathPlace"
@@ -212,7 +216,7 @@
             placeholder-class="form-placeholder"
           />
         </view>
-        <view class="form-field">
+        <view v-if="isDeceased" class="form-field">
           <text>安葬地</text>
           <input
             v-model="editForm.burialPlace"
@@ -242,15 +246,6 @@
             placeholder-class="form-placeholder"
           />
         </view>
-        <view class="form-field">
-          <text>关系名称</text>
-          <input
-            v-model="editForm.relationName"
-            maxlength="30"
-            placeholder="可选关系显示名称"
-            placeholder-class="form-placeholder"
-          />
-        </view>
         <view class="form-field form-field--summary">
           <text>人物简介</text>
           <textarea
@@ -332,7 +327,12 @@ import {
   pickAndUploadImage,
 } from "@/utils/resumable-image-upload.js";
 import { createDiscardConfirmation } from "@/utils/discard-confirmation.js";
-import { goBack, handleBackPress, runBackGuard } from "@/utils/navigation.js";
+import {
+  finishPage,
+  goBack,
+  handleBackPress,
+  runBackGuard,
+} from "@/utils/navigation.js";
 
 const editState = ref("loading");
 const genealogyId = ref("");
@@ -353,7 +353,6 @@ const baseline = ref("");
 const editForm = reactive({
   appUserId: "",
   bindingMode: "NONE",
-  personNo: "",
   name: "",
   aliasName: "",
   sex: "",
@@ -373,7 +372,6 @@ const editForm = reactive({
   summary: "",
   remark: "",
   sortOrder: "",
-  relationName: "",
 });
 const fieldErrors = reactive({ name: "", dates: "", bindingMode: "" });
 const sexOptions = Object.freeze([
@@ -393,7 +391,6 @@ const personStatusOptions = Object.freeze([
 const bindingModeOptions = Object.freeze([
   { label: "不绑定账号", value: "NONE" },
   { label: "绑定当前账号", value: "SELF" },
-  { label: "绑定指定用户", value: "SPECIFIED" },
 ]);
 const personOptions = ref([{ label: "不选择", value: "" }]);
 const personOptionLabels = computed(() =>
@@ -408,6 +405,7 @@ const appUserBindingHint = computed(() => {
     ? "保留当前已认领的指定业务用户"
     : "需先选择指定业务用户；当前没有可用候选接口";
 });
+const isDeceased = computed(() => editForm.personStatus === "1");
 
 const formSnapshot = computed(() => JSON.stringify(editForm));
 const hasValidContext = computed(() =>
@@ -463,11 +461,11 @@ const loadMember = async () => {
     });
     if (activeLoad !== loadSequence) return;
     originalMember.value = member;
+    const deceased = member.personStatus === "1";
     Object.assign(editForm, {
       appUserId: member.appUserId || "",
       bindingMode:
         member.bindingMode || (member.appUserId ? "SPECIFIED" : "NONE"),
-      personNo: member.personNo || "",
       name: member.name,
       aliasName: member.aliasName || "",
       sex: member.sex || "",
@@ -481,15 +479,14 @@ const loadMember = async () => {
       birthDate: datePart(member.birthDate),
       birthLunar: member.birthLunar || "",
       birthPlace: member.birthplace || "",
-      deathDate: datePart(member.deathDate),
-      deathLunar: member.deathLunar || "",
-      deathPlace: member.deathPlace || "",
-      burialPlace: member.burialPlace || "",
+      deathDate: deceased ? datePart(member.deathDate) : "",
+      deathLunar: deceased ? member.deathLunar || "" : "",
+      deathPlace: deceased ? member.deathPlace || "" : "",
+      burialPlace: deceased ? member.burialPlace || "" : "",
       personStatus: member.personStatus || "",
       summary: member.biography || "",
       remark: member.remark || "",
       sortOrder: member.sortOrder ?? "",
-      relationName: member.relationName || "",
     });
     baseline.value = formSnapshot.value;
     errorMessage.value = "";
@@ -567,6 +564,14 @@ const optionLabel = (options, value) =>
   options.find((item) => item.value === value)?.label || "";
 const selectOption = (field, options, event) => {
   editForm[field] = options[Number(event.detail.value)]?.value || "";
+  if (field === "personStatus" && editForm.personStatus !== "1") {
+    Object.assign(editForm, {
+      deathDate: "",
+      deathLunar: "",
+      deathPlace: "",
+      burialPlace: "",
+    });
+  }
 };
 const selectBindingMode = (event) => {
   editForm.bindingMode =
@@ -632,7 +637,6 @@ const saveMember = async () => {
         ...(editForm.bindingMode === "SPECIFIED"
           ? { appUserId: editForm.appUserId }
           : {}),
-        personNo: editForm.personNo,
         name: editForm.name,
         aliasName: editForm.aliasName,
         sex: editForm.sex,
@@ -646,20 +650,34 @@ const saveMember = async () => {
         birthDate: editForm.birthDate,
         birthLunar: editForm.birthLunar,
         birthPlace: editForm.birthPlace,
-        deathDate: editForm.deathDate,
-        deathLunar: editForm.deathLunar,
-        deathPlace: editForm.deathPlace,
-        burialPlace: editForm.burialPlace,
+        ...(isDeceased.value
+          ? {
+              deathDate: editForm.deathDate,
+              deathLunar: editForm.deathLunar,
+              deathPlace: editForm.deathPlace,
+              burialPlace: editForm.burialPlace,
+            }
+          : {}),
         personStatus: editForm.personStatus,
         biography: editForm.summary,
         remark: editForm.remark,
         sortOrder: editForm.sortOrder,
-        relationName: editForm.relationName,
       },
       { requestController: editRequestController },
     );
     baseline.value = formSnapshot.value;
-    await goBack();
+    await finishPage(
+      "T03",
+      {
+        genealogyId: genealogyId.value,
+        personId: personId.value,
+      },
+      {
+        operation: "member-updated",
+        entityId: personId.value,
+        refresh: true,
+      },
+    );
   } catch (error) {
     if (isRequestCancelled(error)) return;
     failedAction.value = "save";