From 5ff5621fcb101bf5c9a858a7d073e0139167be39 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 31 Aug 2023 14:37:40 +0700 Subject: [PATCH] =?UTF-8?q?api=20=E0=B8=81=E0=B9=8D=E0=B8=B2=E0=B8=AB?= =?UTF-8?q?=E0=B8=99=E0=B8=94=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B8=94=E0=B8=AB=E0=B8=A1=E0=B8=B2=E0=B8=A2=20exit-interview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/06_retirement/api.retirement.ts | 1 + .../components/ExitInterview/exitMain.vue | 65 +++++++++++++------ 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index 9c5bb34ad..5b392ab0f 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -30,6 +30,7 @@ export default { listExitInterview: () => `${retirement}/resign/questionnaire`, ExitInterviewByid: (id: string) => `${retirement}/resign/questionnaire/${id}`, ExitInterviewReport: `${retirement}/resign/questionnaire/report`, + AppointInterview:(id: string) =>`${retirement}/resign/questionnaire/appoint/${id}`, // ปลดออก retirementDischarge, listDischarge: () => `${retirement}/discharge`, diff --git a/src/modules/06_retirement/components/ExitInterview/exitMain.vue b/src/modules/06_retirement/components/ExitInterview/exitMain.vue index 6646bfce6..843e59de4 100644 --- a/src/modules/06_retirement/components/ExitInterview/exitMain.vue +++ b/src/modules/06_retirement/components/ExitInterview/exitMain.vue @@ -13,6 +13,7 @@ import type { ResponseItems } from "@/modules/06_retirement/interface/response/e import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue"; import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue"; +import { identity } from "@fullcalendar/core/internal"; const $q = useQuasar(); //ใช้ noti quasar const router = useRouter(); @@ -117,7 +118,7 @@ const columns = ref([ const visibleColumns = ref([]); const dateBreak = ref(null); - +const id = ref(""); const filters = ref([]); const rows2 = ref([]); const columns2 = ref([]); @@ -153,13 +154,10 @@ const resetFilter = () => { filterRef.value.focus(); }; -const openModalCalendar = () => { +const openModalCalendar = (rows:any) => { openModal(); dateBreak.value = null; -}; - -const conditionPopup = () => { - closeModal(); + id.value= rows.id; }; const openModalOrder = () => { @@ -213,19 +211,14 @@ const fecthlist = async () => { hideLoader(); }); }; - -const saveOrder = async () => { - const id = selected.value.map((r) => r.id); - const body = { - id, +const saveAppoint = async () =>{ + const body = { + appointDate : dateBreak.value }; - showLoader(); await http - .post(config.API.ExitInterviewReport, body) + .put(config.API.AppointInterview(id.value),body) .then((res: any) => { - // const data = res.data.result; - // console.log(data); success($q, "ส่งไปออกคำสั่งลาออกสำเร็จ"); closeModal(); }) @@ -236,9 +229,32 @@ const saveOrder = async () => { await fecthlist(); hideLoader(); }); -}; +} +// const saveOrder = async () => { +// const id = selected.value.map((r) => r.id); +// const body = { +// id, +// }; + +// showLoader(); +// await http +// .post(config.API.ExitInterviewReport, body) +// .then((res: any) => { +// // const data = res.data.result; +// // console.log(data); +// success($q, "ส่งไปออกคำสั่งลาออกสำเร็จ"); +// closeModal(); +// }) +// .catch((e) => { +// messageError($q, e); +// }) +// .finally(async () => { +// await fecthlist(); +// hideLoader(); +// }); +// }; -