Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop
# Conflicts: # src/api/06_retirement/api.retirement.ts
This commit is contained in:
commit
ecbd8f5518
8 changed files with 1151 additions and 212 deletions
|
|
@ -1,8 +1,4 @@
|
|||
/**
|
||||
* api พ้นจากราชการ
|
||||
*/
|
||||
import env from "../index";
|
||||
|
||||
const retirement = `${env.API_URI}/retirement`
|
||||
|
||||
|
||||
|
|
@ -12,6 +8,7 @@ export default {
|
|||
getprofileRetire: (retireId: string) => `${retirement}/${retireId}`,
|
||||
createnote: () => `${retirement}/reason/`,
|
||||
reasonId: (retireId:string) => `${retirement}/reason/${retireId}`,
|
||||
retirement:(type:string) => `${retirement}/${type}/2023`
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ const config = ref<any>({
|
|||
API_URI_ORG_TREE:
|
||||
"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",
|
||||
},
|
||||
test: {
|
||||
API_URI: "http://localhost:5010/api/v1",
|
||||
|
|
@ -65,6 +66,9 @@ const API_URI_PROFILE_SERVICE = ref<string>(
|
|||
const API_PLACEMENT_URI = ref<string>(
|
||||
config.value[env.value].API_PLACEMENT_URI
|
||||
);
|
||||
const API_RETIREMENT_URI = ref<string>(
|
||||
config.value[env.value].API_RETIREMENT_URI
|
||||
);
|
||||
const API_URI_ORG_TREE = ref<string>(config.value[env.value].API_URI_ORG_TREE);
|
||||
|
||||
export default {
|
||||
|
|
@ -79,4 +83,5 @@ export default {
|
|||
API_PLACEMENT_URI: API_PLACEMENT_URI.value,
|
||||
API_URI_ORG_TREE: API_URI_ORG_TREE.value,
|
||||
MEET_URI: MEET_URI.value,
|
||||
API_RETIREMENT_URI:API_RETIREMENT_URI.value,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -180,4 +180,5 @@ export default {
|
|||
`${profile}changeName/history/${profileId}`,
|
||||
|
||||
profileCitizenId: (citizenId: string) => `${profile}citizenId/${citizenId}`,
|
||||
profileEmployeeIn: `${profile}information/employee`,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue