From 7777b27cda4a28e3a1a642263fd2db697af54eb3 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 13 Dec 2023 18:06:21 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=AD=E0=B8=B8=E0=B8=97=E0=B8=98=E0=B8=A3=E0=B8=93=E0=B9=8C?= =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=97=E0=B8=B8=E0=B8=81?= =?UTF-8?q?=E0=B8=82=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/06_assess/componenst/Tab1.vue | 24 +++++++--- src/modules/06_assess/componenst/Tab2.vue | 2 +- .../router.ts | 4 +- .../store.ts | 0 .../views/Add.vue | 0 .../views/Main.vue | 46 +++++++++---------- src/router/index.ts | 2 + 7 files changed, 45 insertions(+), 33 deletions(-) rename src/modules/{06_appealComplain => 07_appealComplain}/router.ts (80%) rename src/modules/{06_appealComplain => 07_appealComplain}/store.ts (100%) rename src/modules/{06_appealComplain => 07_appealComplain}/views/Add.vue (100%) rename src/modules/{06_appealComplain => 07_appealComplain}/views/Main.vue (88%) diff --git a/src/modules/06_assess/componenst/Tab1.vue b/src/modules/06_assess/componenst/Tab1.vue index b051074..362a4fe 100644 --- a/src/modules/06_assess/componenst/Tab1.vue +++ b/src/modules/06_assess/componenst/Tab1.vue @@ -28,16 +28,26 @@ const $q = useQuasar(); function onCilckNextStep() { store.step < 9 && - dialogConfirm($q, () => { - store.step++; - }); + dialogConfirm( + $q, + () => { + store.step++; + }, + "ยืนยันการดำเนินการ", + "ต้องการยืนยันการดำเนินการต่อใช่หรือไม่?" + ); } function onCilckprPeviousStep() { store.step > 1 && - dialogConfirm($q, () => { - store.step--; - }); + dialogConfirm( + $q, + () => { + store.step--; + }, + "ยืนยันการย้อนกลับ", + "ต้องการย้อนกลับใช่หรือไม่?" + ); } onMounted(() => { @@ -106,7 +116,7 @@ onMounted(() => { /> diff --git a/src/modules/06_assess/componenst/Tab2.vue b/src/modules/06_assess/componenst/Tab2.vue index bf80a5f..855b460 100644 --- a/src/modules/06_assess/componenst/Tab2.vue +++ b/src/modules/06_assess/componenst/Tab2.vue @@ -106,7 +106,7 @@ onMounted(() => { /> diff --git a/src/modules/06_appealComplain/router.ts b/src/modules/07_appealComplain/router.ts similarity index 80% rename from src/modules/06_appealComplain/router.ts rename to src/modules/07_appealComplain/router.ts index 349d879..41d9493 100644 --- a/src/modules/06_appealComplain/router.ts +++ b/src/modules/07_appealComplain/router.ts @@ -2,8 +2,8 @@ * Router ขอโอน */ -const mainPage = () => import("@/modules/06_appealComplain/views/Main.vue"); -const addPage = () => import("@/modules/06_appealComplain/views/Add.vue"); +const mainPage = () => import("@/modules/07_appealComplain/views/Main.vue"); +const addPage = () => import("@/modules/07_appealComplain/views/Add.vue"); export default [ { diff --git a/src/modules/06_appealComplain/store.ts b/src/modules/07_appealComplain/store.ts similarity index 100% rename from src/modules/06_appealComplain/store.ts rename to src/modules/07_appealComplain/store.ts diff --git a/src/modules/06_appealComplain/views/Add.vue b/src/modules/07_appealComplain/views/Add.vue similarity index 100% rename from src/modules/06_appealComplain/views/Add.vue rename to src/modules/07_appealComplain/views/Add.vue diff --git a/src/modules/06_appealComplain/views/Main.vue b/src/modules/07_appealComplain/views/Main.vue similarity index 88% rename from src/modules/06_appealComplain/views/Main.vue rename to src/modules/07_appealComplain/views/Main.vue index a29b5db..59f3605 100644 --- a/src/modules/06_appealComplain/views/Main.vue +++ b/src/modules/07_appealComplain/views/Main.vue @@ -122,29 +122,29 @@ onMounted(async () => { //นำข้อมูลมาแสดง const fecthListTransfer = async () => { -// showLoader(); -// await http -// .get(config.API.listUserTransfer()) -// .then((res: any) => { -// let data = res.data.result; -// rows.value = data.map((e: any) => ({ -// id: e.id, -// date: date2Thai(e.createdAt), -// status: e.status, -// statustext: statusText(e.status), -// position: e.organizationPositionOld, -// noPos: e.posNo, -// level: e.positionLevel, -// salary: e.salary, -// transfer: e.organization, -// })); -// }) -// .catch((e: any) => { -// messageError($q, e); -// }) -// .finally(() => { -// hideLoader(); -// }); + // showLoader(); + // await http + // .get(config.API.listUserTransfer()) + // .then((res: any) => { + // let data = res.data.result; + // rows.value = data.map((e: any) => ({ + // id: e.id, + // date: date2Thai(e.createdAt), + // status: e.status, + // statustext: statusText(e.status), + // position: e.organizationPositionOld, + // noPos: e.posNo, + // level: e.positionLevel, + // salary: e.salary, + // transfer: e.organization, + // })); + // }) + // .catch((e: any) => { + // messageError($q, e); + // }) + // .finally(() => { + // hideLoader(); + // }); }; /** diff --git a/src/router/index.ts b/src/router/index.ts index bf44f39..4dc9efd 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -8,6 +8,7 @@ import ModuleRetire from "@/modules/03_retire/router"; import ModuleCheckin from "@/modules/04_checkin/router"; import ModuleLeave from "@/modules/05_leave/router"; import ModuAssesss from "@/modules/06_assess/router"; +import ModuAppealComplain from "@/modules/07_appealComplain/router"; // TODO: ใช้หรือไม่? import keycloak from "@/plugins/keycloak"; @@ -33,6 +34,7 @@ const router = createRouter({ ...ModuleCheckin, ...ModuleLeave, ...ModuAssesss, + ...ModuAppealComplain, ], }, ],