fix: id兼容, 通知入口
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 5m0s

This commit is contained in:
luo
2026-07-28 15:19:29 +08:00
parent 0e8a11430a
commit 261f5f2853
21 changed files with 271 additions and 71 deletions

View File

@@ -82,9 +82,9 @@
>
<ElOption
v-for="role in availableRolesForCreate"
:key="role.ID"
:key="getRoleId(role)"
:label="role.role_name"
:value="role.ID"
:value="getRoleId(role)"
>
<div style="display: flex; align-items: center; justify-content: space-between">
<span>{{ role.role_name }}</span>
@@ -133,8 +133,15 @@
<ElEmpty v-if="filteredAvailableRoles.length === 0" description="暂无角色" />
<template v-else-if="isPlatformUser">
<ElCheckboxGroup v-model="rolesToAdd" class="role-list">
<div v-for="role in filteredAvailableRoles" :key="role.ID" class="role-item">
<ElCheckbox :label="role.ID" :disabled="selectedRoles.includes(role.ID)">
<div
v-for="role in filteredAvailableRoles"
:key="getRoleId(role)"
class="role-item"
>
<ElCheckbox
:label="getRoleId(role)"
:disabled="selectedRoles.includes(getRoleId(role))"
>
<span class="role-info">
<span>{{ role.role_name }}</span>
<ElTag :type="role.role_type === 1 ? 'primary' : 'success'" size="small">
@@ -147,8 +154,15 @@
</template>
<template v-else>
<ElRadioGroup v-model="roleToAdd" class="role-list">
<div v-for="role in filteredAvailableRoles" :key="role.ID" class="role-item">
<ElRadio :label="role.ID" :disabled="selectedRoles.includes(role.ID)">
<div
v-for="role in filteredAvailableRoles"
:key="getRoleId(role)"
class="role-item"
>
<ElRadio
:label="getRoleId(role)"
:disabled="selectedRoles.includes(getRoleId(role))"
>
<span class="role-info">
<span>{{ role.role_name }}</span>
<ElTag :type="role.role_type === 1 ? 'primary' : 'success'" size="small">
@@ -190,7 +204,7 @@
<div class="role-list">
<div
v-for="role in filteredAssignedRoles"
:key="role.ID"
:key="getRoleId(role)"
class="role-item assigned-role-item"
>
<span class="role-info">
@@ -199,7 +213,12 @@
{{ role.role_type === 1 ? '平台角色' : '客户角色' }}
</ElTag>
</span>
<ElButton type="danger" size="small" link @click="removeSingleRole(role.ID)">
<ElButton
type="danger"
size="small"
link
@click="removeSingleRole(getRoleId(role))"
>
移除
</ElButton>
</div>
@@ -310,6 +329,7 @@
import type { SearchFormItem } from '@/types'
import type { PlatformRole, WecomApplication, WecomMember } from '@/types/api'
import { formatDateTime } from '@/utils/business/format'
import { getCompatibleNumericId } from '@/utils/business/id'
import {
CommonStatus,
getStatusText,
@@ -356,6 +376,9 @@
// 是否为平台用户(平台用户可多选,其他单选)
const isPlatformUser = computed(() => currentAccountType.value === 2)
const getAccountId = (account: any) => getCompatibleNumericId(account) ?? 0
const getRoleId = (role: PlatformRole | any) => getCompatibleNumericId(role) ?? 0
// 定义表单搜索初始值
const initialSearchState = {
name: '',
@@ -631,14 +654,6 @@
const getActions = (row: any) => {
const actions: any[] = []
if (row.user_type === 2 && hasAuth(JULY_PERMISSIONS.wecom.binding)) {
actions.push({
label: '绑定账号',
handler: () => showWecomBindingDialog(row),
type: 'primary'
})
}
if (hasAuth('account:patch_role')) {
actions.push({
label: '分配角色',
@@ -647,6 +662,14 @@
})
}
if (row.user_type === 2 && hasAuth(JULY_PERMISSIONS.wecom.binding)) {
actions.push({
label: '绑定账号',
handler: () => showWecomBindingDialog(row),
type: 'primary'
})
}
if (hasAuth('account:edit')) {
actions.push({
label: '编辑',
@@ -716,7 +739,7 @@
return
}
const accountId = Number(currentWecomAccount.value.id ?? currentWecomAccount.value.ID)
const accountId = getAccountId(currentWecomAccount.value)
if (!accountId) {
ElMessage.error('当前账号缺少账号标识,无法绑定企微')
return
@@ -823,7 +846,9 @@
// 计算属性:过滤后的已分配角色
const filteredAssignedRoles = computed(() => {
const assignedRolesList = allRoles.value.filter((role) => selectedRoles.value.includes(role.ID))
const assignedRolesList = allRoles.value.filter((role) =>
selectedRoles.value.includes(getRoleId(role))
)
if (!rightRoleFilter.value) return assignedRolesList
const keyword = rightRoleFilter.value.toLowerCase()
return assignedRolesList.filter((role) => role.role_name.toLowerCase().includes(keyword))
@@ -835,7 +860,12 @@
ElMessage.warning('超级管理员无法分配角色')
return
}
currentAccountId.value = row.id
const accountId = getAccountId(row)
if (!accountId) {
ElMessage.error('当前账号缺少账号标识,无法分配角色')
return
}
currentAccountId.value = accountId
currentAccountName.value = row.username
currentAccountType.value = row.user_type
selectedRoles.value = []
@@ -852,12 +882,12 @@
await loadAllRoles('', roleType)
// 先加载当前账号的角色,再打开对话框
const res = await AccountService.getAccountRoles(row.id)
const res = await AccountService.getAccountRoles(accountId)
if (res.code === 0) {
// 提取角色ID数组
const roles = res.data || []
// 兼容 ID 和 id 两种字段名
selectedRoles.value = roles.map((role: any) => role.ID || role.id)
selectedRoles.value = roles.map((role: any) => getRoleId(role)).filter(Boolean)
// 数据加载完成后再打开对话框
roleDialogVisible.value = true
}
@@ -1013,7 +1043,7 @@
// 创建成功后分配角色(如果选择了)
if (createRes.code === 0) {
const accountId = createRes.data?.ID || createRes.data?.id
const accountId = getCompatibleNumericId(createRes.data)
if (formData.role_id && accountId) {
try {
await AccountService.assignRolesToAccount(accountId, [formData.role_id])

View File

@@ -22,7 +22,7 @@
<template v-if="!props.seriesId">
<ElOption value="__NO_PACKAGE__" disabled>
<span style="color: var(--el-text-color-warning)">
该设备未关联套餐系列无法购买套餐
{{ noSeriesMessage }}
</span>
</ElOption>
</template>
@@ -45,7 +45,7 @@
</ElSelect>
<template v-if="noSeriesId">
<div style="margin-top: 4px; font-size: 12px; color: var(--el-text-color-warning)">
该设备未关联套餐系列无法购买套餐
{{ noSeriesMessage }}
</div>
</template>
<template v-else-if="packagesEmptyWithSeriesId">
@@ -182,6 +182,9 @@
})
const noSeriesId = computed(() => !props.seriesId)
const noSeriesMessage = computed(
() => `${props.assetType === 'card' ? '卡' : '设备'}未关联套餐系列,无法购买套餐`
)
const selectedPackageIsGift = computed(() => {
if (!form.package_id) return false

View File

@@ -11,6 +11,28 @@
@closed="handleCreateDrawerClosed"
>
<ElForm ref="formRef" :model="form" :rules="rules" label-width="110px" class="create-form">
<ElFormItem label="套餐系列" prop="series_id">
<ElSelect
v-model="form.series_id"
filterable
remote
clearable
:remote-method="handleSeriesSearch"
:loading="seriesLoading"
placeholder="请输入系列名称搜索"
style="width: 100%"
@change="handleSeriesChange"
@visible-change="handleSeriesVisibleChange"
>
<ElOption
v-for="series in seriesOptions"
:key="series.id"
:label="series.series_name"
:value="series.id"
/>
</ElSelect>
</ElFormItem>
<ElFormItem label="套餐" prop="package_id">
<ElSelect
v-model="form.package_id"
@@ -19,7 +41,8 @@
clearable
:remote-method="handlePackageSearch"
:loading="packageLoading"
placeholder="请输入套餐名称搜索"
:disabled="!form.series_id"
placeholder="请先选择套餐系列"
style="width: 100%"
@visible-change="handlePackageVisibleChange"
>
@@ -223,8 +246,13 @@
} from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import VoucherUpload from '@/components/business/VoucherUpload.vue'
import { BulkPurchaseService, PackageManageService } from '@/api/modules'
import type { BulkPurchasePaymentMethod, BulkPurchaseTask, PackageResponse } from '@/types/api'
import { BulkPurchaseService, PackageManageService, PackageSeriesService } from '@/api/modules'
import type {
BulkPurchasePaymentMethod,
BulkPurchaseTask,
PackageResponse,
PackageSeriesResponse
} from '@/types/api'
import { BulkPurchaseTaskStatus } from '@/types/api'
import { useAuth } from '@/composables/useAuth'
import { formatDateTime } from '@/utils/business/format'
@@ -244,6 +272,8 @@
const orderFileUploading = ref(false)
const voucherFileKeys = ref<string[]>([])
const voucherUploading = ref(false)
const seriesOptions = ref<PackageSeriesResponse[]>([])
const seriesLoading = ref(false)
const packageOptions = ref<PackageResponse[]>([])
const packageLoading = ref(false)
const taskList = ref<BulkPurchaseTask[]>([])
@@ -257,14 +287,17 @@
)
const form = reactive<{
series_id?: number
package_id?: number
payment_method: BulkPurchasePaymentMethod
}>({
series_id: undefined,
package_id: undefined,
payment_method: 'wallet'
})
const rules = computed<FormRules>(() => ({
series_id: [{ required: true, message: '请选择套餐系列', trigger: 'change' }],
package_id: [{ required: true, message: '请选择套餐', trigger: 'change' }],
payment_method: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
orderFile: [
@@ -289,12 +322,18 @@
}))
const loadPackages = async (query = '') => {
if (!form.series_id) {
packageOptions.value = []
return
}
packageLoading.value = true
try {
const res = await PackageManageService.getPackages({
page: 1,
page_size: 20,
package_name: query.trim() || undefined,
series_id: form.series_id,
status: 1,
shelf_status: 1
})
@@ -314,20 +353,21 @@
}
const handlePackageSearch = (query: string) => {
void loadPackages(query)
if (form.series_id) void loadPackages(query)
}
const handlePackageVisibleChange = (visible: boolean) => {
if (visible && packageOptions.value.length === 0) void loadPackages()
if (visible && form.series_id && packageOptions.value.length === 0) void loadPackages()
}
const openCreateDrawer = () => {
createDrawerVisible.value = true
if (packageOptions.value.length === 0) void loadPackages()
if (seriesOptions.value.length === 0) void loadSeries()
}
const handleCreateDrawerClosed = () => {
formRef.value?.resetFields()
form.series_id = undefined
form.package_id = undefined
form.payment_method = 'wallet'
orderFileKeys.value = []
@@ -338,6 +378,41 @@
voucherUploading.value = false
}
const loadSeries = async (query = '') => {
seriesLoading.value = true
try {
const res = await PackageSeriesService.getPackageSeries({
page: 1,
page_size: 20,
series_name: query.trim() || undefined,
status: 1
})
if (res.code !== 0) {
ElMessage.error(res.msg || '获取套餐系列失败')
return
}
seriesOptions.value = res.data?.items || []
} catch (error: any) {
ElMessage.error(error?.message || '获取套餐系列失败')
} finally {
seriesLoading.value = false
}
}
const handleSeriesSearch = (query: string) => {
void loadSeries(query)
}
const handleSeriesVisibleChange = (visible: boolean) => {
if (visible && seriesOptions.value.length === 0) void loadSeries()
}
const handleSeriesChange = () => {
form.package_id = undefined
packageOptions.value = []
if (form.series_id) void loadPackages()
}
const handlePaymentMethodChange = (value: string | number | boolean | undefined) => {
if (value === 'wallet') {
voucherFileKeys.value = []

View File

@@ -3,7 +3,7 @@
<div class="device-batch-allocation-page" id="table-full-screen">
<ElDrawer
v-model="createDrawerVisible"
title="设备批量分配"
title="设备批量任务"
direction="rtl"
size="520px"
:close-on-click-modal="!createDrawerBusy"
@@ -102,13 +102,13 @@
<ElCard shadow="never" class="art-table-card task-list-card">
<template #header>
<div class="task-list-header">
<span>设备批量分配任务</span>
<span>设备批量任务</span>
<div class="task-list-toolbar">
<ElButton
v-if="hasAuth(JULY_PERMISSIONS.deviceAllocation.create)"
tag="a"
href="/templates/device-batch-allocation-template.csv"
download="设备批量分配模板.csv"
download="设备批量任务模板.csv"
>
下载模板
</ElButton>
@@ -117,7 +117,7 @@
type="primary"
@click="openCreateDrawer"
>
设备批量分配
设备批量任务
</ElButton>
<ElSelect
v-model="taskListOperationType"
@@ -344,7 +344,7 @@
if (res.code === 0) seriesOptions.value = res.data.items || []
}
} catch (error) {
console.error('获取批量分配目标失败:', error)
console.error('获取设备批量任务目标失败:', error)
ElMessage.error(normalizeApiError(error).message)
} finally {
targetLoading.value = false
@@ -399,13 +399,13 @@
operation_type: taskListOperationType.value
})
if (res.code !== 0) {
ElMessage.error(res.msg || '获取设备批量分配任务失败')
ElMessage.error(res.msg || '获取设备批量任务失败')
return
}
taskList.value = (res.data.items || []).filter((item) => item.operation_type !== 'import')
taskListTotal.value = res.data.total || 0
} catch (error) {
console.error('获取设备批量分配任务失败:', error)
console.error('获取设备批量任务失败:', error)
ElMessage.error(normalizeApiError(error).message)
} finally {
taskListLoading.value = false
@@ -445,14 +445,14 @@
try {
const res = await DeviceService.createAllocationTask(request)
if (res.code !== 0) {
ElMessage.error(res.msg || '创建设备批量分配任务失败')
ElMessage.error(res.msg || '创建设备批量任务失败')
return
}
createDrawerVisible.value = false
await loadTaskList()
ElMessage.success(`任务已创建:${res.data.task_no}`)
} catch (error) {
console.error('创建设备批量分配任务失败:', error)
console.error('创建设备批量任务失败:', error)
ElMessage.error(normalizeApiError(error).message)
} finally {
submitting.value = false

View File

@@ -34,7 +34,7 @@
<!-- 表格 -->
<ArtTable
ref="tableRef"
row-key="ID"
row-key="id"
:loading="loading"
:data="accountList"
:currentPage="pagination.page"
@@ -120,8 +120,11 @@
<ElEmpty v-if="filteredAvailableRoles.length === 0" description="暂无角色" />
<template v-else-if="isPlatformUser">
<ElCheckboxGroup v-model="rolesToAdd" class="role-list">
<div v-for="role in filteredAvailableRoles" :key="role.ID" class="role-item">
<ElCheckbox :label="role.ID" :disabled="selectedRoles.includes(role.ID)">
<div v-for="role in filteredAvailableRoles" :key="getRoleId(role)" class="role-item">
<ElCheckbox
:label="getRoleId(role)"
:disabled="selectedRoles.includes(getRoleId(role))"
>
<span class="role-info">
<span>{{ role.role_name }}</span>
<ElTag :type="role.role_type === 1 ? 'primary' : 'success'" size="small">
@@ -134,8 +137,11 @@
</template>
<template v-else>
<ElRadioGroup v-model="roleToAdd" class="role-list">
<div v-for="role in filteredAvailableRoles" :key="role.ID" class="role-item">
<ElRadio :label="role.ID" :disabled="selectedRoles.includes(role.ID)">
<div v-for="role in filteredAvailableRoles" :key="getRoleId(role)" class="role-item">
<ElRadio
:label="getRoleId(role)"
:disabled="selectedRoles.includes(getRoleId(role))"
>
<span class="role-info">
<span>{{ role.role_name }}</span>
<ElTag :type="role.role_type === 1 ? 'primary' : 'success'" size="small">
@@ -177,7 +183,7 @@
<div class="role-list">
<div
v-for="role in filteredAssignedRoles"
:key="role.ID"
:key="getRoleId(role)"
class="role-item assigned-role-item"
>
<span class="role-info">
@@ -186,7 +192,12 @@
{{ role.role_type === 1 ? '平台角色' : '客户角色' }}
</ElTag>
</span>
<ElButton type="danger" size="small" link @click="removeSingleRole(role.ID)">
<ElButton
type="danger"
size="small"
link
@click="removeSingleRole(getRoleId(role))"
>
移除
</ElButton>
</div>
@@ -231,6 +242,7 @@
import type { SearchFormItem } from '@/types'
import type { PlatformAccount, PlatformRole } from '@/types/api'
import { formatDateTime } from '@/utils/business/format'
import { getCompatibleNumericId } from '@/utils/business/id'
import { useAuth } from '@/composables/useAuth'
defineOptions({ name: 'CommonAccountList' })
@@ -287,6 +299,9 @@
// 是否为平台用户(平台用户可多选,其他单选)
const isPlatformUser = computed(() => currentAccountType.value === 2)
const getAccountId = (account: PlatformAccount | any) => getCompatibleNumericId(account) ?? 0
const getRoleId = (role: PlatformRole | any) => getCompatibleNumericId(role) ?? 0
// 搜索表单初始值
const initialSearchState = {
username: '',
@@ -646,7 +661,9 @@
// 计算属性:过滤后的已分配角色
const filteredAssignedRoles = computed(() => {
const assignedRolesList = allRoles.value.filter((role) => selectedRoles.value.includes(role.ID))
const assignedRolesList = allRoles.value.filter((role) =>
selectedRoles.value.includes(getRoleId(role))
)
if (!rightRoleFilter.value) return assignedRolesList
const keyword = rightRoleFilter.value.toLowerCase()
return assignedRolesList.filter((role) => role.role_name.toLowerCase().includes(keyword))
@@ -654,7 +671,12 @@
// 显示分配角色对话框
const showRoleDialog = async (row: PlatformAccount) => {
currentAccountId.value = (row as any).id
const accountId = getAccountId(row)
if (!accountId) {
ElMessage.error('当前账号缺少账号标识,无法分配角色')
return
}
currentAccountId.value = accountId
currentAccountName.value = row.username
currentAccountType.value = row.user_type
selectedRoles.value = []
@@ -671,12 +693,12 @@
await loadAllRoles('', roleType)
// 先加载当前账号的角色,再打开对话框
const res = await AccountService.getAccountRoles((row as any).id)
const res = await AccountService.getAccountRoles(accountId)
if (res.code === 0) {
// 提取角色ID数组
const roles = res.data || []
// 兼容 ID 和 id 两种字段名
selectedRoles.value = roles.map((role: any) => role.ID || role.id)
selectedRoles.value = roles.map((role: any) => getRoleId(role)).filter((id) => id > 0)
// 数据加载完成后再打开对话框
roleDialogVisible.value = true
}

View File

@@ -163,7 +163,7 @@
</ElSelect>
<template v-if="noSeriesId">
<div style="margin-top: 4px; font-size: 12px; color: var(--el-text-color-warning)">
该设备未关联套餐系列无法购买套餐
{{ noSeriesMessage }}
</div>
</template>
<template v-else-if="packagesEmptyWithSeriesId">
@@ -616,6 +616,10 @@
return false
})
const noSeriesMessage = computed(
() => `${createForm.order_type === 'single_card' ? '卡' : '设备'}未关联套餐系列,无法购买套餐`
)
// 检查是否选择了赠送套餐
const selectedPackageIsGift = computed(() => {
if (!createForm.package_id) return false
@@ -892,7 +896,8 @@
prop: 'is_expired',
label: '是否过期',
width: 100,
formatter: (row: Order) => (row.is_expired === undefined ? '-' : row.is_expired ? '是' : '否')
formatter: (row: Order) =>
row.is_expired === undefined ? '-' : row.is_expired ? '是' : '否'
},
{
prop: 'expires_at',

View File

@@ -337,6 +337,7 @@
} from '@/types/api'
import { RoleType, RoleStatus } from '@/types/api'
import { formatDateTime } from '@/utils/business/format'
import { getCompatibleNumericId } from '@/utils/business/id'
import { CommonStatus, getStatusText, STATUS_SELECT_OPTIONS } from '@/config/constants'
import { regionData } from '@/utils/constants/regionData'
import { RoutesAlias } from '@/router/routesAlias'
@@ -1144,7 +1145,7 @@
// 将 PlatformRole 转换为与 ShopRoleResponse 兼容的格式
availableRoles.value = (res.data.items || []).map((role) => ({
...role,
role_id: role.id ?? role.ID,
role_id: getCompatibleNumericId(role) ?? 0,
role_name: role.role_name,
role_desc: role.role_desc,
role_type: role.role_type,

View File

@@ -255,6 +255,7 @@
import { useCheckedColumns } from '@/composables/useCheckedColumns'
import { useAuth } from '@/composables/useAuth'
import { fenToYuan, formatDateTime, yuanToFen } from '@/utils/business/format'
import { getCompatibleNumericId } from '@/utils/business/id'
import {
CommonStatus,
getStatusText,
@@ -415,7 +416,7 @@
const roleList = ref<PlatformRole[]>([])
const getRoleId = (role: PlatformRole | any) => role.id ?? role.ID
const getRoleId = (role: PlatformRole | any) => getCompatibleNumericId(role) ?? 0
const handleNameClick = (row: PlatformRole) => {
if (hasAuth('role:detail')) {
@@ -1037,12 +1038,9 @@
if (Array.isArray(permissions) && permissions.length > 0) {
// 如果返回的是权限对象数组提取ID或id字段
if (typeof permissions[0] === 'object') {
// 优先使用ID字段如果没有则使用id字段
if ('ID' in permissions[0]) {
selectedPermissions.value = permissions.map((perm: any) => perm.ID)
} else if ('id' in permissions[0]) {
selectedPermissions.value = permissions.map((perm: any) => perm.id)
}
selectedPermissions.value = permissions
.map((perm: any) => getCompatibleNumericId(perm))
.filter((id): id is number => id !== undefined)
} else {
// 如果返回的是ID数组
selectedPermissions.value = permissions
@@ -1189,7 +1187,9 @@
status: form.status
}
const res = await RoleService.createRole(data)
const createdRoleId = res.data?.ID ?? res.data?.id ?? res.data?.role_id
const createdRoleId =
getCompatibleNumericId(res.data) ??
(res.data?.role_id !== undefined ? Number(res.data.role_id) : undefined)
if (form.role_type === RoleType.CUSTOMER && createdRoleId) {
await RoleService.updateRoleDefaultCredit(createdRoleId, getDefaultCreditPayload())
}