diff --git a/components.d.ts b/components.d.ts
index 7d44f6d..8007ba7 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -13,6 +13,7 @@ declare module 'vue' {
export interface GlobalComponents {
AutoTooltip: typeof import('./src/components/autoTooltip/index.vue')['default']
CardItem: typeof import('./src/components/cardItem/index.vue')['default']
+ CollapseHeader: typeof import('./src/components/collapseHeader/index.vue')['default']
Comment: typeof import('./src/components/comment/index.vue')['default']
CommonFilter: typeof import('./src/components/commonFilter/index.vue')['default']
DynamicSvgIcon: typeof import('./src/components/dynamicSvgIcon/index.vue')['default']
diff --git a/src/api/index.ts b/src/api/index.ts
index c054164..f2a1e91 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -5,6 +5,11 @@ export const getRouteMenus = () => {
return request.get('/auth/v1/backend/menu');
};
+// 获取当前用户信息
+export const getUserInfo = () => {
+ return request.get('/auth/v1/my/info');
+};
+
// 登录接口
export const login = (data: { username: string; password: string }) => {
return request.post('/auth/oauth2/token', data,{
@@ -12,4 +17,13 @@ export const login = (data: { username: string; password: string }) => {
'Content-Type': 'application/x-www-form-urlencoded'
}
});
+};
+
+
+/**员工公用接口*/
+
+
+// 根据员工关键字查询员工
+export const getEmployeeList = (params: any) => {
+ return request.get('/auth/v1/employee', params);
};
\ No newline at end of file
diff --git a/src/api/stage/organization/index.ts b/src/api/stage/organization/index.ts
index 7b816f0..1f43b72 100644
--- a/src/api/stage/organization/index.ts
+++ b/src/api/stage/organization/index.ts
@@ -18,6 +18,12 @@ interface addDataProps{
wxWork:wxWorkProps;
}
+interface defaultProps{
+ keyword?:string;
+ pageNo:number;
+ pageSize:number;
+}
+
// 查询企业
export const getEnterprise = (params: paramsProps) =>{
@@ -55,4 +61,9 @@ export const getEnterpriseDetail = () => {
// 加载部门详情
export const getEnterpriseOrgDetail = (departmentId:string) => {
return request.get(`/auth/v1/backend/enterprise/department/${departmentId}`);
+}
+
+// 获取企业信息职位
+export const getEnterprisePosition = (params:defaultProps) => {
+ return request.get(`/auth/v1/backend/enterprise/position`,params);
}
\ No newline at end of file
diff --git a/src/api/stage/permission/index.ts b/src/api/stage/permission/index.ts
index b796b71..2bcf2ed 100644
--- a/src/api/stage/permission/index.ts
+++ b/src/api/stage/permission/index.ts
@@ -26,24 +26,24 @@ export const deleteRole = (id: string) => {
return request.delete(`/auth/v1/backend/role/${id}`);
}
-// 删除用户角色
-export const deleteUserRole = (userId:string,roleId: string) => {
- return request.delete(`/auth/v1/backend/role/user/${userId}/role/${roleId}`);
-}
-
-// 添加用户角色
-export const addUserRole = (userId:string,roleId: string) => {
- return request.post(`/auth/v1/backend/role/user/${userId}/role/${roleId}`);
-};
-
// 启用角色
export const enableRole = (id: string) => {
- return request.put(`/auth/v1/backend/role/enable/${id}`);
+ return request.put(`/auth/v1/backend/role/${id}/enable`);
}
// 禁用角色
export const disableRole = (id: string) => {
- return request.put(`/auth/v1/backend/role/disable/${id}`);
+ return request.put(`/auth/v1/backend/role/${id}/disable`);
+}
+
+// 复制权限
+export const copyRolePermission = (roleId: string) => {
+ return request.post(`/auth/v1/backend/role/${roleId}/copy`);
+}
+
+// 批量保存角色
+export const batchSaveRole = (roleId: string,data: number[]) => {
+ return request.post(`auth/v1/backend/role/${roleId}/members`, data);
}
/**------------------------角色权限相关---------------------------**/
diff --git a/src/components/collapseHeader/index.vue b/src/components/collapseHeader/index.vue
new file mode 100644
index 0000000..77a93e6
--- /dev/null
+++ b/src/components/collapseHeader/index.vue
@@ -0,0 +1,60 @@
+
+