修改未完成

pages/tree/t04-add-relative.vue

@@ -53,15 +53,6 @@
           fieldErrors.name
         }}</text>
 
-        <view class="form-field">
-          <text>人物编号</text>
-          <input
-            v-model="addForm.personNo"
-            maxlength="40"
-            placeholder="不填则由服务端生成"
-            placeholder-class="form-placeholder"
-          />
-        </view>
         <picker
           :range="sexOptions.map((item) => item.label)"
           :value="optionIndex(sexOptions, addForm.sex)"
@@ -154,27 +145,6 @@
           />
           <text v-else>首位成员固定为 1</text>
         </view>
-        <picker
-          :range="personOptionLabels"
-          :value="personOptionIndex(addForm.fatherId)"
-          @change="selectPerson('fatherId', $event)"
-        >
-          <view class="form-field form-field--picker"
-            ><text>父亲</text
-            ><text>{{ personOptionLabel(addForm.fatherId) }}</text></view
-          >
-        </picker>
-        <picker
-          :range="personOptionLabels"
-          :value="personOptionIndex(addForm.motherId)"
-          @change="selectPerson('motherId', $event)"
-        >
-          <view class="form-field form-field--picker"
-            ><text>母亲</text
-            ><text>{{ personOptionLabel(addForm.motherId) }}</text></view
-          >
-        </picker>
-
         <picker
           mode="date"
           :value="addForm.birthDate"
@@ -208,6 +178,7 @@
         </view>
 
         <picker
+          v-if="isDeceased"
           mode="date"
           :value="addForm.deathDate"
           @change="selectDeathDate"
@@ -218,6 +189,7 @@
           </view>
         </picker>
         <picker
+          v-if="isDeceased"
           :range="lunarOptions.map((item) => item.label)"
           :value="optionIndex(lunarOptions, addForm.deathLunar)"
           @change="selectOption('deathLunar', lunarOptions, $event)"
@@ -229,7 +201,7 @@
             }}</text>
           </view>
         </picker>
-        <view class="form-field">
+        <view v-if="isDeceased" class="form-field">
           <text>逝世地</text>
           <input
             v-model="addForm.deathPlace"
@@ -238,7 +210,7 @@
             placeholder-class="form-placeholder"
           />
         </view>
-        <view class="form-field">
+        <view v-if="isDeceased" class="form-field">
           <text>安葬地</text>
           <input
             v-model="addForm.burialPlace"
@@ -268,18 +240,6 @@
             placeholder-class="form-placeholder"
           />
         </view>
-        <view class="form-field">
-          <text>关系名称</text>
-          <input
-            v-if="isFirstMember"
-            v-model="addForm.relationName"
-            maxlength="30"
-            placeholder="可选关系显示名称"
-            placeholder-class="form-placeholder"
-          />
-          <text v-else>{{ relationLabel }}</text>
-        </view>
-
         <view class="form-field form-field--summary">
           <text>人物简介</text>
           <textarea
@@ -372,7 +332,6 @@ const discardDialogVisible = ref(false);
 const currentMember = ref(null);
 const errorMessage = ref("");
 const addRequestController = createRequestController();
-const personOptionsRequestController = createRequestController();
 let loadSequence = 0;
 
 const relationIntents = Object.freeze({
@@ -408,23 +367,15 @@ 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(() =>
-  personOptions.value.map((item) => item.label),
-);
 const addForm = reactive({
   bindingMode: "NONE",
-  personNo: "",
   name: "",
   relation: "",
   aliasName: "",
   sex: "",
   generation: "",
   generationName: "",
-  fatherId: "",
-  motherId: "",
   avatarOssId: "",
   birthDate: "",
   birthLunar: "",
@@ -437,11 +388,11 @@ const addForm = reactive({
   biography: "",
   remark: "",
   sortOrder: "",
-  relationName: "",
 });
 const fieldErrors = reactive({ name: "", relation: "", bindingMode: "" });
 
 const isFirstMember = computed(() => mode.value === "first");
+const isDeceased = computed(() => addForm.personStatus === "1");
 const activeRelationIntent = computed(
   () => relationIntents[relationType.value] || null,
 );
@@ -524,27 +475,6 @@ const loadCurrentMember = async () => {
     errorMessage.value = error?.message || "当前成员暂不可用。";
   }
 };
-const loadPersonOptions = async () => {
-  try {
-    const rows = await appApi.getLineagePersonOptions(genealogyId.value, {
-      requestController: personOptionsRequestController,
-    });
-    const options = rows
-      .map((item) => {
-        const value = String(item?.personId ?? item?.id ?? "");
-        if (!/^[1-9]\d*$/.test(value)) return null;
-        const name = String(
-          item?.name || item?.personName || item?.personNo || "未命名人物",
-        );
-        return { value, label: `${name}（${value}）` };
-      })
-      .filter(Boolean);
-    personOptions.value = [{ label: "不选择", value: "" }, ...options];
-  } catch (error) {
-    if (!isRequestCancelled(error))
-      personOptions.value = [{ label: "暂无可选人物", value: "" }];
-  }
-};
 onLoad((query) => {
   genealogyId.value = String(query.genealogyId || "");
   personId.value = String(query.personId || "");
@@ -567,7 +497,6 @@ onLoad((query) => {
   if (activeRelationIntent.value) {
     addForm.relation = activeRelationIntent.value.label;
   }
-  void loadPersonOptions();
   if (isFirstMember.value) {
     addState.value = "form";
     return;
@@ -577,7 +506,6 @@ onLoad((query) => {
 onUnload(() => {
   loadSequence += 1;
   addRequestController.abort();
-  personOptionsRequestController.abort();
   discardConfirmation.dispose();
 });
 
@@ -609,22 +537,20 @@ const optionLabel = (options, value) =>
   options.find((item) => item.value === value)?.label || "";
 const selectOption = (field, options, event) => {
   addForm[field] = options[Number(event.detail.value)]?.value || "";
+  if (field === "personStatus" && addForm.personStatus !== "1") {
+    Object.assign(addForm, {
+      deathDate: "",
+      deathLunar: "",
+      deathPlace: "",
+      burialPlace: "",
+    });
+  }
 };
 const selectBindingMode = (event) => {
   addForm.bindingMode =
     bindingModeOptions[Number(event.detail.value)]?.value || "NONE";
   fieldErrors.bindingMode = "";
 };
-const personOptionIndex = (value) =>
-  Math.max(
-    0,
-    personOptions.value.findIndex((item) => item.value === value),
-  );
-const personOptionLabel = (value) =>
-  personOptions.value.find((item) => item.value === value)?.label || "不选择";
-const selectPerson = (field, event) => {
-  addForm[field] = personOptions.value[Number(event.detail.value)]?.value || "";
-};
 const uploadAvatar = async () => {
   if (isAvatarUploading.value || isSubmitting.value) return;
   isAvatarUploading.value = true;
@@ -665,13 +591,10 @@ const submitAdd = async () => {
   try {
     const payload = {
       bindingMode: addForm.bindingMode,
-      personNo: addForm.personNo,
       name: addForm.name,
       aliasName: addForm.aliasName,
       sex: addForm.sex,
       generationName: addForm.generationName,
-      fatherId: addForm.fatherId,
-      motherId: addForm.motherId,
       avatarOssId: addForm.avatarOssId,
       birthDate: addForm.birthDate,
       birthLunar: addForm.birthLunar,
@@ -685,12 +608,14 @@ const submitAdd = async () => {
       remark: addForm.remark,
       sortOrder: addForm.sortOrder,
       ...(isFirstMember.value
-        ? { generation: 1, relationName: addForm.relationName }
+        ? { generation: 1 }
         : {
             ...(addForm.generation
               ? { generation: Number(addForm.generation) }
               : {}),
-            relationName: relationLabel.value,
+            ...(relationType.value === "SPOUSE"
+              ? { relationName: relationLabel.value }
+              : {}),
           }),
     };
     if (isFirstMember.value) {
@@ -711,15 +636,12 @@ const submitAdd = async () => {
     }
     Object.assign(addForm, {
       bindingMode: "NONE",
-      personNo: "",
       name: "",
       relation: "",
       aliasName: "",
       sex: "",
       generation: "",
       generationName: "",
-      fatherId: "",
-      motherId: "",
       avatarOssId: "",
       birthDate: "",
       birthLunar: "",
@@ -732,7 +654,6 @@ const submitAdd = async () => {
       biography: "",
       remark: "",
       sortOrder: "",
-      relationName: "",
     });
     avatarFileName.value = "";
     await returnTo("T01", { genealogyId: genealogyId.value });