feat(admin-user): 增加所属站点展示与筛选
This commit is contained in:
@@ -5,6 +5,9 @@ import type { RealnameStatusValue, RiskStatus, UserStatus } from '@/shared/types
|
||||
|
||||
export interface AdminUserItem {
|
||||
id: number
|
||||
tenant_id: number
|
||||
tenant_code: string
|
||||
tenant_name: string
|
||||
phone: string
|
||||
nickname: string
|
||||
realname_status: RealnameStatusValue
|
||||
@@ -56,6 +59,7 @@ export interface AdminGrowthLevelAdjustPayload {
|
||||
|
||||
export interface AdminUserQuery {
|
||||
keyword?: string
|
||||
tenant_id?: number
|
||||
status?: '' | UserStatus
|
||||
/** has=有免押额度,none=无免押额度,空=全部 */
|
||||
deposit_free_quota?: '' | 'has' | 'none'
|
||||
@@ -68,6 +72,7 @@ export interface AdminUserQuery {
|
||||
export async function fetchAdminUsers(page = 1, pageSize = 20, query: AdminUserQuery = {}) {
|
||||
const params: Record<string, unknown> = { page, page_size: pageSize }
|
||||
if (query.keyword) params.keyword = query.keyword
|
||||
if (query.tenant_id) params.tenant_id = query.tenant_id
|
||||
if (query.status) params.status = query.status
|
||||
if (query.deposit_free_quota) params.deposit_free_quota = query.deposit_free_quota
|
||||
if (query.owner_type) params.owner_type = query.owner_type
|
||||
|
||||
@@ -115,6 +115,14 @@ const paymentPageSize = ref(20)
|
||||
|
||||
const userId = computed(() => props.user?.id || 0)
|
||||
const userPhone = computed(() => props.user?.phone || '')
|
||||
const userSiteLabel = computed(() => {
|
||||
if (!props.user) return ''
|
||||
return (
|
||||
props.user.tenant_name ||
|
||||
props.user.tenant_code ||
|
||||
(props.user.tenant_id ? `站点 #${props.user.tenant_id}` : '未分配站点')
|
||||
)
|
||||
})
|
||||
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
@@ -443,7 +451,9 @@ function goPayments() {
|
||||
:model-value="modelValue"
|
||||
size="78%"
|
||||
destroy-on-close
|
||||
:title="`用户明细 · ${user?.nickname || user?.phone || userId}`"
|
||||
:title="`用户明细 · ${user?.nickname || user?.phone || userId}${
|
||||
userSiteLabel ? ` · ${userSiteLabel}` : ''
|
||||
}`"
|
||||
@update:model-value="(val: boolean) => emit('update:modelValue', val)"
|
||||
>
|
||||
<div v-if="user" class="user-detail">
|
||||
@@ -451,7 +461,7 @@ function goPayments() {
|
||||
<div class="user-detail__identity">
|
||||
<strong>{{ user.nickname || '-' }}</strong>
|
||||
<span>{{ user.phone }}</span>
|
||||
<small>UID: {{ user.id }}</small>
|
||||
<small>{{ userSiteLabel }} · UID: {{ user.id }}</small>
|
||||
</div>
|
||||
<div class="user-detail__metrics">
|
||||
<div>
|
||||
|
||||
@@ -429,6 +429,12 @@ function selectUser(user: AdminUserItem) {
|
||||
selectedUser.value = user
|
||||
}
|
||||
|
||||
function userTenantLabel(user: AdminUserItem) {
|
||||
return (
|
||||
user.tenant_name || user.tenant_code || (user.tenant_id ? `站点 #${user.tenant_id}` : '未分配')
|
||||
)
|
||||
}
|
||||
|
||||
async function submitAction() {
|
||||
if (!listing.value || !actionType.value) return
|
||||
submitting.value = true
|
||||
@@ -979,7 +985,8 @@ async function openScreenshot(url: string) {
|
||||
<strong v-if="selectedUser">{{ selectedUser.nickname || selectedUser.phone }}</strong>
|
||||
<strong v-else>请选择用户</strong>
|
||||
<small v-if="selectedUser"
|
||||
>ID:{{ selectedUser.id }} · {{ selectedUser.phone || '-' }}</small
|
||||
>{{ userTenantLabel(selectedUser) }} · ID:{{ selectedUser.id }} ·
|
||||
{{ selectedUser.phone || '-' }}</small
|
||||
>
|
||||
<small v-else>仅支持正常且已实名用户</small>
|
||||
</div>
|
||||
@@ -990,7 +997,7 @@ async function openScreenshot(url: string) {
|
||||
<el-input
|
||||
v-model="userKeyword"
|
||||
clearable
|
||||
placeholder="输入手机号 / 昵称 / 用户ID 查询"
|
||||
placeholder="输入手机号 / 昵称 / 用户ID / 站点 查询"
|
||||
@keyup.enter="searchUsers"
|
||||
@clear="searchUsers"
|
||||
>
|
||||
@@ -1013,7 +1020,9 @@ async function openScreenshot(url: string) {
|
||||
>
|
||||
<span class="transfer-user-main">
|
||||
<strong>{{ user.nickname || user.phone || `用户${user.id}` }}</strong>
|
||||
<small>{{ user.phone || '-' }} · ID {{ user.id }}</small>
|
||||
<small
|
||||
>{{ userTenantLabel(user) }} · {{ user.phone || '-' }} · ID {{ user.id }}</small
|
||||
>
|
||||
</span>
|
||||
<span class="transfer-user-meta">
|
||||
<el-tag size="small" type="success">{{ userStatusLabel(user.status) }}</el-tag>
|
||||
|
||||
@@ -29,6 +29,31 @@
|
||||
color: #94a3b8;
|
||||
}
|
||||
|
||||
.tenant-cell {
|
||||
display: grid;
|
||||
justify-items: start;
|
||||
gap: 3px;
|
||||
}
|
||||
|
||||
.tenant-cell :deep(.el-tag) {
|
||||
max-width: 120px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.tenant-cell small {
|
||||
color: #94a3b8;
|
||||
font-size: 10px;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.tenant-option-code {
|
||||
float: right;
|
||||
margin-left: 16px;
|
||||
color: #94a3b8;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.balance-available {
|
||||
color: #0f172a;
|
||||
font-variant-numeric: tabular-nums;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { readError } from '@/shared/utils/error'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { Search } from '@element-plus/icons-vue'
|
||||
import { computed, reactive, ref } from 'vue'
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
|
||||
import {
|
||||
adjustAdminUserGrowthLevel,
|
||||
@@ -74,6 +74,7 @@ const walletForm = reactive({
|
||||
|
||||
const filters = reactive<AdminUserQuery>({
|
||||
keyword: '',
|
||||
tenant_id: undefined,
|
||||
status: '',
|
||||
deposit_free_quota: '',
|
||||
owner_type: '',
|
||||
@@ -91,6 +92,30 @@ const {
|
||||
fetchFn: (page, pageSize) => fetchAdminUsers(page, pageSize, filters),
|
||||
})
|
||||
|
||||
const tenantOptions = ref<{ id: number; code: string; name: string }[]>([])
|
||||
|
||||
watch(
|
||||
users,
|
||||
rows => {
|
||||
const byID = new Map(tenantOptions.value.map(item => [item.id, item]))
|
||||
for (const row of rows) {
|
||||
if (row.tenant_id > 0) {
|
||||
byID.set(row.tenant_id, {
|
||||
id: row.tenant_id,
|
||||
code: row.tenant_code,
|
||||
name: row.tenant_name || row.tenant_code || `站点 #${row.tenant_id}`,
|
||||
})
|
||||
}
|
||||
}
|
||||
tenantOptions.value = [...byID.values()].sort((a, b) => a.name.localeCompare(b.name))
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
function userSiteLabel(row: AdminUserItem) {
|
||||
return row.tenant_name || row.tenant_code || (row.tenant_id ? `站点 #${row.tenant_id}` : '未分配')
|
||||
}
|
||||
|
||||
function queryUsers() {
|
||||
currentPage.value = 1
|
||||
void loadUsers()
|
||||
@@ -98,6 +123,7 @@ function queryUsers() {
|
||||
|
||||
function resetFilters() {
|
||||
filters.keyword = ''
|
||||
filters.tenant_id = undefined
|
||||
filters.status = ''
|
||||
filters.deposit_free_quota = ''
|
||||
filters.owner_type = ''
|
||||
@@ -437,12 +463,31 @@ function moneyCent(value: number | string | undefined) {
|
||||
<el-input
|
||||
v-model="filters.keyword"
|
||||
clearable
|
||||
placeholder="手机号 / 昵称 / 用户ID"
|
||||
placeholder="手机号 / 昵称 / 用户ID / 站点"
|
||||
style="width: 220px"
|
||||
@keyup.enter="queryUsers"
|
||||
@clear="queryUsers"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属站点">
|
||||
<el-select
|
||||
v-model="filters.tenant_id"
|
||||
clearable
|
||||
placeholder="全部站点"
|
||||
style="width: 150px"
|
||||
@change="queryUsers"
|
||||
>
|
||||
<el-option
|
||||
v-for="site in tenantOptions"
|
||||
:key="site.id"
|
||||
:label="site.name"
|
||||
:value="site.id"
|
||||
>
|
||||
<span>{{ site.name }}</span>
|
||||
<span class="tenant-option-code">{{ site.code }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select
|
||||
v-model="filters.status"
|
||||
@@ -514,6 +559,14 @@ function moneyCent(value: number | string | undefined) {
|
||||
|
||||
<el-table v-loading="loading" class="table-panel" :data="users" empty-text="未找到匹配的用户">
|
||||
<el-table-column prop="id" label="用户ID" width="80" />
|
||||
<el-table-column label="所属站点" width="140" fixed="left">
|
||||
<template #default="{ row }">
|
||||
<div class="tenant-cell">
|
||||
<el-tag effect="plain" size="small">{{ userSiteLabel(row) }}</el-tag>
|
||||
<small v-if="row.tenant_code">{{ row.tenant_code }}</small>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="nickname" label="昵称" min-width="120" />
|
||||
<el-table-column prop="phone" label="手机号" min-width="120" />
|
||||
<el-table-column label="状态" width="90">
|
||||
@@ -696,7 +749,8 @@ function moneyCent(value: number | string | undefined) {
|
||||
>
|
||||
<div v-if="activeUser" class="dialog-body">
|
||||
<p>
|
||||
<strong>{{ activeUser.phone }}</strong> · {{ activeUser.nickname }}
|
||||
<strong>{{ activeUser.phone }}</strong> · {{ activeUser.nickname }} ·
|
||||
{{ userSiteLabel(activeUser) }}
|
||||
</p>
|
||||
<el-input
|
||||
v-model="freezeReason"
|
||||
@@ -719,7 +773,8 @@ function moneyCent(value: number | string | undefined) {
|
||||
>
|
||||
<div v-if="manualRealnameUser" class="dialog-body">
|
||||
<p>
|
||||
<strong>{{ manualRealnameUser.phone }}</strong> · {{ manualRealnameUser.nickname }}
|
||||
<strong>{{ manualRealnameUser.phone }}</strong> · {{ manualRealnameUser.nickname }} ·
|
||||
{{ userSiteLabel(manualRealnameUser) }}
|
||||
</p>
|
||||
<el-alert
|
||||
type="info"
|
||||
@@ -764,7 +819,8 @@ function moneyCent(value: number | string | undefined) {
|
||||
>
|
||||
<div v-if="realnameUser" class="dialog-body">
|
||||
<p>
|
||||
<strong>{{ realnameUser.phone }}</strong> · {{ realnameUser.nickname }}
|
||||
<strong>{{ realnameUser.phone }}</strong> · {{ realnameUser.nickname }} ·
|
||||
{{ userSiteLabel(realnameUser) }}
|
||||
</p>
|
||||
<el-alert
|
||||
type="warning"
|
||||
@@ -794,7 +850,8 @@ function moneyCent(value: number | string | undefined) {
|
||||
>
|
||||
<div v-if="quotaUser" class="dialog-body">
|
||||
<p>
|
||||
<strong>{{ quotaUser.phone }}</strong> · {{ quotaUser.nickname }}
|
||||
<strong>{{ quotaUser.phone }}</strong> · {{ quotaUser.nickname }} ·
|
||||
{{ userSiteLabel(quotaUser) }}
|
||||
</p>
|
||||
<p>
|
||||
等级额度 ¥{{ moneyCent(quotaUser.deposit_free_level_quota_cent) }},人工额度 ¥{{
|
||||
@@ -830,8 +887,8 @@ function moneyCent(value: number | string | undefined) {
|
||||
>
|
||||
<div v-if="growthUser" class="dialog-body growth-dialog">
|
||||
<p>
|
||||
<strong>{{ growthUser.phone }}</strong> · {{ growthUser.nickname || '-' }} · 当前
|
||||
{{ growthUser.renter_growth_level_name }}
|
||||
<strong>{{ growthUser.phone }}</strong> · {{ growthUser.nickname || '-' }} ·
|
||||
{{ userSiteLabel(growthUser) }} · 当前 {{ growthUser.renter_growth_level_name }}
|
||||
</p>
|
||||
<div class="growth-current">
|
||||
<span>当前积分</span>
|
||||
@@ -877,7 +934,7 @@ function moneyCent(value: number | string | undefined) {
|
||||
<div v-if="growthLevelUser" class="dialog-body growth-dialog">
|
||||
<p>
|
||||
<strong>{{ growthLevelUser.phone }}</strong> · {{ growthLevelUser.nickname || '-' }} ·
|
||||
当前
|
||||
{{ userSiteLabel(growthLevelUser) }} · 当前
|
||||
{{ growthLevelUser.renter_growth_level_name }}
|
||||
{{ growthLevelUser.renter_growth_level_manual ? '(手动锁定)' : '(自动计算)' }}
|
||||
</p>
|
||||
@@ -930,8 +987,8 @@ function moneyCent(value: number | string | undefined) {
|
||||
>
|
||||
<div v-if="walletUser" class="dialog-body wallet-dialog">
|
||||
<p>
|
||||
<strong>{{ walletUser.phone }}</strong> · {{ walletUser.nickname || '-' }} · ID
|
||||
{{ walletUser.id }}
|
||||
<strong>{{ walletUser.phone }}</strong> · {{ walletUser.nickname || '-' }} ·
|
||||
{{ userSiteLabel(walletUser) }} · ID {{ walletUser.id }}
|
||||
</p>
|
||||
<div class="wallet-balance-cards">
|
||||
<div>
|
||||
|
||||
Reference in New Issue
Block a user