+
{{ role.role_name }}
-
+
{{ role.role_type === 1 ? '平台角色' : '客户角色' }}
@@ -196,19 +154,11 @@
>
{{ role.role_name }}
-
+
{{ role.role_type === 1 ? '平台角色' : '客户角色' }}
-
+
移除
@@ -256,6 +206,7 @@
const roleSubmitLoading = ref(false)
const currentAccountId = ref
(0)
const currentAccountName = ref('')
+ const currentAccountType = ref(0)
const selectedRoles = ref([])
const allRoles = ref([])
const rolesToAdd = ref([])
@@ -517,7 +468,7 @@
{
prop: 'operation',
label: '操作',
- width: 200,
+ width: 240,
fixed: 'right',
formatter: (row: any) => {
const buttons = []
@@ -525,7 +476,7 @@
if (hasAuth('account:patch_role')) {
buttons.push(
h(ArtButtonTable, {
- icon: '',
+ text: '分配角色',
onClick: () => showRoleDialog(row)
})
)
@@ -534,7 +485,7 @@
if (hasAuth('account:edit')) {
buttons.push(
h(ArtButtonTable, {
- type: 'edit',
+ text: '编辑',
onClick: () => showDialog('edit', row)
})
)
@@ -543,7 +494,7 @@
if (hasAuth('account:delete')) {
buttons.push(
h(ArtButtonTable, {
- type: 'delete',
+ text: '删除',
onClick: () => deleteAccount(row)
})
)
@@ -593,11 +544,23 @@
}
}
- // 计算属性：过滤后的可分配角色
+ // 计算属性：过滤后的可分配角色（根据账号类型过滤）
const filteredAvailableRoles = computed(() => {
- if (!leftRoleFilter.value) return allRoles.value
+ let roles = allRoles.value
+
+ // 根据账号类型过滤角色
+ if (currentAccountType.value === 3) {
+ // 代理账号：只显示客户角色
+ roles = roles.filter((role) => role.role_type === 2)
+ } else if (currentAccountType.value === 2) {
+ // 平台用户：只显示平台角色
+ roles = roles.filter((role) => role.role_type === 1)
+ }
+
+ // 根据搜索关键词过滤
+ if (!leftRoleFilter.value) return roles
const keyword = leftRoleFilter.value.toLowerCase()
- return allRoles.value.filter((role) => role.role_name.toLowerCase().includes(keyword))
+ return roles.filter((role) => role.role_name.toLowerCase().includes(keyword))
})
// 计算属性：过滤后的已分配角色
@@ -612,6 +575,7 @@
const showRoleDialog = async (row: any) => {
currentAccountId.value = row.id
currentAccountName.value = row.username
+ currentAccountType.value = row.user_type
selectedRoles.value = []
rolesToAdd.value = []
leftRoleFilter.value = ''
@@ -641,18 +605,31 @@
if (rolesToAdd.value.length === 0) return
try {
- // 将选中的角色添加到已分配列表
- const newRoles = [...new Set([...selectedRoles.value, ...rolesToAdd.value])]
+ let newRoles: number[]
+
+ // 代理账号只能分配一个角色，会覆盖之前的角色
+ if (currentAccountType.value === 3) {
+ if (rolesToAdd.value.length > 1) {
+ ElMessage.warning('代理账号只能分配一个角色')
+ return
+ }
+ // 只保留新选择的一个角色
+ newRoles = rolesToAdd.value
+ } else {
+ // 其他账号类型可以分配多个角色
+ newRoles = [...new Set([...selectedRoles.value, ...rolesToAdd.value])]
+ }
+
await AccountService.assignRolesToAccount(currentAccountId.value, newRoles)
selectedRoles.value = newRoles
rolesToAdd.value = []
- ElMessage.success('角色添加成功')
+ ElMessage.success('角色分配成功')
// 刷新列表以更新角色显示
await getAccountList()
} catch (error) {
- console.error('添加角色失败:', error)
+ console.error('分配角色失败:', error)
}
}
diff --git a/src/views/asset-management/authorization-records/index.vue b/src/views/asset-management/authorization-records/index.vue
index 5c822f2..6be682d 100644
--- a/src/views/asset-management/authorization-records/index.vue
+++ b/src/views/asset-management/authorization-records/index.vue
@@ -39,25 +39,39 @@
- {{ currentRecord.enterprise_id }}
- {{ currentRecord.enterprise_name }}
+ {{
+ currentRecord.enterprise_id
+ }}
+ {{
+ currentRecord.enterprise_name
+ }}
{{ currentRecord.card_id }}
{{ currentRecord.iccid }}
- {{ currentRecord.msisdn || '--' }}
- {{ currentRecord.authorized_by }}
- {{ currentRecord.authorizer_name }}
+ {{
+ currentRecord.msisdn || '--'
+ }}
+ {{
+ currentRecord.authorized_by
+ }}
+ {{
+ currentRecord.authorizer_name
+ }}
{{ getAuthorizerTypeText(currentRecord.authorizer_type) }}
- {{ formatDateTime(currentRecord.authorized_at) }}
+ {{
+ formatDateTime(currentRecord.authorized_at)
+ }}
{{ getStatusText(currentRecord.status) }}
- {{ currentRecord.remark || '--' }}
+ {{
+ currentRecord.remark || '--'
+ }}