hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into warunee-dev

Browse source 
# Conflicts:
#	src/modules/11_discipline/store/ComplaintsStore.ts
This commit is contained in:
Warunee Tamkoo 2023-11-30 18:04:34 +07:00
commit a6dfc53ef5
17 changed files with 745 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/09_leave/api.leave.ts
View file

@ -20,5 +20,6 @@ export default {
/** รายการลา*/
leaveType: () => `${leave}/type`,
leaveList: () => `${leave}/admin`,
leaveListDelete: () => `${leave}/admin/delete`,
leaveListById: (id: string) => `${leave}/admin/${id}`,
};

7
src/api/11_discipline/api.discipline.ts
View file

@ -2,6 +2,7 @@ import env from "../index";
const disciplineMain = `${env.API_URI}/discipline`;
const discipline = `${env.API_URI}/discipline/disciplinary`;
const investigate = `${env.API_URI}/discipline/investigate`;
const suspend = `${env.API_URI}/discipline/suspend`;
export default {
directorList: (page: number, pageSize: number, keyword: string) =>
@ -65,4 +66,10 @@ export default {
/** รายการผลการพิจารณาทางวินัย*/
listResult: () => `${disciplineMain}/result`,
listResultById: (id: string) => `${disciplineMain}/result/${id}`,
/** ผู้ถูกพักราชการ */
suspendMain:(page: number, pageSize: number, keyword: string) => `${suspend}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
suspendById: (id: string) => `${suspend}/${id}`,
suspendReport: () => `${suspend}/report`,
};