From 23beba6e253e00fdf178d8bb725d9d1de774ca4f Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 6 Dec 2023 11:33:54 +0700 Subject: [PATCH] no message --- src/api/11_discipline/api.discipline.ts | 13 +- .../2_InvestigateFacts/CalandarDialog.vue | 21 +-- .../2_InvestigateFacts/Calendar.vue | 140 +++++++----------- .../CalandarDialog.vue | 50 ++++--- .../3_InvestigateDisciplinary/Calendar.vue | 68 ++++++--- .../3_InvestigateDisciplinary/Table.vue | 35 ++--- 6 files changed, 158 insertions(+), 169 deletions(-) diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts index e9731bf54..978f0447d 100644 --- a/src/api/11_discipline/api.discipline.ts +++ b/src/api/11_discipline/api.discipline.ts @@ -16,8 +16,9 @@ export default { /**ลบ ช่องทางการร้องเรียน * @param id type */ - complaintListOp:()=>`${disciplineMain}/complaint_Channel`, - complaintChannelbyId: (id: string) => `${disciplineMain}/complaint_Channel/${id}`, + complaintListOp: () => `${disciplineMain}/complaint_Channel`, + complaintChannelbyId: (id: string) => + `${disciplineMain}/complaint_Channel/${id}`, complaintAdd: () => `${disciplineMain}/complaint`, complaintbyId: (id: string) => `${disciplineMain}/complaint/${id}`, complaintReject: (id: string) => `${disciplineMain}/complaint/reject/${id}`, @@ -46,7 +47,7 @@ export default { investigateReject: (id: string) => `${investigate}/reject/${id}`, investigateResume: (id: string) => `${investigate}/resume/${id}`, investigateApprove: (id: string) => `${investigate}/approve/${id}`, - + investigateCalendar: () => `${investigate}/calendar`, /** ระบบวินัยเรื่องสอบสวน */ disciplineDisciplinary: () => `${discipline}`, @@ -62,16 +63,18 @@ export default { disciplinaryResume: (id: string) => `${discipline}/resume/${id}`, disciplinaryApprove: (id: string) => `${discipline}/approve/${id}`, disciplinarySuspend: (id: string) => `${discipline}/suspend/${id}`, + disciplinaryCalendar: () => `${discipline}/calendar`, /** รายการผลการพิจารณาทางวินัย*/ listResult: () => `${disciplineMain}/result`, listResultById: (id: string) => `${disciplineMain}/result/${id}`, /** ผู้ถูกพักราชการ */ - suspendMain:(page: number, pageSize: number, keyword: string) => `${suspend}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, + suspendMain: (page: number, pageSize: number, keyword: string) => + `${suspend}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, suspendById: (id: string) => `${suspend}/${id}`, suspendReport: () => `${suspend}/report`, - reportresult:(id:string)=>`${disciplineMain}/result/report/${id}`, + reportresult: (id: string) => `${disciplineMain}/result/report/${id}`, }; diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue index b7faab59d..59df5232c 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue @@ -14,7 +14,7 @@ const props = defineProps({ }); diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Calendar.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Calendar.vue index 24beb865d..a061b9dd9 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Calendar.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Calendar.vue @@ -7,14 +7,18 @@ import timeGridPlugin from "@fullcalendar/timegrid"; import interactionPlugin from "@fullcalendar/interaction"; import allLocales from "@fullcalendar/core/locales-all"; import listPlugin from "@fullcalendar/list"; +import { useQuasar } from "quasar"; +import config from "@/app.config"; +import http from "@/plugins/http"; + +import type { DataDateMonthObject } from "@/modules/09_leave/interface/response/leave"; import { useCounterMixin } from "@/stores/mixin"; const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง -const { monthYear2Thai, showLoader, hideLoader } = mixin; - -import type { DataDateMonthObject } from "@/modules/09_leave/interface/response/leave"; +const { monthYear2Thai, showLoader, hideLoader, messageError } = mixin; +const $q = useQuasar(); /** * Option ของปฏิทิน */ @@ -48,64 +52,7 @@ const calendarOptions = ref({ eventBorderColor: "#50a5fc", displayEventTime: false, editable: true, - events: [ - { - groupId: "3", - title: "ลากิจส่วนตัว", - start: "2023-10-10", - allDay: true, - status: "done", - color: "#E3FDDA", - }, - { - groupId: "3", - title: "ลากิจส่วนตัว", - start: "2023-11-10", - allDay: true, - status: "done", - color: "#E3FDDA", - }, - { - groupId: "3", - title: "ลากิจส่วนตัว", - start: "2023-10-11", - allDay: true, - status: "done", - color: "#E3FDDA", - }, - { - groupId: "3", - title: "ลากิจส่วนตัว", - start: "2023-10-12", - allDay: true, - status: "done", - color: "#E3FDDA", - }, - { - groupId: "3", - title: "ลากิจส่วนตัว", - start: "2023-10-13", - allDay: true, - status: "done", - color: "#E3FDDA", - }, - { - groupId: "2", - title: "ลาป่วย", - start: "2023-10-19", - allDay: true, - status: "proceed", - color: "#e4f3ff", - }, - { - groupId: "1", - title: "ลาป่วย", - start: "2023-10-20", - allDay: true, - status: "new", - color: "#FFF1CC", - }, - ], + events: [], }); /** @@ -124,26 +71,53 @@ const reason = ref("ยกเลิกการลา"); const model = ref(null); const modeCancel = ref(true); +async function fetchCalendar() { + showLoader(); + await http + .post(config.API.investigateCalendar(), { + year: dateMonth.value.year, + mounth: dateMonth.value.month, + }) + .then((res) => { + console.log(res); + const data = [ + { + groupId: "2", + title: "ลากิจส่วนตัว", + start: "2023-12-12", + end: "2024-01-02", + allDay: true, + status: "done", + color: "#E3FDDA", + }, + ]; + calendarOptions.value.events = data; + }) + .catch((err) => { + messageError($q, err); + }) + .finally(() => { + setTimeout(() => { + if (fullCalendar !== undefined) { + const calen = fullCalendar.value.getApi(); + const date = new Date(dateMonth.value.year, dateMonth.value.month); + calen.gotoDate(date); + } + hideLoader(); + }, 1000); + }); +} + /** * เรียกฟังก์ชันทั้งหมดตอนเรียกใช้ไฟล์นี้ */ onMounted(async () => { - showLoader(); - setTimeout(() => { - if (fullCalendar !== undefined) { - const calen = fullCalendar.value.getApi(); - const date = new Date(dateMonth.value.year, dateMonth.value.month); - calen.gotoDate(date); - } - hideLoader(); - }, 1000); + fetchCalendar(); }); /** function เปลี่ยนปฎิทิน*/ function changCalendar() { - const calen = fullCalendar.value.getApi(); - const date = new Date(dateMonth.value.year, dateMonth.value.month); - calen.gotoDate(date); + fetchCalendar(); } /** @@ -238,7 +212,7 @@ const monthYearThai = (val: DataDateMonthObject) => {
{{ arg.event.title }}
- { round size="8px" @click="cancel(arg.event.title)" - /> + /> -->
-
+ +
{ name="mdi-circle" class="q-mr-sm" /> - สถานะอยู่ระหว่างดำเนินการ + สืบสวน
-
+
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue index 085d41dda..0666fd8fe 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Calendar.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Calendar.vue index ba2503546..432e01e2d 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Calendar.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Calendar.vue @@ -7,13 +7,18 @@ import timeGridPlugin from "@fullcalendar/timegrid"; import interactionPlugin from "@fullcalendar/interaction"; import allLocales from "@fullcalendar/core/locales-all"; import listPlugin from "@fullcalendar/list"; +import { useQuasar } from "quasar"; +import config from "@/app.config"; +import http from "@/plugins/http"; + +import type { DataDateMonthObject } from "@/modules/09_leave/interface/response/leave"; import { useCounterMixin } from "@/stores/mixin"; const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง -const { monthYear2Thai } = mixin; +const { monthYear2Thai, showLoader, hideLoader, messageError } = mixin; -import type { DataDateMonthObject } from "@/modules/09_leave/interface/response/leave"; +const $q = useQuasar(); /** * Option ของปฏิทิน @@ -123,21 +128,48 @@ const reason = ref("ยกเลิกการลา"); const model = ref(null); const modeCancel = ref(true); +async function fetchCalendar() { + showLoader(); + await http + .post(config.API.disciplinaryCalendar(), { + year: dateMonth.value.year, + mouth: dateMonth.value.month, + }) + .then((res) => { + console.log(res); + }) + .catch((err) => { + messageError($q); + }) + .finally(() => { + setTimeout(() => { + if (fullCalendar !== undefined) { + const calen = fullCalendar.value.getApi(); + const date = new Date(dateMonth.value.year, dateMonth.value.month); + calen.gotoDate(date); + } + hideLoader(); + }, 1000); + }); +} + /** * เรียกฟังก์ชันทั้งหมดตอนเรียกใช้ไฟล์นี้ */ onMounted(async () => { - if (fullCalendar !== undefined) { - const calen = fullCalendar.value.getApi(); - const date = new Date(dateMonth.value.year, dateMonth.value.month); - calen.gotoDate(date); - } + fetchCalendar(); + // if (fullCalendar !== undefined) { + // const calen = fullCalendar.value.getApi(); + // const date = new Date(dateMonth.value.year, dateMonth.value.month); + // calen.gotoDate(date); + // } }); function changCalendar() { - const calen = fullCalendar.value.getApi(); - const date = new Date(dateMonth.value.year, dateMonth.value.month); - calen.gotoDate(date); + fetchCalendar(); + // const calen = fullCalendar.value.getApi(); + // const date = new Date(dateMonth.value.year, dateMonth.value.month); + // calen.gotoDate(date); } /** @@ -274,7 +306,7 @@ const monthYearThai = (val: DataDateMonthObject) => {
-
+ +
{ name="mdi-circle" class="q-mr-sm" /> - สถานะอยู่ระหว่างดำเนินการ + สอบสวน
-
+
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue index 9e516f714..ce8ff48e4 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue @@ -1,10 +1,10 @@