This commit is contained in:
@@ -181,7 +181,9 @@
|
||||
:label="role.role_name"
|
||||
:value="role.ID"
|
||||
>
|
||||
<div style="display: flex; justify-content: space-between; align-items: center;">
|
||||
<div
|
||||
style="display: flex; justify-content: space-between; align-items: center"
|
||||
>
|
||||
<span>{{ role.role_name }}</span>
|
||||
<ElTag type="success" size="small">客户角色</ElTag>
|
||||
</div>
|
||||
@@ -623,7 +625,7 @@
|
||||
{
|
||||
prop: 'operation',
|
||||
label: '操作',
|
||||
width: 200,
|
||||
width: 110,
|
||||
fixed: 'right',
|
||||
formatter: (row: ShopResponse) => {
|
||||
const buttons = []
|
||||
@@ -637,16 +639,6 @@
|
||||
)
|
||||
}
|
||||
|
||||
// 只要有编辑或删除权限之一,就显示更多操作按钮
|
||||
if (hasAuth('shop:edit') || hasAuth('shop:delete')) {
|
||||
buttons.push(
|
||||
h(ArtButtonTable, {
|
||||
text: '更多操作',
|
||||
onContextmenu: (e: MouseEvent) => showShopOperationMenu(e, row)
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
return h('div', { style: 'display: flex; gap: 8px;' }, buttons)
|
||||
}
|
||||
}
|
||||
@@ -855,9 +847,7 @@
|
||||
{ len: 11, message: '手机号必须为 11 位', trigger: 'blur' },
|
||||
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
|
||||
],
|
||||
default_role_id: [
|
||||
{ required: true, message: '请选择默认角色', trigger: 'blur' }
|
||||
]
|
||||
default_role_id: [{ required: true, message: '请选择默认角色', trigger: 'blur' }]
|
||||
})
|
||||
|
||||
// 提交表单
|
||||
@@ -1048,9 +1038,8 @@
|
||||
const showAddRoleDialog = async () => {
|
||||
addRoleDialogVisible.value = true
|
||||
// 如果已有默认角色,预选第一个
|
||||
selectedRoleId.value = currentDefaultRoles.value.length > 0
|
||||
? currentDefaultRoles.value[0].role_id
|
||||
: undefined
|
||||
selectedRoleId.value =
|
||||
currentDefaultRoles.value.length > 0 ? currentDefaultRoles.value[0].role_id : undefined
|
||||
await loadAvailableRoles()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user