Skip to content

Commit 5b46da4

Browse files
committed
refact(user): change employee to user
1 parent 3e53b8e commit 5b46da4

File tree

51 files changed

+715
-491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+715
-491
lines changed

doc/Develop.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const Home: AppRouteRecordRaw = {
7070
// 子级Route组件会被嵌入到PageLayout, 即内容区域
7171
component: () => import('@/views/home/index.vue'),
7272
meta: {
73-
locale: 'menu.admin.employee',
73+
locale: 'menu.admin.user',
7474
// 登录态
7575
requiresAuth: true,
7676
// 路由所需角色, ['*']允许所有角色
@@ -79,4 +79,4 @@ const Home: AppRouteRecordRaw = {
7979
}
8080
],
8181
};
82-
```
82+
```

package-lock.json

Lines changed: 28 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@fullcalendar/timegrid": "^6.1.6",
4040
"@fullcalendar/vue3": "^6.1.6",
4141
"@vueuse/core": "^9.3.0",
42-
"@yaoyaochi/weyui": "^1.4.0",
42+
"@yaoyaochi/weyui": "^1.4.7",
4343
"axios": "^0.24.0",
4444
"dayjs": "^1.11.7",
4545
"lodash": "^4.17.21",
@@ -83,6 +83,7 @@
8383
"prettier": "^3.0.3",
8484
"rollup": "3.29.4",
8585
"rollup-plugin-visualizer": "5.9.2",
86+
"sass": "^1.69.5",
8687
"stylelint": "^15.10.3",
8788
"stylelint-config-rational-order-fix": "^0.1.9",
8889
"stylelint-config-recommended-vue": "^1.5.0",

src/api/common.ts

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Pagination } from '@/types/global';
88
* @version v1
99
*/
1010

11-
export interface EmployeeOption {
11+
export interface UserOption {
1212
id: number;
1313
avatar: string;
1414
account: string;
@@ -17,43 +17,40 @@ export interface EmployeeOption {
1717
phoneNumber: string;
1818
}
1919

20-
export interface GetEmployeeOptionsRequest extends Pagination {
20+
export interface GetUserOptionsRequest extends Pagination {
2121
likeName?: string;
2222
likeEmail?: string;
2323
likePhoneNumber?: string;
2424
}
2525

26-
export interface GetEmployeeOptionsReply extends Pagination {
27-
list: EmployeeOption[];
26+
export interface GetUserOptionsReply extends Pagination {
27+
list: UserOption[];
2828
}
2929

30-
export function getEmployeeOptions(request: GetEmployeeOptionsRequest) {
31-
return axios.get<GetEmployeeOptionsReply>(
32-
'/api/v1/admin/common/options/employees',
33-
{
34-
params: request,
35-
},
36-
);
30+
export function getUserOptions(request: GetUserOptionsRequest) {
31+
return axios.get<GetUserOptionsReply>('/api/v1/admin/common/options/users', {
32+
params: request,
33+
});
3734
}
3835

39-
export interface EmployeeQueryRoleOption {
36+
export interface UserQueryRoleOption {
4037
roleCode: string;
4138
roleName: string;
4239
}
4340

44-
export interface EmployeeQueryDepartmentOption {
41+
export interface UserQueryDepartmentOption {
4542
departmentId: number;
4643
departmentName: string;
4744
}
4845

49-
export interface GetEmployeeQueryOptionsReply {
50-
roles: EmployeeQueryRoleOption[];
51-
departments: EmployeeQueryDepartmentOption[];
46+
export interface GetUserQueryOptionsReply {
47+
roles: UserQueryRoleOption[];
48+
departments: UserQueryDepartmentOption[];
5249
}
5350

54-
export function getEmployeeQueryOptions() {
55-
return axios.get<GetEmployeeQueryOptionsReply>(
56-
'/api/v1/admin/common/options/employee-query',
51+
export function getUserQueryOptions() {
52+
return axios.get<GetUserQueryOptionsReply>(
53+
'/api/v1/admin/common/options/user-query',
5754
);
5855
}
5956

src/api/crm/market/store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const UriStore = '/stores';
99

1010
export interface Store extends PowerModel, MediaSet {
1111
name: string;
12-
employeeId?: number;
12+
userId?: number;
1313
contactNumber: string;
1414
address: string;
1515
description: string;

src/api/crm/product-service/artisan.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { MediaSet } from '@/api/media-resource';
88
const UriArtisan = '/artisans';
99

1010
export interface Artisan extends PowerModel, MediaSet {
11-
employeeId?: number;
11+
userId?: number;
1212
name: string;
1313
level?: number;
1414
gender: boolean;

src/api/employee.ts

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)