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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

Browse source 
# Conflicts:
#	src/api/05_placement/api.placement.ts
#	src/modules/05_placement/components/OrderPlacement/step/step01.vue
This commit is contained in:
Thanit Konmek 2023-08-08 00:24:40 +07:00
commit d8f2a89051
16 changed files with 2518 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@ import env from "../index";
const placement = `${env.API_PLACEMENT_URI}/placement`;
const orgTree = `${env.API_URI_ORG_TREE}`;
const order = `${env.API_PLACEMENT_URI}`;
const receive = `${env.API_PLACEMENT_URI}/placement/Receive`;
export default {
MainDetail: (year: number) => `${placement}/exam/${year}`,
@ -56,11 +57,12 @@ export default {
// order
yearOptionsOrder: () => `${order}/order/fiscal-year`,
listOrder: () => `${order}/order`,
detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`,
deleteOrder: (orderId: string) => `${order}/order/${orderId}`,
typeOrder: () => `${order}/order/order-type`,
createOrder: () => `${order}/order/detail`,
detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`,
examroundOrder: () => `${order}/order/detail/exam-round`,
//ข้อมูลเลือกรายชื่อออกคำสั่ง, ลบรายชื่อ
@ -96,4 +98,9 @@ export default {
`${order}/order/attachment/file/${orderId}`,
orderReady: (id: string) => `${order}/order/ready/${id}`,
attachmentOrder: (orderId: string) => `${order}/order/attachment/${orderId}`,
receiveData: () => `${receive}`,
receiveDataId: (id: string) => `${receive}/${id}`,
receivePosition: (id: string) => `${receive}/position/${id}`,
};

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

@ -6,7 +6,9 @@ export default {
profile: (type: string, year: string) => `${retirement}/profile/${type}/${year}`,
profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`,
listRetire: (retireId: string) => `${retirement}/${retireId}`,
createnote: () => `${retirement}/reason`,
reasonId: (retireId:string) => `${retirement}/reason/${retireId}`,
retirement:(type:string,year:string) => `${retirement}/${type}/${year}`
createnote: () => `${retirement}/edit`,
removeProfile: () => `${retirement}/remove`,
reasonId: (retireId: string) => `${retirement}/reason/${retireId}`,
retirement: (type: string, year: string) => `${retirement}/${type}/${year}`,
createProfile: () => `${retirement}/profile`,
};