From c2f7e4ebca1e5faff20a923e13a2a9dddbed571d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Wed, 28 Jun 2023 00:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E3=80=81=E6=9C=BA=E6=9E=84=E3=80=81=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E8=A7=92=E8=89=B2=E9=80=89=E6=8B=A9=E5=99=A8=E7=94=B1?= =?UTF-8?q?=E4=BC=A0=E9=80=92url=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E4=B8=94=E4=B8=BA=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-admin-web/src/api/biz/bizOrgApi.js | 8 + .../components/Selector/orgSelectorPlusApi.js | 29 --- .../components/Selector/posSelectorPlusApi.js | 29 --- .../Selector/roleSelectorPlusApi.js | 29 --- .../Selector/userSelectorPlusApi.js | 29 --- snowy-admin-web/src/api/sys/orgApi.js | 8 + snowy-admin-web/src/api/sys/roleApi.js | 8 + snowy-admin-web/src/api/sys/userCenterApi.js | 16 ++ .../components/Selector/orgSelectorPlus.vue | 130 +++++++++----- .../components/Selector/posSelectorPlus.vue | 129 +++++++++----- .../components/Selector/roleSelectorPlus.vue | 166 +++++++++++------- .../components/Selector/userSelectorPlus.vue | 131 +++++++++----- snowy-admin-web/src/views/biz/org/form.vue | 24 ++- snowy-admin-web/src/views/biz/user/form.vue | 15 +- snowy-admin-web/src/views/biz/user/index.vue | 24 ++- .../src/views/dev/message/form.vue | 33 +++- snowy-admin-web/src/views/sys/org/form.vue | 33 +++- snowy-admin-web/src/views/sys/role/index.vue | 24 ++- snowy-admin-web/src/views/sys/user/form.vue | 15 +- snowy-admin-web/src/views/sys/user/index.vue | 24 ++- 20 files changed, 567 insertions(+), 337 deletions(-) delete mode 100644 snowy-admin-web/src/api/components/Selector/orgSelectorPlusApi.js delete mode 100644 snowy-admin-web/src/api/components/Selector/posSelectorPlusApi.js delete mode 100644 snowy-admin-web/src/api/components/Selector/roleSelectorPlusApi.js delete mode 100644 snowy-admin-web/src/api/components/Selector/userSelectorPlusApi.js diff --git a/snowy-admin-web/src/api/biz/bizOrgApi.js b/snowy-admin-web/src/api/biz/bizOrgApi.js index e05e2a6a..ec614f53 100644 --- a/snowy-admin-web/src/api/biz/bizOrgApi.js +++ b/snowy-admin-web/src/api/biz/bizOrgApi.js @@ -41,5 +41,13 @@ export default { // 获取机构详情 orgDetail(data) { return request('detail', data, 'get') + }, + // 获取机构树选择器 + orgTreeSelector(data) { + return request('orgTreeSelector', data, 'get') + }, + // 获取人员选择器 + orgUserSelector(data) { + return request('userSelector', data, 'get') } } diff --git a/snowy-admin-web/src/api/components/Selector/orgSelectorPlusApi.js b/snowy-admin-web/src/api/components/Selector/orgSelectorPlusApi.js deleted file mode 100644 index 10c70e67..00000000 --- a/snowy-admin-web/src/api/components/Selector/orgSelectorPlusApi.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright [2022] [https://www.xiaonuo.vip] - * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。 - * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip - */ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`${url}`, ...arg) -/** - * 机构选择器 - * - * @author yubaoshan - * @date 2022-09-22 22:33:20 - */ -export default { - // 获取机构分页 - orgSelector(url, data = {}) { - return request(url, data, 'get') - }, - // 获取机构树 - treeSelector(url, data = {}) { - return request(url, data, 'get') - } -} diff --git a/snowy-admin-web/src/api/components/Selector/posSelectorPlusApi.js b/snowy-admin-web/src/api/components/Selector/posSelectorPlusApi.js deleted file mode 100644 index 181e570e..00000000 --- a/snowy-admin-web/src/api/components/Selector/posSelectorPlusApi.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright [2022] [https://www.xiaonuo.vip] - * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。 - * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip - */ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`${url}`, ...arg) -/** - * 职位选择器 - * - * @author yubaoshan - * @date 2022-09-22 22:33:20 - */ -export default { - // 获取职位分页 - posSelector(url, data = {}) { - return request(url, data, 'get') - }, - // 获取机构树 - treeSelector(url, data = {}) { - return request(url, data, 'get') - } -} diff --git a/snowy-admin-web/src/api/components/Selector/roleSelectorPlusApi.js b/snowy-admin-web/src/api/components/Selector/roleSelectorPlusApi.js deleted file mode 100644 index c3de6289..00000000 --- a/snowy-admin-web/src/api/components/Selector/roleSelectorPlusApi.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright [2022] [https://www.xiaonuo.vip] - * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。 - * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip - */ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`${url}`, ...arg) -/** - * 角色选择器 - * - * @author yubaoshan - * @date 2022-09-22 22:33:20 - */ -export default { - // 获取角色分页 - roleSelector(url, data = {}) { - return request(url, data, 'get') - }, - // 获取机构树分页 - treeSelector(url, data = {}) { - return request(url, data, 'get') - } -} diff --git a/snowy-admin-web/src/api/components/Selector/userSelectorPlusApi.js b/snowy-admin-web/src/api/components/Selector/userSelectorPlusApi.js deleted file mode 100644 index 0ac3c90d..00000000 --- a/snowy-admin-web/src/api/components/Selector/userSelectorPlusApi.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright [2022] [https://www.xiaonuo.vip] - * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。 - * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip - */ -import { baseRequest } from '@/utils/request' - -const request = (url, ...arg) => baseRequest(`${url}`, ...arg) -/** - * 用户选择器 - * - * @author yubaoshan - * @date 2022-09-22 22:33:20 - */ -export default { - // 获取用户分页 - userSelector(url, data = {}) { - return request(url, data, 'get') - }, - // 获取机构树 - treeSelector(url, data = {}) { - return request(url, data, 'get') - } -} diff --git a/snowy-admin-web/src/api/sys/orgApi.js b/snowy-admin-web/src/api/sys/orgApi.js index 6768a9cf..89aeb76d 100644 --- a/snowy-admin-web/src/api/sys/orgApi.js +++ b/snowy-admin-web/src/api/sys/orgApi.js @@ -41,5 +41,13 @@ export default { // 获取组织详情 orgDetail(data) { return request('detail', data, 'get') + }, + // 获取组织树选择器 + orgOrgTreeSelector(data) { + return request('orgTreeSelector', data, 'get') + }, + // 获取用户选择器 + orgUserSelector(data) { + return request('userSelector', data, 'get') } } diff --git a/snowy-admin-web/src/api/sys/roleApi.js b/snowy-admin-web/src/api/sys/roleApi.js index eabd7925..042d0dc5 100644 --- a/snowy-admin-web/src/api/sys/roleApi.js +++ b/snowy-admin-web/src/api/sys/roleApi.js @@ -85,5 +85,13 @@ export default { // 获取权限授权树 rolePermissionTreeSelector(data) { return request('permissionTreeSelector', data, 'get') + }, + // 获取角色选择器 + roleRoleSelector(data) { + return request('roleSelector', data, 'get') + }, + // 获取用户选择器 + roleUserSelector(data) { + return request('userSelector', data, 'get') } } diff --git a/snowy-admin-web/src/api/sys/userCenterApi.js b/snowy-admin-web/src/api/sys/userCenterApi.js index 5e04873e..c8d508af 100644 --- a/snowy-admin-web/src/api/sys/userCenterApi.js +++ b/snowy-admin-web/src/api/sys/userCenterApi.js @@ -81,5 +81,21 @@ export default { // 读取登录用户站内信详情 userLoginUnreadMessageDetail(data) { return request('loginUnreadMessageDetail', data, 'get') + }, + // 根据id集合获取组织集合 + userCenterGetOrgListByIdList(data) { + return request('getOrgListByIdList', data) + }, + // 根据id集合获取用户集合 + userCenterGetUserListByIdList(data) { + return request('getUserListByIdList', data) + }, + // 根据id集合获取职位集合 + userCenterGetPositionListByIdList(data) { + return request('getPositionListByIdList', data) + }, + // 根据id集合获取角色集合 + userCenterGetRoleListByIdList(data) { + return request('getRoleListByIdList', data) } } diff --git a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue index 3452f4d4..3cb0bdd3 100644 --- a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue @@ -44,6 +44,7 @@ :columns="commons" :data-source="tableData" :expand-row-by-click="true" + :loading="pageLoading" bordered > +
+ +
@@ -71,6 +83,7 @@ :columns="selectedCommons" :data-source="selectedData" :expand-row-by-click="true" + :loading="selectedTableListLoading" bordered >