From 74b8362523128e1e114f09bbea8a16a3b96500d1 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 15 Aug 2023 13:58:07 +0700 Subject: [PATCH] no message --- src/api/05_placement/api.placement.ts | 5 ++++- src/api/index.ts | 4 ++-- .../interface/response/officer.ts | 4 ++-- src/modules/05_placement/router.ts | 22 +++++++++++++++++++ 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index f86b18453..58ced9b93 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -123,7 +123,10 @@ export default { repatriationMainReport: () => `${placement}/repatriation/report`, // ขอย้าย placemenRelocation, - + relocationMain: () => `${placement}/relocation`, + relocationDetail: (id:string) => `${placement}/relocation/${id}`, + relocationMainDelete: (id:string) => `${placement}/relocation/${id}`, + relocationMainReport: () => `${placement}/relocation/report`, // อื่นๆ placemenOther, }; diff --git a/src/api/index.ts b/src/api/index.ts index 244b63653..64e6c3ecc 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -26,8 +26,8 @@ const config = ref({ "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: "http://192.168.1.151:7776/v1", + API_PROBATION_URI: "https://ehr.joolsoft.com/v1", + // API_PROBATION_URI: "http://192.168.1.151:7776/v1", }, test: { API_URI: "http://localhost:5010/api/v1", diff --git a/src/modules/05_placement/interface/response/officer.ts b/src/modules/05_placement/interface/response/officer.ts index 64d298641..4cf58b1bb 100644 --- a/src/modules/05_placement/interface/response/officer.ts +++ b/src/modules/05_placement/interface/response/officer.ts @@ -2,8 +2,8 @@ interface officerType { no:number, id: string, prefix: string, - firstName: string, - lastName: string, + firstname: string, + lastname: string, position: string, posNo: string, positionLevel: string, diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 373a42352..72f561168 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -37,6 +37,8 @@ const RepatriationOrderAdd = () => const helpgovernmentbyId = () => import("@/modules/05_placement/components/helpgovernment/governmentDetail.vue") const repatriate = () => import("@/modules/05_placement/components/Repatriate/RepatriateMain.vue") const repatriatebyId = () => import("@/modules/05_placement/components/Repatriate/RepatriatebyId.vue") + const relocation = () => import("@/modules/05_placement/components/Relocation/RelocationMain.vue") + const relocationbyId = () => import("@/modules/05_placement/components/Relocation/RelocationbyId.vue") //รับโอน const receiveMain = () => import("@/modules/05_placement/components/Receive/receiveMain.vue"); @@ -258,4 +260,24 @@ export default [ Role: "placement", }, }, + { + path: "/relocation", + name: "relocation", + component: relocation, + meta: { + Auth: true, + Key: [6.9], + Role: "placement", + }, + }, + { + path: "/relocation/detail/:id", + name: "relocationId", + component: relocationbyId, + meta: { + Auth: true, + Key: [6.9], + Role: "placement", + }, + }, ];