From 97efaf4712ce53e6c3d3608694a03df6edeebc09 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 18 Jul 2024 16:42:53 +0700 Subject: [PATCH 01/13] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=20=3D>=20UI=20=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A2=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=99=E0=B8=84=E0=B8=B3=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87?= =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DialogAddPetiton.vue | 149 +++++++++ .../10_registry/interface/index/Main.ts | 6 + src/modules/10_registry/router.ts | 24 +- src/modules/10_registry/store/RequestEdit.ts | 36 +++ src/modules/10_registry/views/main.vue | 16 +- .../10_registry/views/requestEditMain.vue | 289 ++++++++++++++++++ 6 files changed, 516 insertions(+), 4 deletions(-) create mode 100644 src/modules/10_registry/components/DialogAddPetiton.vue create mode 100644 src/modules/10_registry/interface/index/Main.ts create mode 100644 src/modules/10_registry/store/RequestEdit.ts create mode 100644 src/modules/10_registry/views/requestEditMain.vue diff --git a/src/modules/10_registry/components/DialogAddPetiton.vue b/src/modules/10_registry/components/DialogAddPetiton.vue new file mode 100644 index 0000000..5879160 --- /dev/null +++ b/src/modules/10_registry/components/DialogAddPetiton.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/modules/10_registry/interface/index/Main.ts b/src/modules/10_registry/interface/index/Main.ts new file mode 100644 index 0000000..a2567bc --- /dev/null +++ b/src/modules/10_registry/interface/index/Main.ts @@ -0,0 +1,6 @@ +interface DataOption { + id: string; + name: string; +} + +export type { DataOption }; diff --git a/src/modules/10_registry/router.ts b/src/modules/10_registry/router.ts index 8797400..2dbae2c 100644 --- a/src/modules/10_registry/router.ts +++ b/src/modules/10_registry/router.ts @@ -1,12 +1,20 @@ // registry const registryPage = () => import("@/modules/10_registry/views/main.vue"); -const registryInformation = () => import("@/modules/10_registry/tabs/01_information.vue"); -const registryGovernment = () => import("@/modules/10_registry/tabs/02_government.vue"); +const registryInformation = () => + import("@/modules/10_registry/tabs/01_information.vue"); +const registryGovernment = () => + import("@/modules/10_registry/tabs/02_government.vue"); const registrySalary = () => import("@/modules/10_registry/tabs/03_salary.vue"); -const registryAchievement = () => import("@/modules/10_registry/tabs/04_Achievement.vue"); +const registryAchievement = () => + import("@/modules/10_registry/tabs/04_Achievement.vue"); const registryOther = () => import("@/modules/10_registry/tabs/05_other.vue"); +/** + * คำร้องแก้ไข + */ +const requestEditMain = () => import("@/modules/10_registry/views/requestEditMain.vue"); + export default [ { path: "/registry", @@ -63,4 +71,14 @@ export default [ Key: [10], }, }, + + { + path: "/registry/request-edit", + name: "request-edit", + component: requestEditMain, + meta: { + Auth: true, + Key: [10], + }, + }, ]; diff --git a/src/modules/10_registry/store/RequestEdit.ts b/src/modules/10_registry/store/RequestEdit.ts new file mode 100644 index 0000000..eb8e82c --- /dev/null +++ b/src/modules/10_registry/store/RequestEdit.ts @@ -0,0 +1,36 @@ +import { defineStore } from "pinia"; +import { ref } from "vue"; +import type { DataOption } from "@/modules/10_registry/interface/index/Main"; + +export const useRequestEditStore = defineStore("requestEditStore", () => { + const optionTopic = ref([ + "ขอแก้ไขคำนำหน้านาม ชื่อ นามสกุล", + "ขอแก้ไขรูปภาพประจำตัว", + "ขอแก้ไขชื่อ - นามสกุล คู่สมรส", + "ขอแก้ไขชื่อ - นามสกุล บิดา", + "ขอแก้ไขชื่อ - นามสกุล มารดา", + "ขอแก้ไขข้อมูลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์/เหรียญจักรพรรดิมาลา", + "ขอแก้ไขประกาศเกียรติคุณ", + "ขอแก้ไขข้อมูลประวัติการศึกษา", + ]); + const optionStatus = ref([ + { id: "", name: "ทั้งหมด" }, + { id: "PENDING", name: "รอดำเนินการ" }, + { id: "COMPLETE", name: "ดำเนินการแก้ไขแล้ว" }, + { id: "REJECT", name: "ไม่อนุมัตการแก้ไข" }, + ]); + + function convertStatus(val: string) { + switch (val) { + case "PENDING": + return "รอดำเนินการ"; + case "COMPLETE": + return "ดำเนินการแก้ไขแล้ว"; + case "REJECT": + return "ไม่อนุมัตการแก้ไข"; + default: + return "-"; + } + } + return { convertStatus, optionTopic, optionStatus }; +}); diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue index 9be68b5..b8c45a3 100644 --- a/src/modules/10_registry/views/main.vue +++ b/src/modules/10_registry/views/main.vue @@ -150,6 +150,13 @@ const clickBack = () => { router.push(`/`); }; +/** + * function redirect ไปหน้ารายการคำร้องขอแก้ไขข้อมูล + */ +function redirectToPagePetition() { + router.push(`/registry/request-edit`); +} + onMounted(async () => { store.typeProfile = "OFFICER"; await getType(); @@ -171,7 +178,14 @@ onMounted(async () => { class="q-mr-sm" @click="clickBack" /> - ข้อมูลทะเบียนประวัติ + ข้อมูลทะเบียนประวัติ + + ยื่นคำร้องขอแก้ไขข้อมูล +
diff --git a/src/modules/10_registry/views/requestEditMain.vue b/src/modules/10_registry/views/requestEditMain.vue new file mode 100644 index 0000000..f10e617 --- /dev/null +++ b/src/modules/10_registry/views/requestEditMain.vue @@ -0,0 +1,289 @@ + + + + + From f464dedc5f2664ab91387665433ec86bd80520fc Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 18 Jul 2024 18:29:58 +0700 Subject: [PATCH 02/13] =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B8=94=E0=B9=80=E0=B8=87=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?= =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5=E0=B8=B4?= =?UTF-8?q?=E0=B8=81=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/03_retire/views/addRetire.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index 8c97ac2..67cc0e3 100644 --- a/src/modules/03_retire/views/addRetire.vue +++ b/src/modules/03_retire/views/addRetire.vue @@ -128,6 +128,7 @@ const cancelResing = () => { modal.value = true; }; +const checkCancleLeave = ref(false); /** * ฟังก์ชั่นเรียกข้อมูลจาก Api * @param id ไอดีของข้อมูล @@ -141,6 +142,12 @@ const fectDataresign = async (id: string) => { tranferOrg.value = data.location; dateCommand.value = data.sendDate; dateLeave.value = data.activeDate; + + const currentDate = new Date(); + let dueDateMinusOne = new Date(data.activeDate); + dueDateMinusOne.setDate(dueDateMinusOne.getDate() - 1); + checkCancleLeave.value = currentDate < dueDateMinusOne; + noteReason.value = data.reason; files.value = data.docs; dataDetail.value = data; @@ -561,6 +568,7 @@ function downloadFile(data: string) {
+ Date: Thu, 18 Jul 2024 18:50:02 +0700 Subject: [PATCH 03/13] fixing --- src/modules/03_retire/views/addRetire.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index 67cc0e3..f8f3546 100644 --- a/src/modules/03_retire/views/addRetire.vue +++ b/src/modules/03_retire/views/addRetire.vue @@ -579,6 +579,8 @@ function downloadFile(data: string) { v-if=" dataDetail.status !== 'DELETE' && dataDetail.status !== 'CANCEL' && + dataDetail.status !== 'DONECANCEL' && + dataDetail.status !== 'DONEREJECT' && checkCancleLeave " unelevated From 857f19e22f68f0206efeb09483daf324b343a4f0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 19 Jul 2024 17:58:45 +0700 Subject: [PATCH 04/13] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A2=E0=B8=B7=E0=B9=88=E0=B8=99=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=82=E0=B8=AD?= =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/org/api.org.ts | 5 + ...ddPetiton.vue => DialogAddRequestEdit.vue} | 120 ++++++++- .../10_registry/interface/index/Main.ts | 9 +- .../10_registry/interface/response/Main.ts | 14 + .../10_registry/views/requestEditMain.vue | 239 +++++++++++++++--- 5 files changed, 337 insertions(+), 50 deletions(-) rename src/modules/10_registry/components/{DialogAddPetiton.vue => DialogAddRequestEdit.vue} (60%) create mode 100644 src/modules/10_registry/interface/response/Main.ts diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts index 4eae586..8a7edfd 100644 --- a/src/api/org/api.org.ts +++ b/src/api/org/api.org.ts @@ -76,4 +76,9 @@ export default { profileNewProvince: `${metadata}province`, profileNewDistrictByPId: (id: string) => `${metadata}province/${id}`, profileNewSubDistrictByDId: (id: string) => `${metadata}district/${id}`, + + /** + * รายการคำร้องขอแก้ไขข้อมูลทะเบียนประวัติ + */ + requestEdit: `${profileOrg}/edit/`, }; diff --git a/src/modules/10_registry/components/DialogAddPetiton.vue b/src/modules/10_registry/components/DialogAddRequestEdit.vue similarity index 60% rename from src/modules/10_registry/components/DialogAddPetiton.vue rename to src/modules/10_registry/components/DialogAddRequestEdit.vue index 5879160..4bc22f0 100644 --- a/src/modules/10_registry/components/DialogAddPetiton.vue +++ b/src/modules/10_registry/components/DialogAddRequestEdit.vue @@ -1,8 +1,10 @@