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

Merge branch 'develop' into nice_dev

Browse source 
# Conflicts:
#	src/api/11_discipline/api.discipline.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-11-29 13:58:23 +07:00
parent 42c0eb669f
commit 2021296898
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import env from "../index"; import env from "../index";
const discipline = `${env.API_URI}/discipline/disciplinary`; const discipline = `${env.API_URI}/discipline/disciplinary`;
const investigate = `${env.API_URI}/discipline/investigate`; const investigate = `${env.API_URI}/discipline/investigate`;
const discipline2 = `${env.API_URI}/discipline`;
export default { export default {
directorList: (page: number, pageSize: number, keyword: string) => directorList: (page: number, pageSize: number, keyword: string) =>
@ -60,6 +61,6 @@ export default {
disciplinaryApprove: (id: string) => `${discipline}/approve/${id}`, disciplinaryApprove: (id: string) => `${discipline}/approve/${id}`,
/** รายการผลการพิจารณาทางวินัย*/ /** รายการผลการพิจารณาทางวินัย*/
listResult: () => `${discipline}/result`, listResult: () => `${discipline2}/result`,
listResultById: (id: string) => `${discipline}/result/${id}`, listResultById: (id: string) => `${discipline2}/result/${id}`,
}; };