From 42d7049318f47be462e7222129c0b3e29a03ccd8 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 29 Oct 2026 18:46:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                            |  2 +-
 .env.dev                        |  2 +-
 src/views/member/user/index.vue | 54 +++++++++++++++++++++++++++++----
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/.env b/.env
index 029b0a2e..a4f3a3ab 100644
--- a/.env
+++ b/.env
@@ -8,7 +8,7 @@ VITE_PORT=80
 VITE_OPEN=true
 
 # 租户开关
-VITE_APP_TENANT_ENABLE=true
+VITE_APP_TENANT_ENABLE=false
 
 # 验证码的开关
 VITE_APP_CAPTCHA_ENABLE=true
diff --git a/.env.dev b/.env.dev
index 2ac4789d..cb56509f 100644
--- a/.env.dev
+++ b/.env.dev
@@ -4,7 +4,7 @@ NODE_ENV=production
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='https://hrf48v5ife.fy.takin.cc'
+VITE_BASE_URL='https://324e01b5211c41c7a8fc9f7854195f30.hn.takin.cc'
 
 VITE_CHAT_URL='http://service.htysapp.com/#/home/chat'
 
diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue
index 8d06468b..20e51718 100644
--- a/src/views/member/user/index.vue
+++ b/src/views/member/user/index.vue
@@ -31,6 +31,51 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item v-if="props.sex === undefined" label="用户性别" prop="sex">
+        <el-select
+          v-model="queryParams.sex"
+          class="!w-240px"
+          clearable
+          placeholder="请选择用户性别"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否禁用" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          class="!w-240px"
+          clearable
+          placeholder="请选择禁用状态"
+        >
+          <el-option label="已禁用" :value="CommonStatusEnum.DISABLE" />
+          <el-option label="未禁用" :value="CommonStatusEnum.ENABLE" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户标签" prop="memberRecentTagList">
+        <el-select
+          v-model="queryParams.memberRecentTagList"
+          class="!w-240px"
+          clearable
+          collapse-tags
+          collapse-tags-tooltip
+          filterable
+          multiple
+          placeholder="请选择用户标签"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.MEMBER_RECENT_TAG)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="注册时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -53,9 +98,6 @@
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
-      <el-form-item v-if="false" label="用户标签" prop="tagIds">
-        <MemberTagSelect v-model="queryParams.tagIds" />
-      </el-form-item>
       <el-form-item v-if="false" label="用户等级" prop="levelId">
         <MemberLevelSelect v-model="queryParams.levelId" />
       </el-form-item>
@@ -220,10 +262,9 @@
 <script lang="ts" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as UserApi from '@/api/member/user'
-import { DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import UserForm from './UserForm.vue'
-import MemberTagSelect from '@/views/member/tag/components/MemberTagSelect.vue'
 import MemberLevelSelect from '@/views/member/level/components/MemberLevelSelect.vue'
 import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect.vue'
 import UserLevelUpdateForm from './components/UserLevelUpdateForm.vue'
@@ -249,9 +290,10 @@ const queryParams = reactive({
   mobile: null,
   userCode: null,
   sex: props.sex ?? null,
+  status: null as number | null,
   loginDate: [],
   createTime: [],
-  tagIds: [],
+  memberRecentTagList: [] as string[],
   levelId: null,
   groupId: null
 })