Skip to content

Commit bc063e6

Browse files
committed
refactor(system/user): 分页列表调整排除用户 ID 列表参数为 roleId,改为后端根据 roleId 查询
1 parent 3b1f1aa commit bc063e6

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/apis/system/type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface UserQuery {
3838
deptId?: string
3939
sort: Array<string>
4040
userIds?: Array<string>
41-
excludeUserIds?: Array<string>
41+
roleId?: string
4242
}
4343
export interface UserPageQuery extends UserQuery, PageQuery {}
4444

src/components/UserSelect/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ const emit = defineEmits<{
9494
interface Props {
9595
multiple?: boolean
9696
value: string | string[]
97-
excludeValue?: string[]
97+
roleId?: string
9898
}
9999
100100
// 查询表单
101101
const queryForm = reactive<UserQuery>({
102102
sort: ['t1.createTime,desc', 't1.id,desc'],
103-
excludeUserIds: props.excludeValue,
103+
roleId: props.roleId,
104104
})
105105
106106
// 用户列表

src/views/system/role/RoleAssignModal.vue

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
@before-ok="save"
1010
@close="reset"
1111
>
12-
<UserSelect v-if="visible" ref="UserSelectRef" v-model:value="selectedUsers" :exclude-value="excludeUsers" @select-user="onSelectUser" />
12+
<UserSelect v-if="visible" ref="UserSelectRef" v-model:value="selectedUsers" :role-id="dataId" @select-user="onSelectUser" />
1313
</a-modal>
1414
</template>
1515

1616
<script setup lang="ts">
1717
import { Message } from '@arco-design/web-vue'
1818
import { useWindowSize } from '@vueuse/core'
19-
import { assignToUsers, listRoleUserId } from '@/apis/system/role'
19+
import { assignToUsers } from '@/apis/system/role'
2020
2121
const emit = defineEmits<{
2222
(e: 'save-success'): void
@@ -27,7 +27,6 @@ const { width } = useWindowSize()
2727
const dataId = ref('')
2828
const visible = ref(false)
2929
const selectedUsers = ref<string[]>([])
30-
const excludeUsers = ref<string[]>([])
3130
3231
// 用户选择回调
3332
const onSelectUser = (value: string[]) => {
@@ -63,9 +62,6 @@ const save = async () => {
6362
// 打开
6463
const onOpen = async (id: string) => {
6564
dataId.value = id
66-
// 初始化选择的用户
67-
const { data } = await listRoleUserId(id)
68-
excludeUsers.value = data
6965
selectedUsers.value = []
7066
visible.value = true
7167
}

0 commit comments

Comments
 (0)