diff --git a/src/apis/system/type.ts b/src/apis/system/type.ts index 4c07677..a95bf97 100644 --- a/src/apis/system/type.ts +++ b/src/apis/system/type.ts @@ -40,6 +40,7 @@ export interface UserQuery { createTime?: Array deptId?: string sort: Array + userIds?: Array } export interface UserPageQuery extends UserQuery, PageQuery { @@ -190,6 +191,8 @@ export interface NoticeResp { type: string effectiveTime: string terminateTime: string + noticeScope: number + noticeUsers: Array createUserString: string createTime: string updateUserString: string diff --git a/src/apis/system/user.ts b/src/apis/system/user.ts index 087ca00..b899733 100644 --- a/src/apis/system/user.ts +++ b/src/apis/system/user.ts @@ -9,6 +9,9 @@ const BASE_URL = '/system/user' export function listUser(query: T.UserPageQuery) { return http.get>(`${BASE_URL}`, query) } +export function listAllUser(query: Partial) { + return http.get(`${BASE_URL}/list`, query) +} /** @desc 查询用户详情 */ export function getUser(id: string) { diff --git a/src/components/UserSelect/component/UserSelectContent.vue b/src/components/UserSelect/component/UserSelectContent.vue new file mode 100644 index 0000000..3cf6668 --- /dev/null +++ b/src/components/UserSelect/component/UserSelectContent.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue new file mode 100644 index 0000000..defc974 --- /dev/null +++ b/src/components/UserSelect/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/components/UserSelect/type.ts b/src/components/UserSelect/type.ts new file mode 100644 index 0000000..38e36a8 --- /dev/null +++ b/src/components/UserSelect/type.ts @@ -0,0 +1,13 @@ +export interface UserSelectPropType { + multiple: boolean + value: string | string[] +} +export interface UserItem { + id: string + nickname: string + deptName: string + roleNames: string + phone: string + email: string + status: number +} diff --git a/src/types/components.d.ts b/src/types/components.d.ts index c599e8e..6d02673 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -48,6 +48,8 @@ declare module 'vue' { RouterView: typeof import('vue-router')['RouterView'] SecondForm: typeof import('./../components/GenCron/CronForm/component/second-form.vue')['default'] TextCopy: typeof import('./../components/TextCopy/index.vue')['default'] + UserSelect: typeof import('./../components/UserSelect/index.vue')['default'] + UserSelectContent: typeof import('./../components/UserSelect/component/UserSelectContent.vue')['default'] Verify: typeof import('./../components/Verify/index.vue')['default'] VerifyPoints: typeof import('./../components/Verify/Verify/VerifyPoints.vue')['default'] VerifySlide: typeof import('./../components/Verify/Verify/VerifySlide.vue')['default'] diff --git a/src/views/system/notice/page/add.vue b/src/views/system/notice/page/add.vue index ea40752..581624a 100644 --- a/src/views/system/notice/page/add.vue +++ b/src/views/system/notice/page/add.vue @@ -1,29 +1,33 @@