ow

uniapp/youjiala/src/pages/security/family-person-enquiry.vue

@@ -5,15 +5,15 @@
  * 保留：四条筛选（谱名/常用名/族谱编号 文本包含、性别 单选枚举）、每页 20 条、行点击进详情。
  * 旧页的新增/删除按钮本就被注释禁用，故这里不出新增入口、也不做批量删除，行为对齐。
  *
- * 兼作「族员选择器」：首页 dashboard 详情态的「族员搜索」带 ?channel=person 跳入，
- * 单选回传后调用方按 PersonId 切换当前族员（useAdminPick / useAdminPickTarget 协议）。
+ * 本页不再承担选择器职责：族谱首页的「族员搜索 / 选配偶」已改为调用方内嵌
+ * <admin-pick-popup> 底部弹窗（数据源 composables/usePickerConfigs 的 usePersonPickConfig），
+ * 遗留的 useAdminPickTarget 协议代码已移除，与其他 enquiry 页同构。
  */
 import type { AdminColumn, AdminQuery, AdminRow } from "@/admin/admin-types";
-import { onLoad } from "@dcloudio/uni-app";
 import { useLocale } from "uview-pro";
 import { computed, nextTick, reactive, ref, watch } from "vue";
 import { fillCriteria, makeFilterOption, toSelectOption } from "@/admin/admin-filter";
-import { useAdminList, useAdminPickTarget, useAuthGuard, useThemeGradient, useThemeTokens } from "@/composables";
+import { useAdminList, useAuthGuard, useThemeGradient, useThemeTokens } from "@/composables";
 import { usePolicyOptions } from "@/composables/usePolicyOptions";
 import { FamilyPersonEntity } from "@/data/auto/familyPersonEntity";
 import { FamilyPersonSearchCriteria } from "@/data/auto/familyPersonSearchCriteria";
@@ -24,7 +24,6 @@ import familyPersonService from "@/service/master/familyPersonService";
 
 const { t, currentLocale } = useLocale();
 const { getPolicyOptions, getPolicyText } = usePolicyOptions();
-const pickTarget = useAdminPickTarget();
 
 // 统一风格接线（与族谱首页/媒体/共享页同套）：主题渐变底 + 强调色 CSS 变量下发
 const { themeBackground } = useThemeGradient();
@@ -36,9 +35,6 @@ const themeVars = computed(() => ({
     "--fg-shadow": accentShadow.value,
 }));
 
-/** 选择器模式：带 channel 进来时点行回传而非跳详情 */
-const isPick = ref(false);
-
 const LABEL_KEYS: Record<string, string> = {
     [FamilyPersonEntity.DB_GENEALOGY_NAME]: "FamilyPersonPage.genealogyName",
     [FamilyPersonEntity.DB_COMMON_NAME]: "FamilyPersonPage.commonName",
@@ -133,26 +129,11 @@ function onSearch(): void {
 }
 
 function onRowTap(row: AdminRow): void {
-    if (isPick.value) {
-        if (pickTarget.multiple.value) {
-            return;
-        }
-        pickTarget.deliverOne(row);
-        return;
-    }
     uni.navigateTo({
         url: `${pageUrl("familyPersonOperation")}?id=${row.PersonId}&mode=view`,
     });
 }
 
-function onConfirm(rows: AdminRow[]): void {
-    if (!rows.length) {
-        uni.showToast({ title: t("AdminPage.pickNoneTip"), icon: "none" });
-        return;
-    }
-    pickTarget.deliver(rows);
-}
-
 watch(currentLocale, () => {
     for (const option of bindOptions) {
         const key = LABEL_KEYS[option.BindValue];
@@ -165,11 +146,6 @@ watch(currentLocale, () => {
     }
 });
 
-onLoad((options) => {
-    pickTarget.readOptions(options);
-    isPick.value = String(options?.channel ?? "").trim().length > 0;
-});
-
 useAuthGuard(() => {
     // 每次显示都重拉第一页：详情修改后返回能看到最新数据（navigateBack 不重新挂页面）
     nextTick(() => listRef.value?.refresh());
@@ -179,16 +155,12 @@ useAuthGuard(() => {
 <template>
     <view class="page" :style="[{ background: themeBackground }, themeVars]">
         <admin-list ref="listRef" v-model:keyword="keyword" :nav-title="t('FamilyPersonPage.title')"
-            :show-nav-back="!isPick" :columns="columns" :loader="state.query" :row-key="FamilyPersonEntity.PERSON_ID"
-            title-key="GenealogyName" :selectable="isPick && pickTarget.multiple.value" :filter-count="filterCount"
-            :filter-visible="filterVisible" :filter-items="draft" :search-token="searchToken"
-            :keep-selection-on-reload="isPick" @search="onSearch" @open-filter="state.openFilter()"
-            @close-filter="state.closeFilter()" @apply-filter="state.applyFilter($event)"
-            @clear-filter="state.clearFiltersAndSearch()" @row-tap="onRowTap">
-            <template v-if="isPick" #actions="{ rows }">
-                <u-button type="primary" shape="circle" size="mini" :text="t('AdminPage.pickDoneBut')"
-                    @click="onConfirm(rows)" />
-            </template>
+            :show-nav-back="true" :columns="columns" :loader="state.query" :row-key="FamilyPersonEntity.PERSON_ID"
+            title-key="GenealogyName" :filter-count="filterCount" :filter-visible="filterVisible"
+            :filter-items="draft" :search-token="searchToken" @search="onSearch"
+            @open-filter="state.openFilter()" @close-filter="state.closeFilter()"
+            @apply-filter="state.applyFilter($event)" @clear-filter="state.clearFiltersAndSearch()"
+            @row-tap="onRowTap">
         </admin-list>
     </view>
 </template>

uniapp/youjiala/src/pages/security/family-person-operation.vue

@@ -535,8 +535,8 @@ useAuthGuard(() => {
             </template>
 
             <option-picker :visible="genderPickerVisible" :title="t('FamilyPersonPage.gender')" :items="genderItems"
-                :empty-text="t('FamilyPersonPage.genderEmpty')" @close="genderPickerVisible = false"
-                @confirm="onGenderConfirm" />
+                :empty-text="t('FamilyPersonPage.genderEmpty')" :confirm-text="t('AdminPage.confirmBut')"
+                @close="genderPickerVisible = false" @confirm="onGenderConfirm" />
         </template>
     </admin-form>
 </template>