diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
index 5d0081e9b..d77787e67 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -917,6 +917,7 @@ watch(
                 </div>
                 <div class="col-3">
                   <datepicker
+                    menu-class-name="modalfix"
                     v-model="formDetail.startDate"
                     :locale="'th'"
                     :readonly="checkDetail"
@@ -965,6 +966,7 @@ watch(
                 </div>
                 <div class="col-3">
                   <datepicker
+                    menu-class-name="modalfix"
                     v-model="formDetail.endDate"
                     :locale="'th'"
                     :readonly="checkDetail"
diff --git a/src/modules/14_KPI/components/results/tableIndividual.vue b/src/modules/14_KPI/components/results/tableIndividual.vue
index 01e38b2c2..6fd5ca836 100644
--- a/src/modules/14_KPI/components/results/tableIndividual.vue
+++ b/src/modules/14_KPI/components/results/tableIndividual.vue
@@ -14,7 +14,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*/
 import DialogIndividual from "@/modules/14_KPI/components/results/dialogIndividual.vue";
@@ -237,7 +237,6 @@ onMounted(async () => {
     <div class="items-center col-12 row q-gutter-x-sm q-mb-sm">
       <div class="row q-gutter-sm">
         <datepicker
-          menu-class-name="modalfix"
           v-model="year"
           style="width: 150px"
           :locale="'th'"
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index dccb69de2..90c599756 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -288,7 +288,6 @@ onMounted(async () => {
     <div class="row q-col-gutter-sm">
       <div class="row col-12">
         <datepicker
-          menu-class-name="modalfix"
           v-model="year"
           style="width: 150px"
           :locale="'th'"
@@ -453,7 +452,7 @@ onMounted(async () => {
                 >
                   {{ props.row.organization ? props.row.organization : "-" }}
                 </div>
-                <div v-else >
+                <div v-else>
                   {{ col.value ?? "-" }}
                 </div>
               </q-td>
diff --git a/src/modules/14_KPI/views/01_kpiRound.vue b/src/modules/14_KPI/views/01_kpiRound.vue
index 263e655bb..c13ba9dad 100644
--- a/src/modules/14_KPI/views/01_kpiRound.vue
+++ b/src/modules/14_KPI/views/01_kpiRound.vue
@@ -364,7 +364,6 @@ onMounted(async () => {
     <div class="row q-col-gutter-sm">
       <div class="row col-12">
         <datepicker
-          menu-class-name="modalfix"
           v-model="formQuery.year"
           :locale="'th'"
           autoApply
diff --git a/src/modules/14_KPI/views/02_kpiLists.vue b/src/modules/14_KPI/views/02_kpiLists.vue
index 6d2572175..6dc2d24c5 100644
--- a/src/modules/14_KPI/views/02_kpiLists.vue
+++ b/src/modules/14_KPI/views/02_kpiLists.vue
@@ -266,7 +266,6 @@ onMounted(async () => {
         <div class="row col-12">
           <div class="row">
             <datepicker
-              menu-class-name="modalfix"
               v-model="year"
               style="width: 150px"
               :locale="'th'"
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 6f6e1b670..0234abee7 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -617,7 +617,6 @@ onMounted(() => {
                   >
                     <div class="col-12 q-px-sm">
                       <datepicker
-                        menu-class-name="modalfix"
                         v-model="year"
                         :locale="'th'"
                         autoApply