diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts
index dd86f6f..e4dd00d 100644
--- a/src/api/org/api.org.ts
+++ b/src/api/org/api.org.ts
@@ -169,6 +169,7 @@ export default {
    * workflow
    */
   workflow: `${workflow}/`,
+  commanderPosexe: (type:string)=>`${workflow}/commander-posexe/${type}`,
 
   keycloakLogSSO: `${org}/keycloak/log/sso`,
 
diff --git a/src/interface/Main.ts b/src/interface/Main.ts
index 61e21db..d73d63f 100644
--- a/src/interface/Main.ts
+++ b/src/interface/Main.ts
@@ -12,6 +12,7 @@ interface ProfileData {
   citizenId?: string;
   salary?: number|null;
   birthDate?: string;
+  keycloakId?: string;
   org?: string;
   dateStart?: string;
   dateRetireLaw?: string;
diff --git a/src/modules/02_transfer/views/Main.vue b/src/modules/02_transfer/views/Main.vue
index fe86ae3..5d4c3b5 100644
--- a/src/modules/02_transfer/views/Main.vue
+++ b/src/modules/02_transfer/views/Main.vue
@@ -219,7 +219,7 @@ onMounted(async () => {
                 debounce="300"
                 placeholder="ค้นหา"
                 style="max-width: 200px"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
               >
                 <template v-slot:append>
                   <q-icon name="search" />
diff --git a/src/modules/03_retire/store.ts b/src/modules/03_retire/store.ts
index 3c48e6f..e322d20 100644
--- a/src/modules/03_retire/store.ts
+++ b/src/modules/03_retire/store.ts
@@ -18,11 +18,13 @@ export const useRestDataStore = defineStore("Rest", () => {
       case "DONE":
         return "ออกคำสั่งเสร็จสิ้น";
       case "DONECANCEL":
-        return "ยกเลิกการลาออก";
+        return "ยกเลิกการลาออกสำเร็จ";
       case "CANCEL":
-        return "ยกเลิกการลาออก";
+        return "ยกเลิกการลาออกสำเร็จ";
       case "DONEREJECT":
         return "ออกคำสั่งยกเลิกลาออกเสร็จแล้ว";
+      case "CANCELING":
+        return "กำลังดำเนิดการยกเลิกการ";
       default:
         return "-";
     }
@@ -39,9 +41,8 @@ export const useRestDataStore = defineStore("Rest", () => {
     }
   }
 
-  
   return {
     statusText,
-    convertStatusText
+    convertStatusText,
   };
 });
diff --git a/src/modules/03_retire/views/DialogRetire.vue b/src/modules/03_retire/views/DialogRetire.vue
index 7762614..ee1c638 100644
--- a/src/modules/03_retire/views/DialogRetire.vue
+++ b/src/modules/03_retire/views/DialogRetire.vue
@@ -45,8 +45,8 @@ function onSubmit() {
         .put(config.API.cancelResignByType(link.value, id.value), {
           reason: reason.value,
         })
-        .then(() => {
-          props.fectData?.(id.value);
+        .then(async () => {
+          await props.fectData?.(id.value);
           success($q, "ยกเลิกการลาออกสำเร็จ");
         })
         .catch((err) => {
diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index d1b164e..2dfe2ff 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -303,6 +303,7 @@ onMounted(async () => {
               v-if="
                 dataDetail.statusMain !== 'CANCEL' &&
                 dataDetail.statusMain !== 'DONECANCEL' &&
+                dataDetail.statusMain !== 'CANCELING' &&
                 checkCancleLeave
               "
               unelevated
diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
index 5ab2efc..ce9394d 100644
--- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
@@ -160,6 +160,7 @@ function onValidate() {
     formData.append("leaveTotal", formDataOrdination.leaveTotal);
     formData.append("leaveRange", formDataOrdination.leaveRange);
     formData.append("leaveRangeEnd", formDataOrdination.leaveRangeEnd);
+    formData.append("hajj", "false");
     props.onSubmit(formData, isLeave.value);
   }
 }
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
index db88acf..c630c62 100644
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@@ -122,6 +122,7 @@ function onValidate() {
     formData.append("leaveTotal", formDataHaji.leaveTotal);
     formData.append("leaveRange", formDataHaji.leaveRange);
     formData.append("leaveRangeEnd", formDataHaji.leaveRangeEnd);
+    formData.append("hajj", 'true');
     props.onSubmit(formData, isLeave.value);
   }
 }
diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue
index 7a53d6e..36cd08d 100644
--- a/src/modules/05_leave/components/FormLeave/Form.vue
+++ b/src/modules/05_leave/components/FormLeave/Form.vue
@@ -1,13 +1,21 @@
 <script setup lang="ts">
-import { onMounted } from "vue";
+import { onMounted, ref, watch } from "vue";
 
+import http from "@/plugins/http";
+import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useLeaveStore } from "@/modules/05_leave/store";
+import { useDataStore } from "@/stores/data";
+
+import DialogHeader from "@/components/DialogHeader.vue";
+import { useQuasar, type QTableProps } from "quasar";
 
 const mixin = useCounterMixin();
 const dataStore = useLeaveStore();
-const { date2Thai } = mixin;
+const storeData = useDataStore();
+const { date2Thai, showLoader, hideLoader, messageError } = mixin;
 
+const modal = ref<boolean>(false);
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
   model: {
@@ -16,6 +24,110 @@ const props = defineProps({
   },
 });
 
+const $q = useQuasar();
+const isAct = ref<boolean>(false);
+const search = ref<string>("");
+const total = ref<number>(0);
+const totalList = ref<number>(1);
+const pagination = ref({
+  sortBy: "createdAt",
+  descending: true,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+const selected = ref<any[]>([]);
+const rows = ref<any[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "posNo",
+    align: "left",
+    label: "เลขที่ตำแหน่ง",
+    sortable: true,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "fullName",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: true,
+    field: "fullName",
+    format(val, row) {
+      return `${row.prefix}${row.firstName} ${row.lastName}`;
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posExecutiveNameOrg",
+    align: "left",
+    label: "ตำแหน่งทางการบริหาร",
+    sortable: true,
+    field: "posExecutiveNameOrg",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+function onPerson() {
+  modal.value = true;
+  getCommander();
+}
+
+function onSubmit() {
+  modal.value = false;
+  dataStore.dear = selected.value[0].firstName
+    ? `${selected.value[0].prefix}${selected.value[0].firstName} ${selected.value[0].lastName}`
+    : "";
+
+  dataStore.commanderPosition = selected.value[0].posExecutiveNameOrg;
+}
+
+function closeDialog() {
+  modal.value = false;
+}
+
+function getCommander() {
+  showLoader();
+  http
+    .put(config.API.commanderPosexe("operate"), {
+      isAct: isAct.value,
+      keyword: search.value,
+      page: pagination.value.page,
+      pageSize: pagination.value.rowsPerPage,
+      keycloakId: storeData.formData.keycloakId,
+    })
+    .then((res) => {
+      rows.value = res.data.result.data;
+    })
+    .catch((e) => {
+      messageError($q, e);
+      hideLoader();
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+function updatePagination(newPagination: any) {
+  pagination.value.page = 1;
+  pagination.value.rowsPerPage = newPagination.rowsPerPage;
+}
+
+function getSearch() {
+  pagination.value.page = 1;
+  getCommander();
+}
+
+watch(
+  () => pagination.value.rowsPerPage,
+  async () => {
+    getSearch();
+  }
+);
+
 /**Hook */
 onMounted(() => {
   dataStore.typeLeave = "";
@@ -24,9 +136,37 @@ onMounted(() => {
 
 <template>
   <q-card bordered class="q-pa-md bg-grey-1">
+    <div class="col-12 row q-pa-sm q-col-gutter-sm items-center">
+      <q-input
+        v-model="dataStore.dear"
+        dense
+        outlined
+        bg-color="white"
+        label="เรียน (ชื่อ - นามสกุล)"
+        class="col-4"
+      ></q-input>
+      <q-input
+        v-model="dataStore.commanderPosition"
+        dense
+        outlined
+        bg-color="white"
+        label="เรียน (ตำแหน่ง)"
+        class="col-4"
+      ></q-input>
+      <div class="col-4">
+        <q-btn
+          class="bg-secondary text-white"
+          icon="add"
+          unelevated
+          @click="onPerson"
+          ><q-tooltip>เพิ่มรายชื่อ</q-tooltip></q-btn
+        >
+      </div>
+    </div>
+    <div class="col-12"><q-separator /></div>
     <div class="col-12 row q-pa-sm q-col-gutter-sm">
       <datepicker
-        class="col-12 col-sm-4"
+        class="col-12 col-sm-6"
         menu-class-name="modalfix"
         v-model="dataStore.dateSendLeave"
         :locale="'th'"
@@ -70,7 +210,7 @@ onMounted(() => {
         </template>
       </datepicker>
       <q-input
-        class="col-12 col-sm-4"
+        class="col-12 col-sm-6"
         dense
         bg-color="white"
         outlined
@@ -78,7 +218,7 @@ onMounted(() => {
         v-model="dataStore.typeLeave"
         label="เรื่อง"
       />
-      <q-input
+      <!-- <q-input
         class="col-12 col-sm-4"
         dense
         outlined
@@ -86,7 +226,7 @@ onMounted(() => {
         bg-color="white"
         v-model="dataStore.commanderPosition"
         label="เรียน"
-      />
+      /> -->
 
       <q-input
         class="col-12 col-sm-4"
@@ -155,4 +295,139 @@ onMounted(() => {
       />
     </div>
   </q-card>
+
+  <q-dialog v-model="modal" persistent>
+    <q-card class="col-12" style="width: 80%">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <DialogHeader :tittle="`เลือกผู้บังคับบัญชา`" :close="closeDialog" />
+        <q-separator />
+
+        <q-card-section>
+          <div class="row q-col-gutter-sm">
+            <div class="col-12">
+              <div class="row q-col-gutter-md items-start">
+                <div class="col-12 col-sm-4 col-md-4">
+                  <q-input
+                    v-model="search"
+                    outlined
+                    hide-bottom-space
+                    dense
+                    label="คำค้น"
+                  />
+                </div>
+                <q-checkbox
+                  keep-color
+                  v-model="isAct"
+                  label="แสดงเฉพาะรักษาการแทน"
+                  color="primary"
+                >
+                  <q-tooltip>แสดงเฉพาะรักษาการแทน </q-tooltip>
+                </q-checkbox>
+                <q-space />
+
+                <div class="col-12 col-sm-6 col-md-3">
+                  <q-btn
+                    color="primary"
+                    icon="search"
+                    label="ค้นหา"
+                    class="full-width q-pa-sm"
+                    outline
+                    @click.prevent="getCommander"
+                  >
+                  </q-btn>
+                </div>
+              </div>
+            </div>
+            <div class="col-12">
+              <d-table
+                ref="table"
+                :columns="columns"
+                :rows="rows"
+                row-key="key"
+                flat
+                bordered
+                :paging="true"
+                dense
+                :rows-per-page-options="[10, 25, 50, 100]"
+                selection="single"
+                @update:pagination="updatePagination"
+                v-model:selected="selected"
+              >
+                <template v-slot:pagination="scope">
+                  ทั้งหมด {{ total }} รายการ
+                  <q-pagination
+                    v-model="pagination.page"
+                    active-color="primary"
+                    color="dark"
+                    :max="Number(totalList)"
+                    size="sm"
+                    boundary-links
+                    direction-links
+                    :max-pages="5"
+                    @update:model-value="getSearch"
+                  ></q-pagination>
+                </template>
+
+                <template v-slot:header-selection="scope">
+                  <q-checkbox
+                    keep-color
+                    color="primary"
+                    dense
+                    v-model="scope.checkBox"
+                  />
+                </template>
+                <template v-slot:header="props">
+                  <q-tr :props="props">
+                    <q-th auto-width />
+                    <q-th
+                      v-for="col in props.cols"
+                      :key="col.name"
+                      :props="props"
+                    >
+                      <span class="text-weight-medium">{{ col.label }}</span>
+                    </q-th>
+                  </q-tr>
+                </template>
+                <template v-slot:body="props">
+                  <q-tr :props="props" class="cursor-pointer">
+                    <q-td>
+                      <q-checkbox
+                        keep-color
+                        color="primary"
+                        dense
+                        v-model="props.selected"
+                      />
+                    </q-td>
+                    <q-td
+                      v-for="col in props.cols"
+                      :key="col.name"
+                      :props="props"
+                    >
+                      <div v-if="col.name == 'no'">
+                        {{
+                          (pagination.page - 1) * pagination.rowsPerPage +
+                          props.rowIndex +
+                          1
+                        }}
+                      </div>
+                      <div v-else>
+                        {{ col.value ? col.value : "-" }}
+                      </div>
+                    </q-td>
+                  </q-tr>
+                </template>
+              </d-table>
+            </div>
+          </div>
+        </q-card-section>
+        <q-separator />
+
+        <q-card-actions align="right">
+          <q-btn label="บันทึก" color="secondary" type="submit"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
 </template>
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index 050e5ed..353754b 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -316,8 +316,6 @@ export const useLeaveStore = defineStore("Leave", () => {
         const data = res.data.result;
         dateSendLeave.value = data.dateSendLeave;
         leaveTypeName.value = data.leaveTypeName;
-        dear.value = data.dear;
-        commanderPosition.value = data.commanderPosition;
         fullName.value = data.fullName;
         positionName.value = data.positionName;
         positionLevelName.value = data.positionLevelName;
diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue
index 76f6dc0..72dedf6 100644
--- a/src/modules/05_leave/views/AddPage.vue
+++ b/src/modules/05_leave/views/AddPage.vue
@@ -36,6 +36,7 @@ const {
   showLoader,
   hideLoader,
   convertDateToAPI,
+  dialogMessageNotify,
 } = mixin;
 
 const model = ref<string>("");
@@ -58,29 +59,34 @@ async function fectOptionType() {
 
 function onSubmit(postData: FormData, isLeave: boolean = true) {
   if (isLeave) {
-    dialogConfirm($q, async () => {
-      showLoader();
-      if (model.value === "LV-006" || model.value === "LV-008") {
-        postData.append("leaveSubTypeName", modelSpecific.value);
-      }
-      if (postData.get("leaveEndDate") === postData.get("leaveStartDate")) {
-        postData.set("leaveRangeEnd", postData.get("leaveRange") as string);
-      }
+    if (dataStore.commanderPosition !== "" && dataStore.dear !== "") {
+      dialogConfirm($q, async () => {
+        showLoader();
+        if (model.value === "LV-006" || model.value === "LV-008") {
+          postData.append("leaveSubTypeName", modelSpecific.value);
+        }
+        if (postData.get("leaveEndDate") === postData.get("leaveStartDate")) {
+          postData.set("leaveRangeEnd", postData.get("leaveRange") as string);
+        }
+        postData.append("commanderPosition", dataStore.commanderPosition);
+        postData.append("dear", dataStore.dear);
+        await http
+          .post(config.API.leaveUser(), postData)
 
-      await http
-        .post(config.API.leaveUser(), postData)
-
-        .then((res) => {
-          router.push(`/leave/edit/${res.data.result.id}`);
-          success($q, "บันทึกสำเร็จ");
-        })
-        .catch((e: any) => {
-          messageError($q, e);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    });
+          .then((res) => {
+            router.push(`/leave/edit/${res.data.result.id}`);
+            success($q, "บันทึกสำเร็จ");
+          })
+          .catch((e: any) => {
+            messageError($q, e);
+          })
+          .finally(() => {
+            hideLoader();
+          });
+      });
+    } else {
+      dialogMessageNotify($q, "กรุณาเพิ่มรายชื่อ ผู้บังคับบัญชา");
+    }
   } else {
     messageError($q, "", "ไม่มีสิทธิ์ลา");
   }
diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue
index 6f2c64a..2b08e82 100644
--- a/src/modules/05_leave/views/EditPage.vue
+++ b/src/modules/05_leave/views/EditPage.vue
@@ -38,6 +38,7 @@ const {
   success,
   date2Thai,
   dialogRemove,
+  dialogMessageNotify,
 } = mixin;
 
 const titleName = ref<string>("");
@@ -221,27 +222,33 @@ async function fetchDataDetail(id: string) {
  */
 function onSubmit(formData: any, isLeave: boolean = true) {
   if (isLeave) {
-    dialogConfirm($q, async () => {
-      showLoader();
-      if (model.value === "LV-006" || model.value === "LV-008") {
-        formData.append("leaveSubTypeName", modelSpecific.value);
-      }
-      if (formData.get("leaveEndDate") === formData.get("leaveStartDate")) {
-        formData.set("leaveRangeEnd", formData.get("leaveRange") as string);
-      }
-      await http
-        .put(config.API.leaveUserId(personalId.value), formData)
-        .then(async () => {
-          await fetchDataDetail(personalId.value);
-          success($q, "บันทึกสำเร็จ");
-        })
-        .catch((e: any) => {
-          messageError($q, e);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    });
+    if (dataStore.commanderPosition !== "" && dataStore.dear !== "") {
+      dialogConfirm($q, async () => {
+        showLoader();
+        if (model.value === "LV-006" || model.value === "LV-008") {
+          formData.append("leaveSubTypeName", modelSpecific.value);
+        }
+        if (formData.get("leaveEndDate") === formData.get("leaveStartDate")) {
+          formData.set("leaveRangeEnd", formData.get("leaveRange") as string);
+        }
+        formData.append("commanderPosition", dataStore.commanderPosition);
+        formData.append("dear", dataStore.dear);
+        await http
+          .put(config.API.leaveUserId(personalId.value), formData)
+          .then(async () => {
+            await fetchDataDetail(personalId.value);
+            success($q, "บันทึกสำเร็จ");
+          })
+          .catch((e: any) => {
+            messageError($q, e);
+          })
+          .finally(() => {
+            hideLoader();
+          });
+      });
+    } else {
+      dialogMessageNotify($q, "กรุณาเพิ่มรายชื่อ ผู้บังคับบัญชา");
+    }
   } else {
     messageError($q, "", "ไม่มีสิทธิ์ลา");
   }
@@ -426,7 +433,7 @@ onMounted(async () => {
                 :on-confirm="onConfirm"
                 :click-delete="clickDelete"
               />
-              <HelpWifeBirthForm
+              <HelpWifeBirthForm5
                 v-if="model === 'LV-004'"
                 :data="formData"
                 :on-submit="onSubmit"
diff --git a/src/modules/08_KPI/components/Tab/02_Evaluator.vue b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
index 3974086..51e47e4 100644
--- a/src/modules/08_KPI/components/Tab/02_Evaluator.vue
+++ b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
@@ -175,7 +175,7 @@ onMounted(() => {
           debounce="300"
           v-model="filterKeyword"
           placeholder="ค้นหา"
-          @keydown.enter="onSearch"
+          @keydown.enter.prevent="onSearch"
         >
           <template v-slot:append>
             <q-icon name="search" />
diff --git a/src/modules/10_registry/01_Information/02_ChangeName.vue b/src/modules/10_registry/01_Information/02_ChangeName.vue
index 0a36de2..dcac788 100644
--- a/src/modules/10_registry/01_Information/02_ChangeName.vue
+++ b/src/modules/10_registry/01_Information/02_ChangeName.vue
@@ -279,7 +279,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/01_Information/05_Educations.vue b/src/modules/10_registry/01_Information/05_Educations.vue
index 2fb6e5d..515fe2a 100644
--- a/src/modules/10_registry/01_Information/05_Educations.vue
+++ b/src/modules/10_registry/01_Information/05_Educations.vue
@@ -581,7 +581,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/01_Information/06_Ability.vue b/src/modules/10_registry/01_Information/06_Ability.vue
index a05e7ca..be54300 100644
--- a/src/modules/10_registry/01_Information/06_Ability.vue
+++ b/src/modules/10_registry/01_Information/06_Ability.vue
@@ -287,7 +287,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/02_Government/02_Discipline.vue b/src/modules/10_registry/02_Government/02_Discipline.vue
index d8f1c4c..bda0aad 100644
--- a/src/modules/10_registry/02_Government/02_Discipline.vue
+++ b/src/modules/10_registry/02_Government/02_Discipline.vue
@@ -215,7 +215,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter.pervent="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/02_Government/03_Leave.vue b/src/modules/10_registry/02_Government/03_Leave.vue
index 7120f43..c959295 100644
--- a/src/modules/10_registry/02_Government/03_Leave.vue
+++ b/src/modules/10_registry/02_Government/03_Leave.vue
@@ -361,7 +361,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/02_Government/04_Duty.vue b/src/modules/10_registry/02_Government/04_Duty.vue
index 1ff8476..e1efc99 100644
--- a/src/modules/10_registry/02_Government/04_Duty.vue
+++ b/src/modules/10_registry/02_Government/04_Duty.vue
@@ -320,7 +320,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/02_Government/05_Actposition.vue b/src/modules/10_registry/02_Government/05_Actposition.vue
index ffc0371..4e5ca14 100644
--- a/src/modules/10_registry/02_Government/05_Actposition.vue
+++ b/src/modules/10_registry/02_Government/05_Actposition.vue
@@ -260,7 +260,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/02_Government/06_Assistance.vue b/src/modules/10_registry/02_Government/06_Assistance.vue
index b9526ce..aac3697 100644
--- a/src/modules/10_registry/02_Government/06_Assistance.vue
+++ b/src/modules/10_registry/02_Government/06_Assistance.vue
@@ -337,7 +337,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue
index 6f076ee..c32aba6 100644
--- a/src/modules/10_registry/02_Government/07_Position.vue
+++ b/src/modules/10_registry/02_Government/07_Position.vue
@@ -501,7 +501,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/03_Salary/01_Salary.vue b/src/modules/10_registry/03_Salary/01_Salary.vue
index 25bb95f..b516136 100644
--- a/src/modules/10_registry/03_Salary/01_Salary.vue
+++ b/src/modules/10_registry/03_Salary/01_Salary.vue
@@ -703,7 +703,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/03_Salary/02_Nopaid.vue b/src/modules/10_registry/03_Salary/02_Nopaid.vue
index 1757c39..aa4d72f 100644
--- a/src/modules/10_registry/03_Salary/02_Nopaid.vue
+++ b/src/modules/10_registry/03_Salary/02_Nopaid.vue
@@ -301,7 +301,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/04_Achievement/01_Certificate.vue b/src/modules/10_registry/04_Achievement/01_Certificate.vue
index 6ec2af0..609ccea 100644
--- a/src/modules/10_registry/04_Achievement/01_Certificate.vue
+++ b/src/modules/10_registry/04_Achievement/01_Certificate.vue
@@ -302,7 +302,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/04_Achievement/02_Training.vue b/src/modules/10_registry/04_Achievement/02_Training.vue
index 1416ae5..9763c1e 100644
--- a/src/modules/10_registry/04_Achievement/02_Training.vue
+++ b/src/modules/10_registry/04_Achievement/02_Training.vue
@@ -419,7 +419,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/04_Achievement/03_Insignia.vue b/src/modules/10_registry/04_Achievement/03_Insignia.vue
index d8b0323..0e65605 100644
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@@ -517,7 +517,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/04_Achievement/04_Honor.vue b/src/modules/10_registry/04_Achievement/04_Honor.vue
index 58035f2..3a6366c 100644
--- a/src/modules/10_registry/04_Achievement/04_Honor.vue
+++ b/src/modules/10_registry/04_Achievement/04_Honor.vue
@@ -301,7 +301,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
index 698b13b..9c51513 100644
--- a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
+++ b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
@@ -225,7 +225,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/05_Other/01_Other.vue b/src/modules/10_registry/05_Other/01_Other.vue
index c1be9da..98c91ee 100644
--- a/src/modules/10_registry/05_Other/01_Other.vue
+++ b/src/modules/10_registry/05_Other/01_Other.vue
@@ -205,7 +205,7 @@ onMounted(async () => {
         v-model="filter"
         label="ค้นหา"
         style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
       >
         <template v-slot:append>
           <q-icon name="search" />
diff --git a/src/modules/10_registry/Dialog/DialogHistory.vue b/src/modules/10_registry/Dialog/DialogHistory.vue
index 0b67b99..e615ee9 100644
--- a/src/modules/10_registry/Dialog/DialogHistory.vue
+++ b/src/modules/10_registry/Dialog/DialogHistory.vue
@@ -88,7 +88,7 @@ watch(
               dense
               v-model="filter"
               label="ค้นหา"
-              @keydown.enter="onSearch"
+              @keydown.enter.prevent="onSearch"
             >
               <template v-slot:append>
                 <q-icon name="search" />
diff --git a/src/modules/10_registry/views/requestEditMain.vue b/src/modules/10_registry/views/requestEditMain.vue
index a271391..a1dce77 100644
--- a/src/modules/10_registry/views/requestEditMain.vue
+++ b/src/modules/10_registry/views/requestEditMain.vue
@@ -360,7 +360,7 @@ onMounted(async () => {
               clearable
               dense
               label="ค้นหา"
-              @keydown.enter="updateStatusValue()"
+              @keydown.enter.prevent="updateStatusValue()"
             >
             </q-input>
           </div>
diff --git a/src/modules/11_probation/views/main.vue b/src/modules/11_probation/views/main.vue
index eac8c35..86245ea 100644
--- a/src/modules/11_probation/views/main.vue
+++ b/src/modules/11_probation/views/main.vue
@@ -301,7 +301,7 @@ onMounted(async () => {
                 v-model="filter"
                 label="ค้นหา"
                 :style="mode ? `max-width: 200px` : `max-width: 150px`"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
               >
                 <template v-slot:append>
                   <q-icon name="search" />
diff --git a/src/modules/11_probation/views/mainDetail.vue b/src/modules/11_probation/views/mainDetail.vue
index 6a35432..4efbad1 100644
--- a/src/modules/11_probation/views/mainDetail.vue
+++ b/src/modules/11_probation/views/mainDetail.vue
@@ -337,7 +337,7 @@ onMounted(async () => {
                 v-model="filter"
                 label="ค้นหา"
                 :style="mode ? `max-width: 200px` : `max-width: 150px`"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
               >
                 <template v-slot:append>
                   <q-icon name="search" />
diff --git a/src/modules/13_portfolio/views/Main.vue b/src/modules/13_portfolio/views/Main.vue
index f9de056..8d1141d 100644
--- a/src/modules/13_portfolio/views/Main.vue
+++ b/src/modules/13_portfolio/views/Main.vue
@@ -173,7 +173,7 @@ onMounted(async () => {
                 debounce="300"
                 placeholder="ค้นหา"
                 style="max-width: 200px"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
               >
                 <template v-slot:append>
                   <q-icon name="search" />
diff --git a/src/modules/14_IDP/views/main.vue b/src/modules/14_IDP/views/main.vue
index 0c1fddf..7a6b366 100644
--- a/src/modules/14_IDP/views/main.vue
+++ b/src/modules/14_IDP/views/main.vue
@@ -346,7 +346,7 @@ onMounted(async () => {
               outlined
               dense
               label="ค้นหา"
-              @keydown.enter="getSerach()"
+              @keydown.enter.prevent="getSerach()"
               style="width: 200px"
             >
               <template v-slot:append>
diff --git a/src/stores/data.ts b/src/stores/data.ts
index 2b4d032..29e9851 100644
--- a/src/stores/data.ts
+++ b/src/stores/data.ts
@@ -28,6 +28,7 @@ export const useDataStore = defineStore("dataMain", () => {
     posLevelName: "",
     salary: null,
     birthDate: "",
+    keycloakId: "",
     posNo: "",
     org: "",
     dateStart: "",
@@ -108,6 +109,7 @@ export const useDataStore = defineStore("dataMain", () => {
     formData.lastName = data.lastName;
     formData.position = data.position;
     formData.salary = data.salary;
+    formData.keycloakId = data.keycloak;
     formData.citizenId = data.citizenId;
     formData.birthDate = data.birthDate;
     formData.posTypeName = data.posTypeName;