Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/05_placement/router.ts

src/api/05_placement/api.placement.ts

@@ -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}`,

src/api/index.ts

@@ -26,6 +26,7 @@ const config = ref<any>({
       "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json",
     MEET_URI: "meet.frappet.com",
     API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
+    // API_PROBATION_URI: "https://ehr.joolsoft.com/v1",
     API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1",
     // API_PROBATION_URI: "http://192.168.1.151:7776/v1",
   },