From 6f5a408f9ec11b9c7da48ef8525e485d4d69800d Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 14 Dec 2023 13:09:33 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=84=E0=B8=82=20?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{componenst => components}/mapCheck.vue | 0 .../tableHistory.vue | 0 src/modules/04_checkin/views/Checkin.vue | 2 +- src/modules/04_checkin/views/history.vue | 2 +- .../{componenst => components}/Calendar.vue | 2 +- .../DialogDetail.vue | 22 ++--- .../Forms/01_SickForm.vue | 0 .../Forms/03_Birth.vue | 0 .../Forms/04_HelpWifeBirthForm.vue | 0 .../Forms/05_VacationForm.vue | 0 .../Forms/06_OrdinationForm.vue | 0 .../Forms/07_HajjForm.vue | 0 .../Forms/08_MilitaryForm.vue | 0 .../Forms/09_StudyForm.vue | 0 .../Forms/10_TrainForm.vue | 0 .../Forms/11_WorkInternationalForm.vue | 0 .../Forms/12_FollowSpouseForm.vue | 0 .../Forms/13_RehabilitationForm.vue | 0 .../{componenst => components}/Forms/Form.vue | 0 .../ListCalendar.vue | 4 +- .../{componenst => components}/Table.vue | 0 .../formDetail/formCheckSelect.vue | 0 .../formDetail/formChildbirth.vue | 0 .../formDetail/formHajj.vue | 0 .../formDetail/formHoliday.vue | 0 .../formDetail/formLeave.vue | 0 .../formDetail/formLeaveToTraining.vue | 0 .../formLeaveToWorkInternational.vue | 0 .../formDetail/formMain.vue | 0 .../formDetail/formSpouse.vue | 0 .../formDetail/formStudy.vue | 0 .../formDetail/formUpasom.vue | 0 .../formVocationalRehabilitation.vue | 0 src/modules/05_leave/views/AddPage.vue | 26 +++--- src/modules/05_leave/views/Main.vue | 4 +- .../{componenst => components}/Stepper.vue | 0 .../{componenst => components}/Tab1.vue | 87 +++++++++++++++---- .../{componenst => components}/Tab2.vue | 26 +++--- .../{componenst => components}/step/step1.vue | 0 .../{componenst => components}/step/step2.vue | 11 +++ .../{componenst => components}/step/step3.vue | 0 .../{componenst => components}/step/step4.vue | 0 .../{componenst => components}/step/step5.vue | 0 .../{componenst => components}/step/step6.vue | 2 +- .../{componenst => components}/step/step7.vue | 0 .../{componenst => components}/step/step8.vue | 0 .../{componenst => components}/step/step9.vue | 0 .../viewstep/viewPDF.vue | 0 .../viewstep/viewStep1.vue | 0 .../viewstep/viewStep3.vue | 2 +- .../viewstep/viewStep7.vue | 2 +- src/modules/06_assess/views/AssessMain.vue | 4 +- 52 files changed, 132 insertions(+), 64 deletions(-) rename src/modules/04_checkin/{componenst => components}/mapCheck.vue (100%) rename src/modules/04_checkin/{componenst => components}/tableHistory.vue (100%) rename src/modules/05_leave/{componenst => components}/Calendar.vue (99%) rename src/modules/05_leave/{componenst => components}/DialogDetail.vue (97%) rename src/modules/05_leave/{componenst => components}/Forms/01_SickForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/03_Birth.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/04_HelpWifeBirthForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/05_VacationForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/06_OrdinationForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/07_HajjForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/08_MilitaryForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/09_StudyForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/10_TrainForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/11_WorkInternationalForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/12_FollowSpouseForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/13_RehabilitationForm.vue (100%) rename src/modules/05_leave/{componenst => components}/Forms/Form.vue (100%) rename src/modules/05_leave/{componenst => components}/ListCalendar.vue (98%) rename src/modules/05_leave/{componenst => components}/Table.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formCheckSelect.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formChildbirth.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formHajj.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formHoliday.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formLeave.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formLeaveToTraining.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formLeaveToWorkInternational.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formMain.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formSpouse.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formStudy.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formUpasom.vue (100%) rename src/modules/05_leave/{componenst => components}/formDetail/formVocationalRehabilitation.vue (100%) rename src/modules/06_assess/{componenst => components}/Stepper.vue (100%) rename src/modules/06_assess/{componenst => components}/Tab1.vue (59%) rename src/modules/06_assess/{componenst => components}/Tab2.vue (78%) rename src/modules/06_assess/{componenst => components}/step/step1.vue (100%) rename src/modules/06_assess/{componenst => components}/step/step2.vue (98%) rename src/modules/06_assess/{componenst => components}/step/step3.vue (100%) rename src/modules/06_assess/{componenst => components}/step/step4.vue (100%) rename src/modules/06_assess/{componenst => components}/step/step5.vue (100%) rename src/modules/06_assess/{componenst => components}/step/step6.vue (97%) rename src/modules/06_assess/{componenst => components}/step/step7.vue (100%) rename src/modules/06_assess/{componenst => components}/step/step8.vue (100%) rename src/modules/06_assess/{componenst => components}/step/step9.vue (100%) rename src/modules/06_assess/{componenst => components}/viewstep/viewPDF.vue (100%) rename src/modules/06_assess/{componenst => components}/viewstep/viewStep1.vue (100%) rename src/modules/06_assess/{componenst => components}/viewstep/viewStep3.vue (91%) rename src/modules/06_assess/{componenst => components}/viewstep/viewStep7.vue (84%) diff --git a/src/modules/04_checkin/componenst/mapCheck.vue b/src/modules/04_checkin/components/mapCheck.vue similarity index 100% rename from src/modules/04_checkin/componenst/mapCheck.vue rename to src/modules/04_checkin/components/mapCheck.vue diff --git a/src/modules/04_checkin/componenst/tableHistory.vue b/src/modules/04_checkin/components/tableHistory.vue similarity index 100% rename from src/modules/04_checkin/componenst/tableHistory.vue rename to src/modules/04_checkin/components/tableHistory.vue diff --git a/src/modules/04_checkin/views/Checkin.vue b/src/modules/04_checkin/views/Checkin.vue index 9e92aba..71a478f 100644 --- a/src/modules/04_checkin/views/Checkin.vue +++ b/src/modules/04_checkin/views/Checkin.vue @@ -263,7 +263,7 @@ import moment, { Moment } from "moment"; import { useCounterMixin } from "@/stores/mixin"; const mixin = useCounterMixin(); const { dateThai } = mixin; -// import mapCheckin from "../componenst/mapCheck.vue"; +// import mapCheckin from "../components/mapCheck.vue"; const router = useRouter(); const $q = useQuasar(); diff --git a/src/modules/04_checkin/views/history.vue b/src/modules/04_checkin/views/history.vue index 5325ab0..b52f7da 100644 --- a/src/modules/04_checkin/views/history.vue +++ b/src/modules/04_checkin/views/history.vue @@ -77,7 +77,7 @@ import type { QTableProps } from "quasar" import { ref } from "vue" import { useRouter } from "vue-router" -import Table from "@/modules/04_checkin/componenst/tableHistory.vue" +import Table from "@/modules/04_checkin/components/tableHistory.vue" const router = useRouter() diff --git a/src/modules/05_leave/componenst/Calendar.vue b/src/modules/05_leave/components/Calendar.vue similarity index 99% rename from src/modules/05_leave/componenst/Calendar.vue rename to src/modules/05_leave/components/Calendar.vue index 51d7aab..a6d8344 100644 --- a/src/modules/05_leave/componenst/Calendar.vue +++ b/src/modules/05_leave/components/Calendar.vue @@ -22,7 +22,7 @@ import type { } from "@/modules/05_leave/interface/response/leave"; /** import componest*/ -import DialogDetail from "@/modules/05_leave/componenst/DialogDetail.vue"; +import DialogDetail from "@/modules/05_leave/components/DialogDetail.vue"; /** import stort*/ import { useCounterMixin } from "@/stores/mixin"; diff --git a/src/modules/05_leave/componenst/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue similarity index 97% rename from src/modules/05_leave/componenst/DialogDetail.vue rename to src/modules/05_leave/components/DialogDetail.vue index cb502cc..47d6069 100644 --- a/src/modules/05_leave/componenst/DialogDetail.vue +++ b/src/modules/05_leave/components/DialogDetail.vue @@ -12,17 +12,17 @@ import type { } from "@/modules/05_leave/interface/response/leave"; /** import componest*/ -import FormLeave from "@/modules/05_leave/componenst/formDetail/formLeave.vue"; -import FormChildbirth from "@/modules/05_leave/componenst/formDetail/formChildbirth.vue"; -import FormHoliday from "@/modules/05_leave/componenst/formDetail/formHoliday.vue"; -import FormUpasom from "@/modules/05_leave/componenst/formDetail/formUpasom.vue"; -import FormHajj from "@/modules/05_leave/componenst/formDetail/formHajj.vue"; -import FormCheckSelect from "@/modules/05_leave/componenst/formDetail/formCheckSelect.vue"; -import FormStudy from "@/modules/05_leave/componenst/formDetail/formStudy.vue"; -import FormLeaveToTraining from "@/modules/05_leave/componenst/formDetail/formLeaveToTraining.vue"; -import FormLeaveToWorkInternational from "@/modules/05_leave/componenst/formDetail/formLeaveToWorkInternational.vue"; -import FormSpouse from "@/modules/05_leave/componenst/formDetail/formSpouse.vue"; -import FormVocationalRehabilitation from "@/modules/05_leave/componenst/formDetail/formVocationalRehabilitation.vue"; +import FormLeave from "@/modules/05_leave/components/formDetail/formLeave.vue"; +import FormChildbirth from "@/modules/05_leave/components/formDetail/formChildbirth.vue"; +import FormHoliday from "@/modules/05_leave/components/formDetail/formHoliday.vue"; +import FormUpasom from "@/modules/05_leave/components/formDetail/formUpasom.vue"; +import FormHajj from "@/modules/05_leave/components/formDetail/formHajj.vue"; +import FormCheckSelect from "@/modules/05_leave/components/formDetail/formCheckSelect.vue"; +import FormStudy from "@/modules/05_leave/components/formDetail/formStudy.vue"; +import FormLeaveToTraining from "@/modules/05_leave/components/formDetail/formLeaveToTraining.vue"; +import FormLeaveToWorkInternational from "@/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue"; +import FormSpouse from "@/modules/05_leave/components/formDetail/formSpouse.vue"; +import FormVocationalRehabilitation from "@/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue"; /** import stort*/ import { useCounterMixin } from "@/stores/mixin"; diff --git a/src/modules/05_leave/componenst/Forms/01_SickForm.vue b/src/modules/05_leave/components/Forms/01_SickForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/01_SickForm.vue rename to src/modules/05_leave/components/Forms/01_SickForm.vue diff --git a/src/modules/05_leave/componenst/Forms/03_Birth.vue b/src/modules/05_leave/components/Forms/03_Birth.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/03_Birth.vue rename to src/modules/05_leave/components/Forms/03_Birth.vue diff --git a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/Forms/04_HelpWifeBirthForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue rename to src/modules/05_leave/components/Forms/04_HelpWifeBirthForm.vue diff --git a/src/modules/05_leave/componenst/Forms/05_VacationForm.vue b/src/modules/05_leave/components/Forms/05_VacationForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/05_VacationForm.vue rename to src/modules/05_leave/components/Forms/05_VacationForm.vue diff --git a/src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue b/src/modules/05_leave/components/Forms/06_OrdinationForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/06_OrdinationForm.vue rename to src/modules/05_leave/components/Forms/06_OrdinationForm.vue diff --git a/src/modules/05_leave/componenst/Forms/07_HajjForm.vue b/src/modules/05_leave/components/Forms/07_HajjForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/07_HajjForm.vue rename to src/modules/05_leave/components/Forms/07_HajjForm.vue diff --git a/src/modules/05_leave/componenst/Forms/08_MilitaryForm.vue b/src/modules/05_leave/components/Forms/08_MilitaryForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/08_MilitaryForm.vue rename to src/modules/05_leave/components/Forms/08_MilitaryForm.vue diff --git a/src/modules/05_leave/componenst/Forms/09_StudyForm.vue b/src/modules/05_leave/components/Forms/09_StudyForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/09_StudyForm.vue rename to src/modules/05_leave/components/Forms/09_StudyForm.vue diff --git a/src/modules/05_leave/componenst/Forms/10_TrainForm.vue b/src/modules/05_leave/components/Forms/10_TrainForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/10_TrainForm.vue rename to src/modules/05_leave/components/Forms/10_TrainForm.vue diff --git a/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue b/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue rename to src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue diff --git a/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue b/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue rename to src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue diff --git a/src/modules/05_leave/componenst/Forms/13_RehabilitationForm.vue b/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/13_RehabilitationForm.vue rename to src/modules/05_leave/components/Forms/13_RehabilitationForm.vue diff --git a/src/modules/05_leave/componenst/Forms/Form.vue b/src/modules/05_leave/components/Forms/Form.vue similarity index 100% rename from src/modules/05_leave/componenst/Forms/Form.vue rename to src/modules/05_leave/components/Forms/Form.vue diff --git a/src/modules/05_leave/componenst/ListCalendar.vue b/src/modules/05_leave/components/ListCalendar.vue similarity index 98% rename from src/modules/05_leave/componenst/ListCalendar.vue rename to src/modules/05_leave/components/ListCalendar.vue index 8126a2f..01f7233 100644 --- a/src/modules/05_leave/componenst/ListCalendar.vue +++ b/src/modules/05_leave/components/ListCalendar.vue @@ -8,8 +8,8 @@ import config from "@/app.config"; import type { LeaveType } from "@/modules/05_leave/interface/response/leave"; /** import componest*/ -import DialogDetail from "@/modules/05_leave/componenst/DialogDetail.vue"; -import Table from "@/modules/05_leave/componenst/Table.vue"; +import DialogDetail from "@/modules/05_leave/components/DialogDetail.vue"; +import Table from "@/modules/05_leave/components/Table.vue"; /** import stort*/ import { useCounterMixin } from "@/stores/mixin"; diff --git a/src/modules/05_leave/componenst/Table.vue b/src/modules/05_leave/components/Table.vue similarity index 100% rename from src/modules/05_leave/componenst/Table.vue rename to src/modules/05_leave/components/Table.vue diff --git a/src/modules/05_leave/componenst/formDetail/formCheckSelect.vue b/src/modules/05_leave/components/formDetail/formCheckSelect.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formCheckSelect.vue rename to src/modules/05_leave/components/formDetail/formCheckSelect.vue diff --git a/src/modules/05_leave/componenst/formDetail/formChildbirth.vue b/src/modules/05_leave/components/formDetail/formChildbirth.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formChildbirth.vue rename to src/modules/05_leave/components/formDetail/formChildbirth.vue diff --git a/src/modules/05_leave/componenst/formDetail/formHajj.vue b/src/modules/05_leave/components/formDetail/formHajj.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formHajj.vue rename to src/modules/05_leave/components/formDetail/formHajj.vue diff --git a/src/modules/05_leave/componenst/formDetail/formHoliday.vue b/src/modules/05_leave/components/formDetail/formHoliday.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formHoliday.vue rename to src/modules/05_leave/components/formDetail/formHoliday.vue diff --git a/src/modules/05_leave/componenst/formDetail/formLeave.vue b/src/modules/05_leave/components/formDetail/formLeave.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formLeave.vue rename to src/modules/05_leave/components/formDetail/formLeave.vue diff --git a/src/modules/05_leave/componenst/formDetail/formLeaveToTraining.vue b/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formLeaveToTraining.vue rename to src/modules/05_leave/components/formDetail/formLeaveToTraining.vue diff --git a/src/modules/05_leave/componenst/formDetail/formLeaveToWorkInternational.vue b/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formLeaveToWorkInternational.vue rename to src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue diff --git a/src/modules/05_leave/componenst/formDetail/formMain.vue b/src/modules/05_leave/components/formDetail/formMain.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formMain.vue rename to src/modules/05_leave/components/formDetail/formMain.vue diff --git a/src/modules/05_leave/componenst/formDetail/formSpouse.vue b/src/modules/05_leave/components/formDetail/formSpouse.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formSpouse.vue rename to src/modules/05_leave/components/formDetail/formSpouse.vue diff --git a/src/modules/05_leave/componenst/formDetail/formStudy.vue b/src/modules/05_leave/components/formDetail/formStudy.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formStudy.vue rename to src/modules/05_leave/components/formDetail/formStudy.vue diff --git a/src/modules/05_leave/componenst/formDetail/formUpasom.vue b/src/modules/05_leave/components/formDetail/formUpasom.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formUpasom.vue rename to src/modules/05_leave/components/formDetail/formUpasom.vue diff --git a/src/modules/05_leave/componenst/formDetail/formVocationalRehabilitation.vue b/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue similarity index 100% rename from src/modules/05_leave/componenst/formDetail/formVocationalRehabilitation.vue rename to src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue index 90a65f8..5a4fba2 100644 --- a/src/modules/05_leave/views/AddPage.vue +++ b/src/modules/05_leave/views/AddPage.vue @@ -3,19 +3,19 @@ import { ref, onMounted, computed } from "vue" import { useQuasar } from "quasar" import { useRouter, useRoute } from "vue-router" -import FormPart2 from "@/modules/05_leave/componenst/Forms/Form.vue" -import SickForm from "@/modules/05_leave/componenst/Forms/01_SickForm.vue" -import FormBirth from "@/modules/05_leave/componenst/Forms/03_Birth.vue" -import HelpWifeBirthForm from "@/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue" -import VacationForm from "@/modules/05_leave/componenst/Forms/05_VacationForm.vue" -import OrdinationForm from "@/modules/05_leave/componenst/Forms/06_OrdinationForm.vue" -import HajjForm from "@/modules/05_leave/componenst/Forms/07_HajjForm.vue" -import MilitaryForm from "@/modules/05_leave/componenst/Forms/08_MilitaryForm.vue" -import StudyForm from "@/modules/05_leave/componenst/Forms/09_StudyForm.vue" -import TrainForm from "@/modules/05_leave/componenst/Forms/10_TrainForm.vue" -import WorkInternationalForm from "@/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue" -import FollowSpouseForm from "@/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue" -import RehabilitationForm from "@/modules/05_leave/componenst/Forms/13_RehabilitationForm.vue" +import FormPart2 from "@/modules/05_leave/components/Forms/Form.vue" +import SickForm from "@/modules/05_leave/components/Forms/01_SickForm.vue" +import FormBirth from "@/modules/05_leave/components/Forms/03_Birth.vue" +import HelpWifeBirthForm from "@/modules/05_leave/components/Forms/04_HelpWifeBirthForm.vue" +import VacationForm from "@/modules/05_leave/components/Forms/05_VacationForm.vue" +import OrdinationForm from "@/modules/05_leave/components/Forms/06_OrdinationForm.vue" +import HajjForm from "@/modules/05_leave/components/Forms/07_HajjForm.vue" +import MilitaryForm from "@/modules/05_leave/components/Forms/08_MilitaryForm.vue" +import StudyForm from "@/modules/05_leave/components/Forms/09_StudyForm.vue" +import TrainForm from "@/modules/05_leave/components/Forms/10_TrainForm.vue" +import WorkInternationalForm from "@/modules/05_leave/components/Forms/11_WorkInternationalForm.vue" +import FollowSpouseForm from "@/modules/05_leave/components/Forms/12_FollowSpouseForm.vue" +import RehabilitationForm from "@/modules/05_leave/components/Forms/13_RehabilitationForm.vue" import { useLeaveStore } from "@/modules/05_leave/store" import http from "@/plugins/http" import config from "@/app.config" diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue index 556a448..3c66341 100644 --- a/src/modules/05_leave/views/Main.vue +++ b/src/modules/05_leave/views/Main.vue @@ -7,8 +7,8 @@ import config from "@/app.config"; import type { QTableProps } from "quasar"; -import CalendarView from "@/modules/05_leave/componenst/Calendar.vue"; -import ListView from "@/modules/05_leave/componenst/ListCalendar.vue"; +import CalendarView from "@/modules/05_leave/components/Calendar.vue"; +import ListView from "@/modules/05_leave/components/ListCalendar.vue"; import { useCounterMixin } from "@/stores/mixin"; import { useLeaveStore } from "@/modules/05_leave/store"; diff --git a/src/modules/06_assess/componenst/Stepper.vue b/src/modules/06_assess/components/Stepper.vue similarity index 100% rename from src/modules/06_assess/componenst/Stepper.vue rename to src/modules/06_assess/components/Stepper.vue diff --git a/src/modules/06_assess/componenst/Tab1.vue b/src/modules/06_assess/components/Tab1.vue similarity index 59% rename from src/modules/06_assess/componenst/Tab1.vue rename to src/modules/06_assess/components/Tab1.vue index 362a4fe..2c10a49 100644 --- a/src/modules/06_assess/componenst/Tab1.vue +++ b/src/modules/06_assess/components/Tab1.vue @@ -2,20 +2,20 @@ import { onMounted } from "vue"; import { useQuasar } from "quasar"; -import Stepper from "@/modules/06_assess/componenst/Stepper.vue"; -import Step1 from "@/modules/06_assess/componenst/step/step1.vue"; -import Step2 from "@/modules/06_assess/componenst/step/step2.vue"; -import Step3 from "@/modules/06_assess/componenst/step/step3.vue"; -import Step4 from "@/modules/06_assess/componenst/step/step4.vue"; -import Step5 from "@/modules/06_assess/componenst/step/step5.vue"; -import Step6 from "@/modules/06_assess/componenst/step/step6.vue"; -import Step7 from "@/modules/06_assess/componenst/step/step7.vue"; -import Step8 from "@/modules/06_assess/componenst/step/step8.vue"; -import Step9 from "@/modules/06_assess/componenst/step/step9.vue"; +import Stepper from "@/modules/06_assess/components/Stepper.vue"; +import Step1 from "@/modules/06_assess/components/step/step1.vue"; +import Step2 from "@/modules/06_assess/components/step/step2.vue"; +import Step3 from "@/modules/06_assess/components/step/step3.vue"; +import Step4 from "@/modules/06_assess/components/step/step4.vue"; +import Step5 from "@/modules/06_assess/components/step/step5.vue"; +import Step6 from "@/modules/06_assess/components/step/step6.vue"; +import Step7 from "@/modules/06_assess/components/step/step7.vue"; +import Step8 from "@/modules/06_assess/components/step/step8.vue"; +import Step9 from "@/modules/06_assess/components/step/step9.vue"; -import ViewStep1 from "@/modules/06_assess/componenst/viewstep/viewStep1.vue"; -import ViewStep3 from "@/modules/06_assess/componenst/viewstep/viewStep3.vue"; -import ViewStep7 from "@/modules/06_assess/componenst/viewstep/viewStep7.vue"; +import ViewStep1 from "@/modules/06_assess/components/viewstep/viewStep1.vue"; +import ViewStep3 from "@/modules/06_assess/components/viewstep/viewStep3.vue"; +import ViewStep7 from "@/modules/06_assess/components/viewstep/viewStep7.vue"; import { useAssessStore } from "@/modules/06_assess/store"; import { useCounterMixin } from "@/stores/mixin"; @@ -30,7 +30,31 @@ function onCilckNextStep() { store.step < 9 && dialogConfirm( $q, - () => { + async () => { + const functionCreateDoc: (() => Promise) | null = + store.step === 1 + ? await saveStep1 + : store.step === 2 + ? await saveStep2 + : store.step === 3 + ? await saveStep3 + : store.step === 4 + ? await saveStep4 + : store.step === 5 + ? await saveStep5 + : store.step === 5 + ? await saveStep5 + : store.step === 6 + ? await saveStep6 + : store.step === 7 + ? await saveStep7 + : store.step === 8 + ? await saveStep8 + : store.step === 9 + ? await saveStep9 + : null; + + functionCreateDoc?.(); store.step++; }, "ยืนยันการดำเนินการ", @@ -50,6 +74,36 @@ function onCilckprPeviousStep() { ); } +function updatedFormStep2() {} + +async function saveStep1() { + console.log("Save 1"); +} +async function saveStep2() { + console.log("Save 2"); +} +async function saveStep3() { + console.log("Save 3"); +} +async function saveStep4() { + console.log("Save 4"); +} +async function saveStep5() { + console.log("Save 5"); +} +async function saveStep6() { + console.log("Save 6"); +} +async function saveStep7() { + console.log("Save 7"); +} +async function saveStep8() { + console.log("Save 8"); +} +async function saveStep9() { + console.log("Save 9"); +} + onMounted(() => { store.step = 1; }); @@ -82,7 +136,10 @@ onMounted(() => { - + diff --git a/src/modules/06_assess/componenst/Tab2.vue b/src/modules/06_assess/components/Tab2.vue similarity index 78% rename from src/modules/06_assess/componenst/Tab2.vue rename to src/modules/06_assess/components/Tab2.vue index 855b460..cec0565 100644 --- a/src/modules/06_assess/componenst/Tab2.vue +++ b/src/modules/06_assess/components/Tab2.vue @@ -2,20 +2,20 @@ import { ref, onMounted } from "vue"; import { useQuasar } from "quasar"; -import Stepper from "@/modules/06_assess/componenst/Stepper.vue"; -import Step1 from "@/modules/06_assess/componenst/step/step1.vue"; -import Step2 from "@/modules/06_assess/componenst/step/step2.vue"; -import Step3 from "@/modules/06_assess/componenst/step/step3.vue"; -import Step4 from "@/modules/06_assess/componenst/step/step4.vue"; -import Step5 from "@/modules/06_assess/componenst/step/step5.vue"; -import Step6 from "@/modules/06_assess/componenst/step/step6.vue"; -import Step7 from "@/modules/06_assess/componenst/step/step7.vue"; -import Step8 from "@/modules/06_assess/componenst/step/step8.vue"; -import Step9 from "@/modules/06_assess/componenst/step/step9.vue"; +import Stepper from "@/modules/06_assess/components/Stepper.vue"; +import Step1 from "@/modules/06_assess/components/step/step1.vue"; +import Step2 from "@/modules/06_assess/components/step/step2.vue"; +import Step3 from "@/modules/06_assess/components/step/step3.vue"; +import Step4 from "@/modules/06_assess/components/step/step4.vue"; +import Step5 from "@/modules/06_assess/components/step/step5.vue"; +import Step6 from "@/modules/06_assess/components/step/step6.vue"; +import Step7 from "@/modules/06_assess/components/step/step7.vue"; +import Step8 from "@/modules/06_assess/components/step/step8.vue"; +import Step9 from "@/modules/06_assess/components/step/step9.vue"; -import ViewStep1 from "@/modules/06_assess/componenst/viewstep/viewStep1.vue"; -import ViewStep3 from "@/modules/06_assess/componenst/viewstep/viewStep3.vue"; -import ViewStep7 from "@/modules/06_assess/componenst/viewstep/viewStep7.vue"; +import ViewStep1 from "@/modules/06_assess/components/viewstep/viewStep1.vue"; +import ViewStep3 from "@/modules/06_assess/components/viewstep/viewStep3.vue"; +import ViewStep7 from "@/modules/06_assess/components/viewstep/viewStep7.vue"; import { useAssessStore } from "@/modules/06_assess/store"; import { useCounterMixin } from "@/stores/mixin"; diff --git a/src/modules/06_assess/componenst/step/step1.vue b/src/modules/06_assess/components/step/step1.vue similarity index 100% rename from src/modules/06_assess/componenst/step/step1.vue rename to src/modules/06_assess/components/step/step1.vue diff --git a/src/modules/06_assess/componenst/step/step2.vue b/src/modules/06_assess/components/step/step2.vue similarity index 98% rename from src/modules/06_assess/componenst/step/step2.vue rename to src/modules/06_assess/components/step/step2.vue index 3da70da..ee47797 100644 --- a/src/modules/06_assess/componenst/step/step2.vue +++ b/src/modules/06_assess/components/step/step2.vue @@ -31,6 +31,16 @@ function backPage() { page.value--; } } + +async function onClickDowloadFile(tp: string, templateName: string) { + const body = { + template: tp, + reportName: templateName, + data: { + fullName: "ใจดี จังนะ", + }, + }; +}