diff --git a/src/api/02_organizational/api.treelist.ts b/src/api/02_organizational/api.treelist.ts index 215036604..063b8af04 100644 --- a/src/api/02_organizational/api.treelist.ts +++ b/src/api/02_organizational/api.treelist.ts @@ -89,4 +89,6 @@ export default { organizationEmployeePositionId: (profileId: string) => `${organizationEmployee}position/${profileId}`, + organizationEmployeeSendOrder: `${organizationEmployee}report`, + }; diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index f844d90b4..775d8d572 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -61,6 +61,8 @@ export default { `${placement}/position/clear/${personalId}`, // order + organizationsOrder: () => `${order}/order/organizations`, + approverOC: (id: string) => `${order}/order/approver/${id}`, yearOptionsOrder: () => `${order}/order/fiscal-year`, listOrder: () => `${order}/order`, detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`, @@ -96,6 +98,7 @@ export default { receiveReport: `${receive}/report`, receiveDataId: (id: string) => `${receive}/${id}`, receivePosition: (id: string) => `${receive}/position/${id}`, + receiveDataPosition: () => `${receive}/use`, //tranfer ระบบคำขอโอน transfer, @@ -113,6 +116,7 @@ export default { appointmentDelete: (id: string) => `${placement}/appointment/${id}`, appointmentPosition: (id: string) => `${placement}/appointment/position/${id}`, apppointmentReport: (id: string) => `${placement}/appointment/report/${id}`, + apppointmentPosition: () => `${placement}/appointment/use`, // ช่วยราชการ placemenHelpGov, @@ -120,7 +124,7 @@ export default { officerDetail: (id: string) => `${placement}/officer/${id}`, officerMainDelete: (id: string) => `${placement}/officer/${id}`, officerMainReport: () => `${placement}/officer/report`, - officerMainEdit: (id:string) => `${placemenHelpGov}/${id}`, + officerMainEdit: (id: string) => `${placemenHelpGov}/${id}`, // ส่งตัวกลับ placemenRepatriation, @@ -128,15 +132,17 @@ export default { repatriationDetail: (id: string) => `${placement}/repatriation/${id}`, repatriationMainDelete: (id: string) => `${placement}/repatriation/${id}`, repatriationMainReport: () => `${placement}/repatriation/report`, - repatriationMainEdit: (id:string) => `${placemenRepatriation}/${id}`, + repatriationMainEdit: (id: string) => `${placemenRepatriation}/${id}`, // ขอย้าย placemenRelocation, relocationMain: () => `${placement}/relocation`, - relocationDetail: (id:string) => `${placement}/relocation/${id}`, - relocationMainDelete: (id:string) => `${placement}/relocation/${id}`, + 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}`, + relocationMainPut: (id: string) => `${placement}/relocation/position/${id}`, + relocationMainEdit: (id: string) => `${placemenRelocation}/${id}`, + relocationMainPosition: () => `${placement}/relocation/use`, + // อื่นๆ placemenOther, otherMain: () => `${placemenOther}`, diff --git a/src/api/07_insignia/api.insignia.ts b/src/api/07_insignia/api.insignia.ts index 3d233fec5..41ccd6778 100644 --- a/src/api/07_insignia/api.insignia.ts +++ b/src/api/07_insignia/api.insignia.ts @@ -3,9 +3,19 @@ */ import env from "../index"; const insignia = `${env.API_URI}/insignia`; +const Organization = `${env.API_URI}/Organization` export default { getRoundInsignia: (id: string) => `${insignia}/period/${id}`, listRoundInsignia: (type: string) => `${insignia}/period/${type}`, editRoundInsignia: (id: string) => `${insignia}/period/${id}`, RoundInsignia: (id: string) => `${insignia}/period/${id}`, + requestInsignia: (insigniaPeriodId: string) => `${insignia}/request/${insigniaPeriodId}`, + // Type + typeOc: () => `${Organization}/history/type/หน่วยงาน`, + + + // manage + insigniaManage: (type: string) => `${insignia}/manage/${type}`, + insigniaList: (insigniaPeriodId: any, ocId: string, role: string, status: any) => `${insignia}/request/${insigniaPeriodId}/${ocId}/${role}/${status}` + }; diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index 2cde4cabd..89dd207f6 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -325,7 +325,7 @@ - + diff --git a/src/modules/05_placement/components/AppointMent/AppointmentModal.vue b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue index 8625c2b2a..64d377c5f 100644 --- a/src/modules/05_placement/components/AppointMent/AppointmentModal.vue +++ b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue @@ -30,15 +30,12 @@ let dataForm = reactive({ positionLineId: "", positionPathSideId: "", positionTypeId: "", - // salaryAmount: null, - // mouthSalaryAmount: null, - // positionSalaryAmount: null, }); onMounted(async () => { await fetchPublishFile(); await loadTreeData(); - // await fetchplacementPosition(); + await fetchplacementPosition(); }); const fetchPublishFile = async () => { await http @@ -90,17 +87,17 @@ function filterByPersonIdNull(obj: any) { } // โหลด position -// const placementPosition = ref([]); -// const fetchplacementPosition = async () => { -// await http -// .get(config.API.placementPosition()) -// .then((res: any) => { -// placementPosition.value = res.data.result; -// }) -// .catch((e: any) => { -// messageError($q, e); -// }); -// }; +const placementPosition = ref([]); +const fetchplacementPosition = async () => { + await http + .get(config.API.apppointmentPosition()) + .then((res: any) => { + placementPosition.value = res.data.result; + }) + .catch((e: any) => { + messageError($q, e); + }); +}; const search = ref(""); //reset Tree Filter @@ -191,7 +188,7 @@ const saveAppoint = async () => { // await resetFilter(); await fetchPublishFile(); await loadTreeData(); - // await fetchplacementPosition(); + await fetchplacementPosition(); hideLoader(); }); } @@ -367,10 +364,10 @@ const selectedPosition = async (data: any) => { console.log("dataForm", dataForm); }; -// const checkPosition = (val: string) => { -// const num = placementPosition.value.findIndex((e: string) => e === val); -// return num; -// }; +const checkPosition = (val: string) => { + const num = placementPosition.value.findIndex((e: string) => e === val); + return num; +}; const personal = ref(); const expanded = ref([]); @@ -506,13 +503,12 @@ function findByPerson(element: any): any { :active="selected == prop.node.keyId" @click="selectedPosition(prop.node)" :disable=" - prop.node.name != null - + prop.node.name != null || + checkPosition(prop.node.positionNumId) != -1 " active-class="my-list-link text-primary text-weight-medium" class="row items-center text-dark q-py-xs q-pl-sm rounded-borders my-list" > - (""); const positionTypeOld = ref(""); const positionLevelOld = ref(""); @@ -53,8 +54,9 @@ const fecthappointmentByid = async () => { .then((res: any) => { const data = res.data.result; appointment.value = data; - console.log(data); + // console.log(data); + profileId.value = data.profileId; title.value.fullname = `${data.firstname ?? "-"} ${data.lastname ?? "-"}`; title.value.organizationPositionOld = data.organizationPositionOld ?? "-"; title.value.positionLevelOld = data.positionLevelOld ?? "-"; @@ -131,16 +133,7 @@ const getClass = (val: boolean) => {