diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 42bd3965b..89b5f803a 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -332,6 +332,7 @@ watch(
               outlined
               dense
               label="คำค้น"
+              @keydown.enter.prevent="searchInput()"
             >
               <template v-slot:after>
                 <q-btn
diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue
index 80734855f..10e969781 100644
--- a/src/components/Workflow/DialogSelectPerson.vue
+++ b/src/components/Workflow/DialogSelectPerson.vue
@@ -187,6 +187,7 @@ watch(modal, (val) => {
                 dense
                 label="คำค้น"
                 @clear="search = ''"
+                @keydown.enter.prevent="onSearchData()"
               />
             </div>
             <q-checkbox
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
index 26e35a5cd..c26536d90 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
@@ -201,6 +201,7 @@ watch(modal, (val) => {
                 hide-bottom-space
                 dense
                 label="คำค้น"
+                @keydown.enter.prevent="onSearchData()"
               />
             </div>
             <q-checkbox
diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index d235c8c65..d30d19755 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -322,6 +322,7 @@ watch(modal, async (val) => {
                     hide-bottom-space
                     dense
                     label="คำค้น"
+                    @keydown.enter.prevent="onSearchData(true)"
                   >
                     <template v-slot:after>
                       <q-btn
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index c5cf71505..940687fe7 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -294,6 +294,7 @@ watch(
                   hide-bottom-space
                   dense
                   label="คำค้น"
+                  @keydown.enter.prevent="searchInput()"
                 >
                   <template v-slot:after>
                     <q-btn
diff --git a/src/modules/12_evaluatePersonal/components/Director/Form.vue b/src/modules/12_evaluatePersonal/components/Director/Form.vue
index 884f8d470..3228dfe3a 100644
--- a/src/modules/12_evaluatePersonal/components/Director/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue
@@ -280,6 +280,7 @@ onMounted(async () => {
                   hide-bottom-space
                   dense
                   label="คำค้น"
+                  @keydown.enter.prevent="(pagination.page = 1), searchInput()"
                 >
                   <template v-slot:after>
                     <q-btn
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 23d14d89b..978d5358c 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -905,6 +905,7 @@ onMounted(() => {
               hide-bottom-space
               dense
               label="คำค้น"
+              @keydown.enter.prevent="(formFilter.page = 1), fetchListPerson()"
             >
               <template v-slot:after>
                 <q-btn
diff --git a/src/modules/18_command/components/Step/View0_Digital.vue b/src/modules/18_command/components/Step/View0_Digital.vue
index 8cc2469f8..1601a21b6 100644
--- a/src/modules/18_command/components/Step/View0_Digital.vue
+++ b/src/modules/18_command/components/Step/View0_Digital.vue
@@ -719,6 +719,7 @@ onMounted(async () => {
                 dense
                 label="คำค้น"
                 @clear="search = ''"
+                @keydown.enter.prevent="onSearchData"
               />
             </div>
             <q-checkbox