Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/05_placement/router.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-08-15 18:02:40 +07:00
commit ce4712a199
12 changed files with 2130 additions and 17 deletions

View file

@ -120,6 +120,7 @@ export default {
officerDetail: (id: string) => `${placement}/officer/${id}`,
officerMainDelete: (id: string) => `${placement}/officer/${id}`,
officerMainReport: () => `${placement}/officer/report`,
officerMainEdit: (id:string) => `${placemenHelpGov}/${id}`,
// ส่งตัวกลับ
placemenRepatriation,
@ -127,9 +128,15 @@ export default {
repatriationDetail: (id: string) => `${placement}/repatriation/${id}`,
repatriationMainDelete: (id: string) => `${placement}/repatriation/${id}`,
repatriationMainReport: () => `${placement}/repatriation/report`,
repatriationMainEdit: (id:string) => `${placemenRepatriation}/${id}`,
// ขอย้าย
placemenRelocation,
relocationMain: () => `${placement}/relocation`,
relocationDetail: (id:string) => `${placement}/relocation/${id}`,
relocationMainDelete: (id:string) => `${placement}/relocation/${id}`,
relocationMainReport: () => `${placement}/relocation/report`,
relocationMainPut: (id:string) => `${placement}/relocation/position/${id}`,
relocationMainEdit: (id:string) => `${placemenRelocation}/${id}`,
// อื่นๆ
placemenOther,
otherMain: () => `${placemenOther}`,