From ebb7263223ad83881dd9467edfba075e4b7ba780 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Sat, 6 Dec 2025 14:59:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E9=82=A6=E4=BA=91=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在用户查询接口和页面中添加hasAb98UserId字段用于筛选绑定状态
- 优化用户详情页openid显示逻辑，使用computed属性统一处理
- 移除用户详情页中冗余的关联信息显示
---
 src/api/ab98/user.ts           |  5 +++++
 src/views/user/ab98/detail.vue | 16 +++++++++++-----
 src/views/user/ab98/index.vue  | 11 ++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/api/ab98/user.ts b/src/api/ab98/user.ts
index 48f07b1..2996825 100644
--- a/src/api/ab98/user.ts
+++ b/src/api/ab98/user.ts
@@ -1,5 +1,6 @@
 import { http } from "@/utils/http";
 import { UserBalance } from "./balance";
+import { WxUserDTO } from "../wx/wxUser";
 
 export interface Ab98UserDTO {
   /** 主键ID */
@@ -73,6 +74,8 @@ export interface Ab98UserDetailDTO {
   balanceLimit?: number;
   /** 用户余额实体 */
   userBalanceEntity?: UserBalance;
+  /** 微信用户列表 */
+  wxUserList?: WxUserDTO[];
 }
 
 export interface Ab98UserQuery extends BasePageQuery {
@@ -85,6 +88,8 @@ export interface Ab98UserQuery extends BasePageQuery {
   /** 身份证号码 */
   idnum?: string;
   tagName?: string;
+  /** 绑定汇邦云 false未绑定 true已绑定 null 全部 */
+  hasAb98UserId?: boolean;
 }
 
 export interface AddAb98UserCommand {
diff --git a/src/views/user/ab98/detail.vue b/src/views/user/ab98/detail.vue
index dd7a6bc..d1f2eeb 100644
--- a/src/views/user/ab98/detail.vue
+++ b/src/views/user/ab98/detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, watch } from "vue";
+import { ref, onMounted, watch, computed } from "vue";
 import { useRoute } from "vue-router";
 import { type Ab98UserDetailDTO, getAb98UserDetailApi } from "@/api/ab98/user";
 import { type WxUserDTO, getWxUserDetailApi } from "@/api/wx/wxUser";
@@ -48,6 +48,14 @@ const pagination = ref({
 const orderLoading = ref(false);
 const activeTab = ref('basic');
 
+const openid = computed(() => {
+  if (userType.value === 'ab98') {
+    return (userInfo.value as Ab98UserDetailDTO).wxUserList?.[0]?.openid || '';
+  } else {
+    return (userInfo.value as WxUserDTO).openid || '';
+  }
+});
+
 async function fetchOrders() {
   try {
     orderLoading.value = true;
@@ -235,7 +243,7 @@ async function handleShowAddTagDialog() {
           <template v-if="userType === 'ab98'">
             <el-descriptions class="info-details" :column="2" border>
               <el-descriptions-item label="会员ID">{{ (userInfo as Ab98UserDetailDTO).ab98UserId }}</el-descriptions-item>
-              <el-descriptions-item label="微信openid">{{ userInfo.openid }}</el-descriptions-item>
+              <el-descriptions-item label="微信openid">{{ openid }}</el-descriptions-item>
               <el-descriptions-item label="注册时间" :span="2">{{ userInfo.createTime }}</el-descriptions-item>
               <el-descriptions-item label="借呗额度" :span="2">{{ formatFenToYuan((userInfo as Ab98UserDetailDTO).balanceLimit) }}
                 <el-button type="primary" size="small" @click="handleModifyBalance">
@@ -260,11 +268,9 @@ async function handleShowAddTagDialog() {
           <template v-else>
             <el-descriptions class="info-details" :column="2" border>
               <el-descriptions-item label="微信用户ID">{{ (userInfo as WxUserDTO).wxUserId }}</el-descriptions-item>
-              <el-descriptions-item label="OpenID">{{ (userInfo as WxUserDTO).openid }}</el-descriptions-item>
+              <el-descriptions-item label="OpenID">{{ openid }}</el-descriptions-item>
               <el-descriptions-item label="创建时间" :span="2">{{ userInfo.createTime }}</el-descriptions-item>
               <el-descriptions-item label="微信余额" :span="2">{{ formatFenToYuan((userInfo as WxUserDTO).wxBalance) }}</el-descriptions-item>
-              <el-descriptions-item label="关联ab98用户ID">{{ (userInfo as WxUserDTO).ab98UserId || '未关联' }}</el-descriptions-item>
-              <el-descriptions-item label="关联企业用户ID">{{ (userInfo as WxUserDTO).qyUserId || '未关联' }}</el-descriptions-item>
               <el-descriptions-item label="备注" :span="2">{{ (userInfo as WxUserDTO).remark || '无' }}</el-descriptions-item>
             </el-descriptions>
           </template>
diff --git a/src/views/user/ab98/index.vue b/src/views/user/ab98/index.vue
index 7089926..cf02b47 100644
--- a/src/views/user/ab98/index.vue
+++ b/src/views/user/ab98/index.vue
@@ -29,6 +29,7 @@ const searchFormParams = reactive<Ab98UserQuery & { search?: string }>({
   tel: undefined,
   idnum: undefined,
   tagName: undefined,
+  hasAb98UserId: undefined,
   search: undefined
 });
 
@@ -96,6 +97,7 @@ const handleSearchInput = (value) => {
 const resetForm = formEl => {
   if (!formEl) return;
   formEl.resetFields();
+  searchFormParams.hasAb98UserId = undefined;
   onSearch();
 };
 
@@ -185,10 +187,17 @@ onMounted(() => {
           <el-input v-model="searchFormParams.search" placeholder="请输入姓名/手机号/身份证" clearable class="!w-[300px]"
             @keydown.enter.prevent="onSearch" @change="handleSearchInput" />
         </el-form-item>
-        <el-form-item prop="tagName">
+        <!-- <el-form-item prop="tagName">
           <el-select v-model="searchFormParams.tagName" placeholder="请选择用户标签" clearable class="!w-[160px]">
             <el-option v-for="item in tagOptions" :key="item" :label="item" :value="item" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item prop="hasAb98UserId">
+          <el-select v-model="searchFormParams.hasAb98UserId" placeholder="绑定汇邦云状态" clearable class="!w-[160px]">
+            <el-option label="全部" :value="null" />
+            <el-option label="已绑定" :value="true" />
+            <el-option label="未绑定" :value="false" />
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" :icon="useRenderIcon(Search)" :loading="pageLoading" @click="onSearch">