Skip to content

Commit

Permalink
refact(user): change employee to user
Browse files Browse the repository at this point in the history
  • Loading branch information
Matrix-X committed May 30, 2024
1 parent 3e53b8e commit 5b46da4
Show file tree
Hide file tree
Showing 51 changed files with 715 additions and 491 deletions.
4 changes: 2 additions & 2 deletions doc/Develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const Home: AppRouteRecordRaw = {
// 子级Route组件会被嵌入到PageLayout, 即内容区域
component: () => import('@/views/home/index.vue'),
meta: {
locale: 'menu.admin.employee',
locale: 'menu.admin.user',
// 登录态
requiresAuth: true,
// 路由所需角色, ['*']允许所有角色
Expand All @@ -79,4 +79,4 @@ const Home: AppRouteRecordRaw = {
}
],
};
```
```
32 changes: 28 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@fullcalendar/timegrid": "^6.1.6",
"@fullcalendar/vue3": "^6.1.6",
"@vueuse/core": "^9.3.0",
"@yaoyaochi/weyui": "^1.4.0",
"@yaoyaochi/weyui": "^1.4.7",
"axios": "^0.24.0",
"dayjs": "^1.11.7",
"lodash": "^4.17.21",
Expand Down Expand Up @@ -83,6 +83,7 @@
"prettier": "^3.0.3",
"rollup": "3.29.4",
"rollup-plugin-visualizer": "5.9.2",
"sass": "^1.69.5",
"stylelint": "^15.10.3",
"stylelint-config-rational-order-fix": "^0.1.9",
"stylelint-config-recommended-vue": "^1.5.0",
Expand Down
35 changes: 16 additions & 19 deletions src/api/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Pagination } from '@/types/global';
* @version v1
*/

export interface EmployeeOption {
export interface UserOption {
id: number;
avatar: string;
account: string;
Expand All @@ -17,43 +17,40 @@ export interface EmployeeOption {
phoneNumber: string;
}

export interface GetEmployeeOptionsRequest extends Pagination {
export interface GetUserOptionsRequest extends Pagination {
likeName?: string;
likeEmail?: string;
likePhoneNumber?: string;
}

export interface GetEmployeeOptionsReply extends Pagination {
list: EmployeeOption[];
export interface GetUserOptionsReply extends Pagination {
list: UserOption[];
}

export function getEmployeeOptions(request: GetEmployeeOptionsRequest) {
return axios.get<GetEmployeeOptionsReply>(
'/api/v1/admin/common/options/employees',
{
params: request,
},
);
export function getUserOptions(request: GetUserOptionsRequest) {
return axios.get<GetUserOptionsReply>('/api/v1/admin/common/options/users', {
params: request,
});
}

export interface EmployeeQueryRoleOption {
export interface UserQueryRoleOption {
roleCode: string;
roleName: string;
}

export interface EmployeeQueryDepartmentOption {
export interface UserQueryDepartmentOption {
departmentId: number;
departmentName: string;
}

export interface GetEmployeeQueryOptionsReply {
roles: EmployeeQueryRoleOption[];
departments: EmployeeQueryDepartmentOption[];
export interface GetUserQueryOptionsReply {
roles: UserQueryRoleOption[];
departments: UserQueryDepartmentOption[];
}

export function getEmployeeQueryOptions() {
return axios.get<GetEmployeeQueryOptionsReply>(
'/api/v1/admin/common/options/employee-query',
export function getUserQueryOptions() {
return axios.get<GetUserQueryOptionsReply>(
'/api/v1/admin/common/options/user-query',
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/api/crm/market/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const UriStore = '/stores';

export interface Store extends PowerModel, MediaSet {
name: string;
employeeId?: number;
userId?: number;
contactNumber: string;
address: string;
description: string;
Expand Down
2 changes: 1 addition & 1 deletion src/api/crm/product-service/artisan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { MediaSet } from '@/api/media-resource';
const UriArtisan = '/artisans';

export interface Artisan extends PowerModel, MediaSet {
employeeId?: number;
userId?: number;
name: string;
level?: number;
gender: boolean;
Expand Down
161 changes: 0 additions & 161 deletions src/api/employee.ts

This file was deleted.

Loading

0 comments on commit 5b46da4

Please sign in to comment.