From ccf0595a7355f57e7ce00b45b473645e475850b5 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 12 Nov 2024 09:36:18 +0700
Subject: [PATCH 1/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/resignEMP/ResignByid.vue      | 7 ++++---
 .../06_retirement/components/resignEMP/ResignReject.vue    | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/modules/06_retirement/components/resignEMP/ResignByid.vue b/src/modules/06_retirement/components/resignEMP/ResignByid.vue
index 098d765cd..e1073f294 100644
--- a/src/modules/06_retirement/components/resignEMP/ResignByid.vue
+++ b/src/modules/06_retirement/components/resignEMP/ResignByid.vue
@@ -526,7 +526,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="q-gutter-sm q-pa-sm">
+  <div class="q-pa-sm">
     <div class="toptitle text-dark col-12 row items-center">
       <q-btn
         icon="mdi-arrow-left"
@@ -1095,6 +1095,7 @@ onMounted(async () => {
         greedy
         @submit.prevent
         @validation-success="onSubmitAttached"
+        class="full-width"
       >
         <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
           <div class="q-pl-sm text-weight-bold text-dark">
@@ -1168,9 +1169,9 @@ onMounted(async () => {
                   :readonly="!edit"
                   :borderless="!edit"
                   v-model="positionTypeOld"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
                   hide-bottom-space
-                  :label="`${'ตำแหน่งประเภท'}`"
+                  :label="`${'กลุ่มงาน'}`"
                 />
               </div>
             </div>
diff --git a/src/modules/06_retirement/components/resignEMP/ResignReject.vue b/src/modules/06_retirement/components/resignEMP/ResignReject.vue
index 528a548f1..f59ab94a8 100644
--- a/src/modules/06_retirement/components/resignEMP/ResignReject.vue
+++ b/src/modules/06_retirement/components/resignEMP/ResignReject.vue
@@ -520,6 +520,7 @@ onMounted(async () => {
         greedy
         @submit.prevent
         @validation-success="onSubmitAttached"
+        class="full-width"
       >
         <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
           <div class="q-pl-sm text-weight-bold text-dark">
@@ -593,9 +594,9 @@ onMounted(async () => {
                   :readonly="!edit"
                   :borderless="!edit"
                   v-model="positionTypeOld"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
                   hide-bottom-space
-                  :label="`${'ตำแหน่งประเภท'}`"
+                  :label="`${'กลุ่มงาน'}`"
                 />
               </div>
             </div>

From be506bc526ff62429ae0fec575662db4544b77b9 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 12 Nov 2024 10:03:49 +0700
Subject: [PATCH 2/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=82?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=A5=E0=B8=94=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Complaint/Form.vue           | 21 +++++++------------
 .../components/2_InvestigateFacts/Form.vue    | 10 ++++-----
 .../3_InvestigateDisciplinary/Form.vue        | 11 ++++------
 .../11_discipline/store/ComplaintsStore.ts    |  2 +-
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 5fdc30df7..7cbfd831f 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -220,10 +220,9 @@ async function getActive() {
       })
       .catch((err) => {
         messageError($q, err);
-      })
-      .finally(() => {
         hideLoader();
-      });
+      })
+      .finally(() => {});
   } else {
     await getOc(formData.activeId);
   }
@@ -231,7 +230,6 @@ async function getActive() {
 
 /** ดึงข้อมูลหน่วยงานจาก api */
 async function getOc(activeId: string) {
-  showLoader();
   await http
     .get(config.API.orgByIdSystem(activeId, route.meta.Key as string))
     .then(async (res) => {
@@ -244,9 +242,7 @@ async function getOc(activeId: string) {
     .catch((err) => {
       messageError($q, err);
     })
-    .finally(() => {
-      hideLoader();
-    });
+    .finally(() => {});
 }
 
 /**
@@ -262,8 +258,8 @@ function deletePerson(id: string) {
 
 /** ช่องทางการร้องเรียน และฟังก์ชั่นการดึงข้อมูลช่องทางการร้องเรียนมาจาก api*/
 
-function getListChannel() {
-  http
+async function getListChannel() {
+  await http
     .get(
       config.API.complaintListOp(
         mainStore.pathComplaintsChannal(route.name as string)
@@ -379,11 +375,10 @@ watch(props.data, async () => {
 });
 
 /** โหลดข้อมูลเมื่อเข้าหน้านี้ */
-onMounted(() => {
+onMounted(async () => {
   mainStore.rowsAdd = [];
-
-  getActive();
-  getListChannel();
+  await getActive();
+  await getListChannel();
 });
 </script>
 
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 116236471..7543e3bfb 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -338,10 +338,9 @@ async function getActive() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
       hideLoader();
-    });
+    })
+    .finally(() => {});
 }
 
 /** ดึงข้อมูลหน่วยงาน */
@@ -359,10 +358,9 @@ async function getOc(activeId: string) {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
       hideLoader();
-    });
+    })
+    .finally(() => {});
 }
 
 /** ดึงข้อมูลรายละเอียดสืบสวน */
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 9c4b8768b..5e5c7f84f 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -421,10 +421,9 @@ async function getActive() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
       hideLoader();
-    });
+    })
+    .finally(() => {});
 }
 
 async function getOc(activeId: string) {
@@ -439,10 +438,9 @@ async function getOc(activeId: string) {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
       hideLoader();
-    });
+    })
+    .finally(() => {});
 }
 
 /** function เรียกรายชื่อกรรมการ*/
@@ -491,7 +489,6 @@ async function fetchDListDirector() {
     });
 }
 
-
 /**
  * function return รายชื่อกรรมการที่เลือก
  * @param data รายชื่อกรรมการที่เลือก
diff --git a/src/modules/11_discipline/store/ComplaintsStore.ts b/src/modules/11_discipline/store/ComplaintsStore.ts
index f8f5e66f0..861c7c8e7 100644
--- a/src/modules/11_discipline/store/ComplaintsStore.ts
+++ b/src/modules/11_discipline/store/ComplaintsStore.ts
@@ -9,7 +9,7 @@ import type {
   DataList,
   DataListRow,
   ocListType,
-} from "@/modules/11_discipline/interface/response/complaint";
+} from "@/modules/11_discipline/interface/response/Complaint";
 
 import type { QTableProps } from "quasar";
 

From 83f176bc5e6ad721cb9edfcaf93524007a7689eb Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 12 Nov 2024 10:17:35 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/03_recruiting/views/01_compete/Detail.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/03_recruiting/views/01_compete/Detail.vue b/src/modules/03_recruiting/views/01_compete/Detail.vue
index 2bdb1398d..8043e55ef 100644
--- a/src/modules/03_recruiting/views/01_compete/Detail.vue
+++ b/src/modules/03_recruiting/views/01_compete/Detail.vue
@@ -206,9 +206,9 @@ const columns = ref<QTableProps["columns"]>([
   },
   {
     name: "examScore",
-    align: "right",
+    align: "center",
     label: "คะแนนรวม",
-    sortable: true,
+    sortable: false,
     field: "examScore",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -220,9 +220,9 @@ const columns = ref<QTableProps["columns"]>([
   },
   {
     name: "examResult",
-    align: "left",
+    align: "center",
     label: "ผลคะแนนสอบ",
-    sortable: true,
+    sortable: false,
     field: "examResult",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",

From c752fba862d10e728c166df40960d0fee431c398 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 Nov 2024 14:01:11 +0700
Subject: [PATCH 4/5] fix import

---
 src/modules/07_insignia/router.ts                     |  2 +-
 src/modules/08_registryEmployee/router.ts             | 11 ++++-------
 .../09_leave/components/4_ChangeRound/DialogForm.vue  |  4 ++--
 .../components/2_InvestigateFacts/EditPage.vue        |  2 +-
 .../components/2_InvestigateFacts/Form.vue            |  2 +-
 .../components/3_InvestigateDisciplinary/EditPage.vue |  2 +-
 src/modules/14_KPI/components/Tab/01_Assessment.vue   |  2 +-
 .../components/Tab/Dialog/03_FormIndicatorSpecial.vue |  2 +-
 .../components/Tab/Dialog/04_FormCompetency.vue       |  2 +-
 .../components/Tab/Dialog/DialogCommentProblem.vue    |  2 +-
 .../components/Tab/Dialog/DialogCommentProgress.vue   |  2 +-
 .../14_KPI/components/Tab/Dialog/DialogEvalute.vue    |  4 ++--
 .../components/Tab/DialogEvaluate/02_Competenct.vue   |  2 +-
 .../14_KPI/components/Tab/Topic/02_Competency.vue     |  2 +-
 .../14_KPI/components/results/tableIndividual.vue     |  2 +-
 src/modules/14_KPI/store.ts                           |  2 +-
 src/modules/14_KPI/views/detail.vue                   |  2 +-
 17 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts
index a66fe2713..09bcc61c2 100644
--- a/src/modules/07_insignia/router.ts
+++ b/src/modules/07_insignia/router.ts
@@ -25,7 +25,7 @@ const insigniaBorrow = () =>
 const ReportView = () => import("./views/06_ReportMain.vue");
 
 const report_02 = () =>
-  import("./components/report/ReportDetail.vue");
+  import("@/modules/07_insignia/components/report/ReportDetail.vue");
 
 export default [
   {
diff --git a/src/modules/08_registryEmployee/router.ts b/src/modules/08_registryEmployee/router.ts
index 1c13046e9..bb30feae0 100644
--- a/src/modules/08_registryEmployee/router.ts
+++ b/src/modules/08_registryEmployee/router.ts
@@ -1,12 +1,9 @@
 /*** Router ระบบทะเบียนประวัติลูกจ้าง (registryEmployee) */
-import { defineAsyncComponent } from "vue";
 
-const Main = defineAsyncComponent(
-  () => import("@/modules/08_registryEmployee/views/Main.vue")
-);
-const DetailView = defineAsyncComponent(
-  () => import("@/modules/08_registryEmployee/views/DetailView.vue")
-);
+const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
+
+const DetailView = () =>
+  import("@/modules/08_registryEmployee/views/DetailView.vue");
 
 // const CreateEmployee = defineAsyncComponent(
 //   () => import("@/modules/08_registryEmployee/views/Add.vue")
diff --git a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
index 675e003be..0a8290190 100644
--- a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
@@ -245,7 +245,7 @@ watch(
                     dense
                     ref="roundRef"
                     :rules="[
-                      (val) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน',
+                      (val:string) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน',
                     ]"
                     emit-value
                     map-options
@@ -295,7 +295,7 @@ watch(
                         "
                         label="วันที่ให้มีผล"
                         :rules="[
-                          (val) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
+                          (val:string) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
                         ]"
                       >
                         <template v-slot:prepend>
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
index 6aa928593..ee7070cac 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
@@ -10,7 +10,7 @@ import { useInvestigateFactStore } from "@/modules/11_discipline/store/Investiga
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
-import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
+import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
 import type {
   FormData as FormDataComplaint,
   ArrayPerson,
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 116236471..69d04784f 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -11,7 +11,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
-import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
+import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 
 import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue";
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
index 2a3f5ea6e..7b3150d48 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@@ -18,7 +18,7 @@ import type {
   ArrayPerson,
   ArrayFileList,
 } from "@/modules/11_discipline/interface/request/complaint";
-import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact";
+import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
 
 import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
 import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน
diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index 6aaaad1db..5e598d7ea 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -8,7 +8,7 @@ import http from "@/plugins/http";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
-import type { ListCriteria } from "@/modules/14_KPI/interface/request/Index";
+import type { ListCriteria } from "@/modules/14_KPI/interface/request/index";
 
 import DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
 import Work from "@/modules/14_KPI/components/Tab/Topic/01_Indicator.vue";
diff --git a/src/modules/14_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue b/src/modules/14_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue
index c007143a7..757fde56e 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue
@@ -5,7 +5,7 @@ import { useQuasar } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
-import type { FormDataAssigned } from "@/modules/14_KPI/interface/request/Index";
+import type { FormDataAssigned } from "@/modules/14_KPI/interface/request/index";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
diff --git a/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue b/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue
index 8d3cb6634..dd518c9dc 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue
@@ -2,7 +2,7 @@
 import { ref, reactive, onMounted, watch } from "vue";
 import DialogHeader from "@/components/DialogHeader.vue";
 import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
-import type { ListCapacity } from "@/modules/14_KPI/interface/request/Index";
+import type { ListCapacity } from "@/modules/14_KPI/interface/request/index";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
 import { useCounterMixin } from "@/stores/mixin";
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProblem.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProblem.vue
index 030829d1c..b5696f409 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProblem.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProblem.vue
@@ -9,7 +9,7 @@ import config from "@/app.config";
 import type {
   FormComment,
   FormCommentByRole,
-} from "@/modules/14_KPI/interface/request/Index";
+} from "@/modules/14_KPI/interface/request/index";
 import { useRoute } from "vue-router";
 import { useQuasar } from "quasar";
 
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue
index 6b6783b4e..ae7a5c7e8 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue
@@ -12,7 +12,7 @@ import { useKpiDataStore } from "@/modules/14_KPI/store";
 import type {
   FormComment,
   FormCommentByRole,
-} from "@/modules/14_KPI/interface/request/Index";
+} from "@/modules/14_KPI/interface/request/index";
 
 const $q = useQuasar();
 const store = useKpiDataStore();
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
index a1c16cf11..39555009e 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -407,7 +407,7 @@ watch(
                     dense
                     label="คำค้น"
                     :rules="[
-                      (val) => !!val || !searchRules || `กรุณากรอกคำค้น`,
+                      (val:string) => !!val || !searchRules || `กรุณากรอกคำค้น`,
                     ]"
                   >
                     <template v-slot:after>
@@ -567,7 +567,7 @@ watch(
                     hide-bottom-space
                     lazy-rules
                     :rules="[
-                      (val) => !!val.id || `${'กรุณาเลือกรอบการประเมิน'}`,
+                      (val:string) => !!val || `${'กรุณาเลือกรอบการประเมิน'}`,
                     ]"
                     @update:model-value="checkClosed"
                   />
diff --git a/src/modules/14_KPI/components/Tab/DialogEvaluate/02_Competenct.vue b/src/modules/14_KPI/components/Tab/DialogEvaluate/02_Competenct.vue
index 5c00d1867..410399c5e 100644
--- a/src/modules/14_KPI/components/Tab/DialogEvaluate/02_Competenct.vue
+++ b/src/modules/14_KPI/components/Tab/DialogEvaluate/02_Competenct.vue
@@ -8,7 +8,7 @@ import { useKpiDataStore } from "@/modules/14_KPI/store";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { ListCriteria } from "@/modules/14_KPI/interface/request/Index";
+import type { ListCriteria } from "@/modules/14_KPI/interface/request/index";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
diff --git a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
index 32aac1c71..cbcf8cd8f 100644
--- a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
@@ -12,7 +12,7 @@ import type {
   FormCapacityList,
   ListCriteria,
   DataOptions,
-} from "@/modules/14_KPI/interface/request/Index";
+} from "@/modules/14_KPI/interface/request/index";
 
 import DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
 import DialogCompetncyByRow from "@/modules/14_KPI/components/Tab/Dialog/DialogCompetncyByRow.vue";
diff --git a/src/modules/14_KPI/components/results/tableIndividual.vue b/src/modules/14_KPI/components/results/tableIndividual.vue
index b68a32d08..62baf689b 100644
--- a/src/modules/14_KPI/components/results/tableIndividual.vue
+++ b/src/modules/14_KPI/components/results/tableIndividual.vue
@@ -16,7 +16,7 @@ import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 import type {
   ResRound,
   ResDevelopment,
-} from "@/modules/14_KPI/interface/response/Index";
+} from "@/modules/14_KPI/interface/response/index";
 
 /**
  * importComponents
diff --git a/src/modules/14_KPI/store.ts b/src/modules/14_KPI/store.ts
index d5a83b009..b2ce0e833 100644
--- a/src/modules/14_KPI/store.ts
+++ b/src/modules/14_KPI/store.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { ref, reactive } from "vue";
 import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
-import type { FormQuery } from "@/modules/14_KPI/interface/request/Index";
+import type { FormQuery } from "@/modules/14_KPI/interface/request/index";
 
 export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
   const tabMainevaluator = ref<string>("1");
diff --git a/src/modules/14_KPI/views/detail.vue b/src/modules/14_KPI/views/detail.vue
index 8fe645f76..324e79c47 100644
--- a/src/modules/14_KPI/views/detail.vue
+++ b/src/modules/14_KPI/views/detail.vue
@@ -10,7 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import type { FormProfile } from "@/modules/14_KPI/interface/request/Index";
+import type { FormProfile } from "@/modules/14_KPI/interface/request/index";
 import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 
 // const modalScore = ref<boolean>(false);

From ee9891275f4d5397fbc51baaa283af8631aa4eb6 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 12 Nov 2024 14:04:38 +0700
Subject: [PATCH 5/5] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B9=82=E0=B8=AB=E0=B8=A5=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/Employee/02_Employment.vue    | 13 +++++--------
 .../components/detail/Salary/01_PositionSalary.vue  |  8 ++++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
index d834147cb..af76b281b 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@@ -34,7 +34,7 @@ const profileId = ref<string>(route.params.id.toString());
 /**
  * props
  */
- const isLeave = defineModel<boolean>("isLeave", {
+const isLeave = defineModel<boolean>("isLeave", {
   required: true,
 });
 
@@ -96,9 +96,9 @@ const formData = reactive<FormEmployment>({
 });
 
 /** function fetch ข้อมูลรายการการจ้าง*/
-function fetchListEmployment() {
+async function fetchListEmployment() {
   showLoader();
-  http
+  await http
     .get(config.API.employmentEmployee(profileId.value))
     .then((res) => {
       const data = res.data.result;
@@ -170,10 +170,9 @@ function onSubmit() {
       })
       .catch((err) => {
         messageError($q, err);
-      })
-      .finally(() => {
         hideLoader();
-      });
+      })
+      .finally(() => {});
   });
 }
 
@@ -275,7 +274,6 @@ onMounted(() => {
         map-options
         :options="columns?.slice(0, 2)"
         option-value="name"
-        
         style="min-width: 140px"
       />
     </div>
@@ -474,7 +472,6 @@ onMounted(() => {
             map-options
             :options="columns"
             option-value="name"
-            
             style="min-width: 140px"
           />
         </div>
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index b6e2629f6..62ca30766 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -217,9 +217,9 @@ const docOption = ref<DataOption2[]>(store.optionTemplateDoc);
 /**
  * function fetch รายการ ตำแหน่งเงินเดือน
  */
-function fetchListSalary() {
+async function fetchListSalary() {
   showLoader();
-  http
+  await http
     .get(config.API.profileListSalaryNew(profileId.value, empType.value))
     .then((res) => {
       rows.value = res.data.result;
@@ -448,13 +448,13 @@ function onSubmit() {
         : config.API.profileSalaryNew(empType.value);
       const method = isStatusEdit.value ? "patch" : "post";
       await http[method](url, formData);
+      await onClickCloseDialog();
       await fetchListSalary();
       success($q, "บันทึกข้อมูลสำเร็จ");
-      await onClickCloseDialog();
     } catch (e) {
       messageError($q, e);
+      hideLoader()
     } finally {
-      hideLoader();
     }
   });
 }