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

Merge branch 'develop' into dev-tee

Browse source 
# Conflicts:
#	src/api/index.ts
#	src/modules/05_placement/router.ts
This commit is contained in:
setthawutttty 2023-08-15 14:01:59 +07:00
commit 314d7113bf
22 changed files with 1341 additions and 1472 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/05_placement/api.placement.ts
View file

@ -93,6 +93,7 @@ export default {
//receive ระบบรับโอน
receiveData: () => `${receive}`,
receiveReport: `${receive}/report`,
receiveDataId: (id: string) => `${receive}/${id}`,
receivePosition: (id: string) => `${receive}/position/${id}`,

57
src/api/06_retirement/api.retirement.ts
View file

@ -1,36 +1,37 @@
import env from "../index";
const retirement = `${env.API_URI}/retirement`
const retirementDischarge = `${retirement}/discharge`
const retirementExpulsion = `${retirement}/expulsion`
const retirementOut = `${retirement}/out`
const retirement = `${env.API_URI}/retirement`;
const retirementDischarge = `${retirement}/discharge`;
const retirementExpulsion = `${retirement}/expulsion`;
const retirementOut = `${retirement}/out`;
export default {
profile: (type: string, year: string) => `${retirement}/profile/${type}/${year}`,
profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`,
listRetire: (retireId: string) => `${retirement}/${retireId}`,
createnote: () => `${retirement}/edit`,
removeProfile: () => `${retirement}/remove`,
reasonId: (retireId: string) => `${retirement}/reason/${retireId}`,
retirement: (type: string, year: string) => `${retirement}/${type}/${year}`,
createProfile: () => `${retirement}/profile`,
profile: (type: string, year: string) =>
`${retirement}/profile/${type}/${year}`,
profileRetire: (retireProfileId: string) =>
`${retirement}/profile/${retireProfileId}`,
listRetire: (retireId: string) => `${retirement}/${retireId}`,
createnote: () => `${retirement}/edit`,
removeProfile: () => `${retirement}/remove`,
reasonId: (retireId: string) => `${retirement}/reason/${retireId}`,
retirement: (type: string, year: string) => `${retirement}/${type}/${year}`,
createProfile: () => `${retirement}/profile`,
//RetirementDeceased ถึงแก่กรรม
listDeceased: () => `${retirement}/deceased`,
detailDeceased: (id: string) => `${retirement}/deceased/${id}`,
//RetirementDeceased ถึงแก่กรรม
listDeceased: () => `${retirement}/deceased`,
detailDeceased: (id: string) => `${retirement}/deceased/${id}`,
// RetirementResign ระบบลาออก
listResign: () => `${retirement}/resign`,
resingByid: (id: string) => `${retirement}/resign/${id}`,
resignConfirm: (id: string) => `${retirement}/resign/confirm/${id}`,
resignReject: (id: string) => `${retirement}/resign/reject/${id}`,
// RetirementResign ระบบลาออก
listResign: () => `${retirement}/resign`,
resignReport: `${retirement}/resign/report`,
resingByid: (id: string) => `${retirement}/resign/${id}`,
resignConfirm: (id: string) => `${retirement}/resign/confirm/${id}`,
resignReject: (id: string) => `${retirement}/resign/reject/${id}`,
// ปลดออก
retirementDischarge,
// ปลดออก
retirementDischarge,
// ไล่ออก
retirementExpulsion,
// ให้ออก
retirementOut
// ไล่ออก
retirementExpulsion,
// ให้ออก
retirementOut,
};

3
src/api/index.ts
View file

@ -26,7 +26,8 @@ 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://ehr.joolsoft.com/v1",
API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1",
// API_PROBATION_URI: "http://192.168.1.151:7776/v1",
},
test: {