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<void>) | 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(() => {
           <q-card flat bordered class="col-12 q-pa-md">
             <q-card-section>
               <Step1 v-if="store.step === 1" />
-              <Step2 v-if="store.step === 2" />
+              <Step2
+                v-if="store.step === 2"
+                @update:updatedForm="updatedFormStep2"
+              />
               <Step3 v-if="store.step === 3" />
               <Step4 v-if="store.step === 4" />
               <Step5 v-if="store.step === 5" />
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: "ใจดี จังนะ",
+    },
+  };
+}
 </script>
 
 <template>
@@ -112,6 +122,7 @@ function backPage() {
                   icon="download"
                   label="ดาวน์โหลดต้นแบบ"
                   color="primary"
+                  @click="onClickDowloadFile('EV1_005', 'template-2')"
                 >
                   <q-tooltip> ดาวน์โหลดต้นแบบ </q-tooltip></q-btn
                 >
diff --git a/src/modules/06_assess/componenst/step/step3.vue b/src/modules/06_assess/components/step/step3.vue
similarity index 100%
rename from src/modules/06_assess/componenst/step/step3.vue
rename to src/modules/06_assess/components/step/step3.vue
diff --git a/src/modules/06_assess/componenst/step/step4.vue b/src/modules/06_assess/components/step/step4.vue
similarity index 100%
rename from src/modules/06_assess/componenst/step/step4.vue
rename to src/modules/06_assess/components/step/step4.vue
diff --git a/src/modules/06_assess/componenst/step/step5.vue b/src/modules/06_assess/components/step/step5.vue
similarity index 100%
rename from src/modules/06_assess/componenst/step/step5.vue
rename to src/modules/06_assess/components/step/step5.vue
diff --git a/src/modules/06_assess/componenst/step/step6.vue b/src/modules/06_assess/components/step/step6.vue
similarity index 97%
rename from src/modules/06_assess/componenst/step/step6.vue
rename to src/modules/06_assess/components/step/step6.vue
index db5e625..7bbc006 100644
--- a/src/modules/06_assess/componenst/step/step6.vue
+++ b/src/modules/06_assess/components/step/step6.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import ViewPDF from "@/modules/06_assess/componenst/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
 
 const fileEvaluation1 = ref<any>();
 
diff --git a/src/modules/06_assess/componenst/step/step7.vue b/src/modules/06_assess/components/step/step7.vue
similarity index 100%
rename from src/modules/06_assess/componenst/step/step7.vue
rename to src/modules/06_assess/components/step/step7.vue
diff --git a/src/modules/06_assess/componenst/step/step8.vue b/src/modules/06_assess/components/step/step8.vue
similarity index 100%
rename from src/modules/06_assess/componenst/step/step8.vue
rename to src/modules/06_assess/components/step/step8.vue
diff --git a/src/modules/06_assess/componenst/step/step9.vue b/src/modules/06_assess/components/step/step9.vue
similarity index 100%
rename from src/modules/06_assess/componenst/step/step9.vue
rename to src/modules/06_assess/components/step/step9.vue
diff --git a/src/modules/06_assess/componenst/viewstep/viewPDF.vue b/src/modules/06_assess/components/viewstep/viewPDF.vue
similarity index 100%
rename from src/modules/06_assess/componenst/viewstep/viewPDF.vue
rename to src/modules/06_assess/components/viewstep/viewPDF.vue
diff --git a/src/modules/06_assess/componenst/viewstep/viewStep1.vue b/src/modules/06_assess/components/viewstep/viewStep1.vue
similarity index 100%
rename from src/modules/06_assess/componenst/viewstep/viewStep1.vue
rename to src/modules/06_assess/components/viewstep/viewStep1.vue
diff --git a/src/modules/06_assess/componenst/viewstep/viewStep3.vue b/src/modules/06_assess/components/viewstep/viewStep3.vue
similarity index 91%
rename from src/modules/06_assess/componenst/viewstep/viewStep3.vue
rename to src/modules/06_assess/components/viewstep/viewStep3.vue
index 6ed9c92..a9e694f 100644
--- a/src/modules/06_assess/componenst/viewstep/viewStep3.vue
+++ b/src/modules/06_assess/components/viewstep/viewStep3.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/06_assess/componenst/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
 
 import { useAssessStore } from "@/modules/06_assess/store";
 
diff --git a/src/modules/06_assess/componenst/viewstep/viewStep7.vue b/src/modules/06_assess/components/viewstep/viewStep7.vue
similarity index 84%
rename from src/modules/06_assess/componenst/viewstep/viewStep7.vue
rename to src/modules/06_assess/components/viewstep/viewStep7.vue
index e1ed214..700dad1 100644
--- a/src/modules/06_assess/componenst/viewstep/viewStep7.vue
+++ b/src/modules/06_assess/components/viewstep/viewStep7.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/06_assess/componenst/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
 
 import { useAssessStore } from "@/modules/06_assess/store";
 
diff --git a/src/modules/06_assess/views/AssessMain.vue b/src/modules/06_assess/views/AssessMain.vue
index c328aac..85c292e 100644
--- a/src/modules/06_assess/views/AssessMain.vue
+++ b/src/modules/06_assess/views/AssessMain.vue
@@ -5,8 +5,8 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import Tab1 from "@/modules/06_assess/componenst/Tab1.vue"; // ชำนาญการ
-import Tab2 from "@/modules/06_assess/componenst/Tab2.vue"; // ชำนาญการพิเศษ
+import Tab1 from "@/modules/06_assess/components/Tab1.vue"; // ชำนาญการ
+import Tab2 from "@/modules/06_assess/components/Tab2.vue"; // ชำนาญการพิเศษ
 
 import { useAssessStore } from "@/modules/06_assess/store";