diff --git a/apps/web-antd/src/api/system/role/index.ts b/apps/web-antd/src/api/system/role/index.ts index 92bfde01..2a0de1ce 100644 --- a/apps/web-antd/src/api/system/role/index.ts +++ b/apps/web-antd/src/api/system/role/index.ts @@ -62,7 +62,7 @@ export function roleOptionSelect(params?: any) { } export function roleAllocatedList(params: any) { - return requestClient.get(Api.roleAllocatedList, params); + return requestClient.get(Api.roleAllocatedList, { params }); } /** diff --git a/apps/web-antd/src/views/system/role-assign/data.tsx b/apps/web-antd/src/views/system/role-assign/data.tsx index 443c7f04..093ebd72 100644 --- a/apps/web-antd/src/views/system/role-assign/data.tsx +++ b/apps/web-antd/src/views/system/role-assign/data.tsx @@ -1,4 +1,4 @@ -import type { FormSchemaGetter } from '#/adapter'; +import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; export const querySchema: FormSchemaGetter = () => [ { @@ -12,3 +12,30 @@ export const querySchema: FormSchemaGetter = () => [ label: '手机号码', }, ]; + +export const columns: VxeGridProps['columns'] = [ + { type: 'checkbox', width: 60 }, + { + title: '用户账号', + field: 'userName', + }, + { + title: '用户昵称', + field: 'nickName', + }, + { + title: '邮箱', + field: 'email', + }, + { + title: '手机号', + field: 'phonenumber', + }, + { + field: 'action', + fixed: 'right', + slots: { default: 'action' }, + title: '操作', + width: 180, + }, +]; diff --git a/apps/web-antd/src/views/system/role-assign/index.vue b/apps/web-antd/src/views/system/role-assign/index.vue index 444b8670..f51a6c9a 100644 --- a/apps/web-antd/src/views/system/role-assign/index.vue +++ b/apps/web-antd/src/views/system/role-assign/index.vue @@ -1,42 +1,163 @@ diff --git a/apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue b/apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue new file mode 100644 index 00000000..94ac020b --- /dev/null +++ b/apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue @@ -0,0 +1,101 @@ + + +