diff --git a/src/components/Table.vue b/src/components/Table.vue
index 38d875fb6..9434aae28 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -10,6 +10,7 @@
     dense
     :pagination-label="paginationLabel"
     v-model:pagination="pagination"
+    :rows-per-page-options="[10, 25, 50, 100]"
   >
     <template v-slot:pagination="scope">
       ทั้งหมด {{ attrs.rows.length }} รายการ
diff --git a/src/components/information/Address.vue b/src/components/information/Address.vue
index 7db4b8410..460e11419 100644
--- a/src/components/information/Address.vue
+++ b/src/components/information/Address.vue
@@ -89,7 +89,7 @@
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -99,7 +99,7 @@
             option-label="name"
             :options="Ops.subdistrictOps"
             option-value="id"
-            :label="`${'แขวง / ตำบล '}`"
+            :label="`${'แขวง/ตำบล '}`"
             @update:model-value="(value:string) => selectSubDistrict(value, '1')"
             use-input
             input-debounce="0"
@@ -221,7 +221,7 @@
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
diff --git a/src/modules/03_recruiting/components/Address.vue b/src/modules/03_recruiting/components/Address.vue
index e0410cc50..f5911a70a 100644
--- a/src/modules/03_recruiting/components/Address.vue
+++ b/src/modules/03_recruiting/components/Address.vue
@@ -258,7 +258,7 @@ const getClass = (val: boolean) => {
           :class="getClass(status == 'checkRegister' || status == 'payment')"
           :readonly="!(status == 'checkRegister' || status == 'payment')"
           :borderless="!(status == 'checkRegister' || status == 'payment')"
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
           :outlined="status == 'checkRegister' || status == 'payment'"
           dense
           lazy-rules
@@ -268,7 +268,7 @@ const getClass = (val: boolean) => {
           option-label="name"
           :options="subdistrictOptions"
           option-value="id"
-          :label="`${'แขวง / ตำบล '}`"
+          :label="`${'แขวง/ตำบล '}`"
           @update:model-value="(value) => selectSubDistrict(value, '1')"
         />
       </div>
@@ -382,7 +382,7 @@ const getClass = (val: boolean) => {
           :class="getClass(status == 'checkRegister' || status == 'payment')"
           :readonly="!(status == 'checkRegister' || status == 'payment')"
           :borderless="!(status == 'checkRegister' || status == 'payment')"
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
           :outlined="status == 'checkRegister' || status == 'payment'"
           dense
           lazy-rules
@@ -392,7 +392,7 @@ const getClass = (val: boolean) => {
           option-label="name"
           :options="subdistrictCOptions"
           option-value="id"
-          :label="`${'แขวง / ตำบล '}`"
+          :label="`${'แขวง/ตำบล '}`"
           @update:model-value="(value) => selectSubDistrict(value, '2')"
         />
       </div>
diff --git a/src/modules/03_recruiting/views/03_editor/index.vue b/src/modules/03_recruiting/views/03_editor/index.vue
index 810433e08..e5db408e6 100644
--- a/src/modules/03_recruiting/views/03_editor/index.vue
+++ b/src/modules/03_recruiting/views/03_editor/index.vue
@@ -1017,7 +1017,7 @@ onMounted(async () => {
               :options="provinceOptions"
               option-value="id"
               :label="`${'จังหวัด'}`"
-              @update:model-value="(value) => selectProvince(value)"
+              @update:model-value="(value:any) => selectProvince(value)"
             />
           </div>
           <div class="col-xs-6 col-sm-3 col-md-3">
@@ -1037,7 +1037,7 @@ onMounted(async () => {
               :options="districtOptions"
               option-value="id"
               :label="`${'เขต / อำเภอ'}`"
-              @update:model-value="(value) => selectDistrict(value)"
+              @update:model-value="(value:any) => selectDistrict(value)"
             />
           </div>
           <div class="col-xs-6 col-sm-3 col-md-3">
@@ -1046,7 +1046,7 @@ onMounted(async () => {
               :class="getClass(enable.about)"
               :readonly="!enable.about"
               :borderless="!enable.about"
-              :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
               :outlined="enable.about"
               dense
               lazy-rules
@@ -1056,8 +1056,8 @@ onMounted(async () => {
               option-label="name"
               :options="subdistrictOptions"
               option-value="id"
-              :label="`${'แขวง / ตำบล '}`"
-              @update:model-value="(value) => selectSubDistrict(value)"
+              :label="`${'แขวง/ตำบล '}`"
+              @update:model-value="(value:any) => selectSubDistrict(value)"
             />
           </div>
           <div class="col-xs-6 col-sm-3 col-md-3">
@@ -1085,8 +1085,8 @@ onMounted(async () => {
               v-model="address.tel"
               :borderless="!enable.about"
               :rules="[
-                (val) => !!val || `${'กรุณากรอก เบอร์โทร'}`,
-                (val) =>
+                (val:any) => !!val || `${'กรุณากรอก เบอร์โทร'}`,
+                (val:any) =>
                   val.length >= 10 || `${'กรุณากรอกข้อมูลเบอร์โทรให้ครบ'}`,
               ]"
               :label="`${'เบอร์โทร'}`"
diff --git a/src/modules/04_registryPerson/components/Dialog/02_Address.vue b/src/modules/04_registryPerson/components/Dialog/02_Address.vue
index 35239965f..1ae5d379c 100644
--- a/src/modules/04_registryPerson/components/Dialog/02_Address.vue
+++ b/src/modules/04_registryPerson/components/Dialog/02_Address.vue
@@ -16,7 +16,7 @@ const dataLabel = {
   registrationAddress: "ที่อยู่ตามทะเบียนบ้าน",
   registrationProvince: "จังหวัด",
   registrationDistrict: "เขต/อำเภอ",
-  registrationSubDistrict: "แขวง / ตำบล",
+  registrationSubDistrict: "แขวง/ตำบล",
   registrationZipCode: "รหัสไปรษณีย์",
 };
 
@@ -51,8 +51,8 @@ async function selectDistrict(e: string | null, name: string) {
 }
 
 /**
- * ฟังก์ชันเลือก  แขวง / ตำบล
- * @param e  แขวง / ตำบล ที่เลือก
+ * ฟังก์ชันเลือก  แขวง/ตำบล
+ * @param e  แขวง/ตำบล ที่เลือก
  * @param name 1 คือ ที่อยู่ตามทะเบียนบ้าน 2 คือ ที่อยู่ปัจจุบัน
  */
 function selectSubDistrict(e: string | null, name: string) {
@@ -162,7 +162,7 @@ watch(
           v-model="formDataAddress.registrationSubDistrictId"
           :options="storeLinkCenter.OpsAddress.subdistrictOps"
           :label="dataLabel.registrationSubDistrict"
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
+          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล'}`]"
           @update:model-value="(value:string) => selectSubDistrict(value, '1')"
           @filter="(inputValue:string,
                       doneFn:Function) => storeLinkCenter.filterSelector(inputValue, doneFn,'subdistrictOps'
diff --git a/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue b/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue
index 4d8b9bd18..f22c6281d 100644
--- a/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue
+++ b/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue
@@ -63,6 +63,7 @@ const formInformations = reactive<RequestObject>({
   firstName: "",
   prefix: "",
   rank: null,
+  prefixMain: "",
 });
 
 const formDataAddress = reactive<RequestregistrationAddressObject>({
@@ -257,7 +258,7 @@ async function amiRequest() {
   formInformations.nationality = data.value.nationalityDesc;
 
   // แปลง dateOfBirth เป็น format 1989-01-01
-  formInformations.birthDate = conventDateOfBirth(`${data.value.dateOfBirth}`);
+  formInformations.birthDate = data.value.dateOfBirth ? conventDateOfBirth(`${data.value.dateOfBirth}`) : null;
   age.value = storeLinkCenter.calculateAge(data.value.age);
   formInformations.gender = data.value.genderDesc;
 
@@ -327,15 +328,15 @@ async function convertDistrict(val: string) {
   const id = storeLinkCenter.OpsAddress.districtOps.find(
     (e: DataOption) => e.name === val
   )?.id;
-  // เรียกฟังก์ชันดึงข้อมูล  แขวง / ตำบล
+  // เรียกฟังก์ชันดึงข้อมูล  แขวง/ตำบล
   await storeLinkCenter.fetchSubDistrict(id ? id : null, "1", false);
 
   return id ? id : null;
 }
 
 /**
- * ฟังก์ชันแปลงชื่อแขวง / ตำบล เป็น ID
- * @param val ชื่อแขวง / ตำบล
+ * ฟังก์ชันแปลงชื่อแขวง/ตำบล เป็น ID
+ * @param val ชื่อแขวง/ตำบล
  */
 async function convertSubdistrict(val: string) {
   const result = storeLinkCenter.OpsAddress.subdistrictOps.find(
diff --git a/src/modules/04_registryPerson/components/DialogHistory.vue b/src/modules/04_registryPerson/components/DialogHistory.vue
index 607e9f2a5..80b00c760 100644
--- a/src/modules/04_registryPerson/components/DialogHistory.vue
+++ b/src/modules/04_registryPerson/components/DialogHistory.vue
@@ -66,7 +66,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -261,8 +261,8 @@ function closeDialog() {
         <q-form ref="myForm">
           <div class="col-12 bg-grey-2 q-pa-sm">
             <div class="col-12 row q-pb-sm q-col-gutter-sm items-center"></div>
-            <div class="q-col-gutter-xs row no-wrap">
-              <div class="col-4">
+            <q-toolbar>
+              <div class="row q-col-gutter-sm">
                 <q-select
                   hide-bottom-space
                   :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภท'}`]"
@@ -279,9 +279,9 @@ function closeDialog() {
                   use-input
                   input-debounce="0"
                   @update:model-value="changeEmployeeClass"
+                  style="width: 250px"
                 />
-              </div>
-              <div class="col-3">
+
                 <q-select
                   hide-bottom-space
                   :rules="[(val:string) => !!val || `${'กรุณาเลือก ฟิลด์ที่จะค้น'}`]"
@@ -298,59 +298,18 @@ function closeDialog() {
                   use-input
                   input-debounce="0"
                   @update:model-value="selectTypeKeyword(typeKeyword)"
+                  style="width: 250px"
                 />
               </div>
 
-              <div class="col" v-if="typeKeyword === 'no'">
-                <q-input
-                  borderless
-                  outlined
-                  dense
-                  debounce="300"
-                  v-model="Keyword"
-                  placeholder="ตำแหน่งเลขที่"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอก ตำแหน่งเลขที่'}`]"
-                  hide-bottom-space
-                />
-              </div>
-
-              <div class="col" v-if="typeKeyword === 'position'">
-                <q-select
-                  hide-bottom-space
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือก ตำแหน่ง'}`]"
-                  outlined
-                  dense
-                  v-model="positionKeyword"
-                  emit-value
-                  map-options
-                  :options="options"
-                  option-label="name"
-                  option-value="id"
-                  :label="`${' เลือกตำแหน่ง'}`"
-                  use-input
-                  input-debounce="0"
-                  @filter="filterFn"
-                  behavior="menu"
-                >
-                  <template v-slot:no-option>
-                    <q-item>
-                      <q-item-section class="text-grey">
-                        ไม่มีข้อมูล
-                      </q-item-section>
-                    </q-item>
-                  </template></q-select
-                >
-              </div>
-
               <q-space />
-
               <q-btn
                 color="primary"
                 icon="mdi-magnify"
                 label="ค้นหา"
                 @click="clickSearch(employeeClass)"
               />
-            </div>
+            </q-toolbar>
           </div>
 
           <div class="col-12 q-mt-sm">
diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index bada8fe49..8cfd6ebef 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -47,7 +47,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullName",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullName",
     headerStyle: "font-size: 14px; min-width: 200px",
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
index de8e16b39..6cc8999c2 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -215,6 +215,8 @@ async function getData() {
     .get(config.API.profileNewGovernmentById(profileId.value, empType.value))
     .then(async (res) => {
       const data = await res.data.result;
+      console.log(data);
+      
       formMain.ocId = data.org ?? "-"; //สังกัด
       formMain.positionId = data.position ?? "-"; //ตำแหน่ง
       formMain.positionLine = data.positionField ?? "-"; //สายงาน
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
index 7132a0860..dbd516fcc 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -39,7 +39,7 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 /**
  * props
  */
- const isLeave = defineModel<boolean>("isLeave", {
+const isLeave = defineModel<boolean>("isLeave", {
   required: true,
 });
 
@@ -230,7 +230,7 @@ function openDialogAdd() {
 /**
  * function fetch ข้อมูลรายการวินัย
  */
-function fetchData(id: string) {
+async function fetchData(id: string) {
   showLoader();
   http
     .get(config.API.profileNewDisciplineByProfileId(id, empType.value))
@@ -398,7 +398,6 @@ onMounted(() => {
       map-options
       :options="columns"
       option-value="name"
-      
       style="min-width: 140px"
     />
     <q-btn-toggle
diff --git a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
index 9e42e94c9..4894b6d90 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -256,7 +256,6 @@ onMounted(() => {
       map-options
       :options="columns"
       option-value="name"
-      
       style="min-width: 140px"
     />
     <q-btn-toggle
@@ -366,7 +365,7 @@ onMounted(() => {
                 flat
                 round
                 @click="openDialogEdit(props.row)"
-                ><q-tooltip>แก้ไข</q-tooltip></q-btn
+                ><q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
               >
             </div>
           </div>
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
index 3a23f8c2b..fe8367f91 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -82,7 +82,7 @@ const dataLabel = {
   religion: "ศาสนา",
   bloodGroup: "หมู่เลือด",
   phone: "เบอร์โทร",
-  email: "อีเมล์",
+  email: "อีเมล",
   prefix: "คำนำหน้าชื่อ",
   rank: "ยศ",
   firstName: "ชื่อ",
@@ -316,10 +316,11 @@ async function getData() {
 function onClickOpenDialog() {
   if (!informaData.value) return;
   modal.value = true;
+
   id.value = informaData.value.id;
   age.value = calculateAge(informaData.value.birthDate);
   formData.citizenId = informaData.value.citizenId;
-  formData.prefix = informaData.value.prefix;
+  formData.prefix = informaData.value.prefixMain;
   formData.rank = informaData.value.rank;
   formData.firstName = informaData.value.firstName;
   formData.lastName = informaData.value.lastName;
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
index 4dc42acaf..493ab8a4a 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -461,7 +461,7 @@ onMounted(async () => {
       icon="add"
       @click="
         () => {
-          changeNameData.prefix = profileInfo?.prefix;
+          changeNameData.prefix = profileInfo?.prefixMain;
           changeNameData.firstName = profileInfo?.firstName;
           changeNameData.lastName = profileInfo?.lastName;
           prefixChange = changeNameData.prefix;
@@ -496,7 +496,6 @@ onMounted(async () => {
       outlined
       emit-value
       map-options
-      
       options-dense
       option-value="name"
       style="min-width: 140px"
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
index 4acdc9736..a295f162e 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
@@ -68,12 +68,12 @@ const dataLabel = {
   registrationAddress: "ที่อยู่ตามทะเบียนบ้าน",
   registrationProvince: "จังหวัด",
   registrationDistrict: "เขต/อำเภอ",
-  registrationSubDistrict: "แขวง / ตำบล",
+  registrationSubDistrict: "แขวง/ตำบล",
   registrationZipCode: "รหัสไปรษณีย์",
   currentAddress: "ที่อยู่ปัจจุบัน",
   currentProvince: "จังหวัด",
   currentDistrict: "เขต/อำเภอ",
-  currentSubDistrict: "แขวง / ตำบล",
+  currentSubDistrict: "แขวง/ตำบล",
   currentZipCode: "รหัสไปรษณีย์",
   registrationSame: "ที่อยู่ปัจจุบันตรงกับที่อยู่ตามทะเบียนบ้าน",
 };
@@ -252,7 +252,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
 /**
  * ฟังก์ชันดึงข้อมูลที่อยู่
  *
- * ดึงข้อมูลที่อยู่ ข้อมูลจังหวัด ข้อมูล เขต / อำเภอ และข้อมูล แขวง / ตำบล
+ * ดึงข้อมูลที่อยู่ ข้อมูลจังหวัด ข้อมูล เขต / อำเภอ และข้อมูล แขวง/ตำบล
  */
 async function getData() {
   showLoader();
@@ -337,8 +337,8 @@ async function selectDistrict(e: string | null, name: string) {
 }
 
 /**
- * ฟังก์ชันเลือก  แขวง / ตำบล
- * @param e  แขวง / ตำบล ที่เลือก
+ * ฟังก์ชันเลือก  แขวง/ตำบล
+ * @param e  แขวง/ตำบล ที่เลือก
  * @param name 1 คือ ที่อยู่ตามทะเบียนบ้าน 2 คือ ที่อยู่ปัจจุบัน
  */
 function selectSubDistrict(e: string | null, name: string) {
@@ -743,7 +743,7 @@ onMounted(async () => {
                 v-model="formData.registrationSubDistrictId"
                 :options="store.Ops.subdistrictOps"
                 :label="dataLabel.registrationSubDistrict"
-                :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
+                :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล'}`]"
                 @update:model-value="(value:string) => selectSubDistrict(value, '1')"
                 @filter="(inputValue:string,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'subdistrictOps'
@@ -864,7 +864,7 @@ onMounted(async () => {
                   v-model="formData.currentSubDistrictId"
                   :options="store.Ops.subdistrictCOps"
                   :label="dataLabel.currentSubDistrict"
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล'}`]"
                   @update:model-value="(value:string) => selectSubDistrict(value, '2')"
                   @filter="(inputValue:string,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'subdistrictCOps'
@@ -941,7 +941,6 @@ onMounted(async () => {
             map-options
             :options="columnsHistory"
             option-value="name"
-            
             style="min-width: 140px"
           />
         </div>
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
index 1d31955f2..91716d594 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -1008,7 +1008,7 @@ onMounted(async () => {
                 />
               </div>
             </div>
-            <div class="row q-mt-md">
+            <div class="row">
               <div class="q-mr-sm">สถานภาพการมีชีวิต</div>
               <div>
                 <q-radio
diff --git a/src/modules/04_registryPerson/interface/request/Profile.ts b/src/modules/04_registryPerson/interface/request/Profile.ts
index c4f49124c..0a1719f8d 100644
--- a/src/modules/04_registryPerson/interface/request/Profile.ts
+++ b/src/modules/04_registryPerson/interface/request/Profile.ts
@@ -15,6 +15,7 @@ interface RequestObject {
   relationship?: string | null;
   religion?: string | null;
   phone?: string | null;
+  prefixMain: string;
   // telephoneNumber: string | null;
 }
 
diff --git a/src/modules/04_registryPerson/interface/response/Main.ts b/src/modules/04_registryPerson/interface/response/Main.ts
index 1c5a9bc45..7ca12cd24 100644
--- a/src/modules/04_registryPerson/interface/response/Main.ts
+++ b/src/modules/04_registryPerson/interface/response/Main.ts
@@ -3,6 +3,7 @@ interface DataType {
   posLevels: any;
   posTypeName: string;
   posTypeRank: number;
+  posTypeShortName?: string;
 }
 
 interface DataLevel {
@@ -27,7 +28,7 @@ interface DataPerson {
 }
 
 interface DataRequest {
-  createdAt: string|Date;
+  createdAt: string | Date;
   createdFullName?: string;
   detail: string;
   fullname: string;
@@ -117,6 +118,7 @@ interface DataProfile {
     posTypeName: string;
     posTypeRank: number;
   };
+  prefixMain: string;
 }
 
 interface DataLeave {
diff --git a/src/modules/04_registryPerson/interface/response/Profile.ts b/src/modules/04_registryPerson/interface/response/Profile.ts
index 6cc8bc90b..9363827a0 100644
--- a/src/modules/04_registryPerson/interface/response/Profile.ts
+++ b/src/modules/04_registryPerson/interface/response/Profile.ts
@@ -32,6 +32,7 @@ interface ResponseObject {
   relationship: string | null;
   religion: string | null;
   telephoneNumber: string | null;
+  prefixMain: string;
 }
 
 interface Religion {
@@ -94,6 +95,7 @@ interface PosType {
   lastUpdateFullName: string;
   posTypeName: string;
   posTypeRank: number;
+  posTypeShortName?: string;
 }
 
 export type {
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 4483f3c4a..dd23b8b07 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -33,16 +33,17 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
   ]);
   function fetchType(data: DataType[]) {
     posTypeMain.value = data;
+
     const list: DataOption[] = data.map((e: DataType) => ({
       id: e.id,
       name: e.posTypeName,
     }));
     posTypeOps.value = list;
   }
-  function fetchLevel(data: DataLevel[]) {
+  function fetchLevel(data: DataLevel[], shortName: string = "") {
     const list: DataOption[] = data.map((e: DataLevel) => ({
       id: e.id,
-      name: e.posLevelName,
+      name: `${shortName} ${e.posLevelName} `,
     }));
     const seen = new Set();
     posLevelOps.value = list.filter((item: DataOption) => {
diff --git a/src/modules/04_registryPerson/stores/Address.ts b/src/modules/04_registryPerson/stores/Address.ts
index 1ad7c7481..cd106d852 100644
--- a/src/modules/04_registryPerson/stores/Address.ts
+++ b/src/modules/04_registryPerson/stores/Address.ts
@@ -130,7 +130,7 @@ export const useAddressDataStore = defineStore("addess", () => {
   }
 
   /**
-   * ฟังก์ชันดึงข้อมูล  แขวง / ตำบล
+   * ฟังก์ชันดึงข้อมูล  แขวง/ตำบล
    * @param id  เขต / อำเภอ
    * @param position   ที่อยู่ตามทะเบียนบ้าน, ที่อยู่ปัจจุบัน
    */
diff --git a/src/modules/04_registryPerson/stores/LinkCenter.ts b/src/modules/04_registryPerson/stores/LinkCenter.ts
index 22cd3667d..ccfb5e911 100644
--- a/src/modules/04_registryPerson/stores/LinkCenter.ts
+++ b/src/modules/04_registryPerson/stores/LinkCenter.ts
@@ -243,7 +243,7 @@ export const useDataLinkCenter = defineStore("DataLinkCenter", () => {
   }
 
   /**
-   * ฟังก์ชันดึงข้อมูล  แขวง / ตำบล
+   * ฟังก์ชันดึงข้อมูล  แขวง/ตำบล
    * @param id  เขต / อำเภอ
    * @param position   ที่อยู่ตามทะเบียนบ้าน, ที่อยู่ปัจจุบัน
    */
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 37daea1da..3ee865cb4 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -349,6 +349,8 @@ async function fetchDataPersonal() {
     .get(config.API.registryNewByProfileId(profileId.value, empType.value))
     .then(async (res) => {
       formDetail.value = res.data.result;
+      console.log(formDetail.value);
+
       storeRegistry.isLeave = res.data.result.isLeave;
 
       if (res.data.result.leaveReason) {
@@ -956,7 +958,7 @@ onMounted(async () => {
                   {{ empType === "" ? "ระดับ" : "ระดับชั้นงาน" }}
                 </div>
                 <div class="col">
-                  {{ formDetail?.posLevel?.posLevelName || "-" }}
+                  {{ `${ empType === "" ? '': formDetail?.posType?.posTypeShortName } ${formDetail?.posLevel?.posLevelName}`  || "-" }}
                 </div>
               </div>
             </div>
diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index 2aa948d3e..e61a0397e 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -242,7 +242,10 @@ function selectType() {
  */
 function selectPosType(item: DataOption) {
   const dataType = store.posTypeMain.find((e: DataType) => e.id === item.id);
-  store.fetchLevel(dataType?.posLevels);
+  const shortName =
+    empType.value === "officer" ? "" : dataType?.posTypeShortName;
+
+  store.fetchLevel(dataType?.posLevels, shortName);
   store.labelOption.posType = item.name;
   store.labelOption.posLevel = "ทั้งหมด";
   store.formFilter.page = 1;
diff --git a/src/modules/04_registryPerson/views/requestEditView.vue b/src/modules/04_registryPerson/views/requestEditView.vue
index c15020ff5..bece2c089 100644
--- a/src/modules/04_registryPerson/views/requestEditView.vue
+++ b/src/modules/04_registryPerson/views/requestEditView.vue
@@ -13,6 +13,9 @@ const route = useRoute();
 const store = useRegistryNewDataStore();
 
 const isIDP = ref<boolean | null>(null);
+const isEmployee = ref<boolean>(
+  route.name?.toString() == "registryNewRequestEditEMP" ? true : false
+);
 
 onBeforeMount(async () => {
   isIDP.value = await (route.name?.toString() == "registryNewRequestEditEMP"
@@ -39,6 +42,7 @@ onMounted(() => {
         @click="router.go(-1)"
       />
       รายการคำร้องขอแก้ไขทะเบียนประวัติ
+      {{ `(${isEmployee ? "ลูกจ้างประจำ" : "ข้าราชการ กทม.สามัญ"})` }}
     </div>
   </div>
 
diff --git a/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue b/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
index dc2683063..42649725d 100644
--- a/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
+++ b/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
@@ -394,7 +394,7 @@ onMounted(() => {
       <q-select
         hide-bottom-space
         class="inputgreen"
-        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
         outlined
         dense
         lazy-rules
@@ -404,7 +404,7 @@ onMounted(() => {
         option-label="name"
         :options="Ops.subdistrictOps"
         option-value="id"
-        :label="`${'แขวง / ตำบล '}`"
+        :label="`${'แขวง/ตำบล '}`"
         @update:model-value="(value: string) => selectSubDistrict(value, '1')"
         use-input
         input-debounce="0"
@@ -522,7 +522,7 @@ onMounted(() => {
       <q-select
         hide-bottom-space
         class="inputgreen"
-        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
         outlined
         dense
         lazy-rules
@@ -532,7 +532,7 @@ onMounted(() => {
         option-label="name"
         :options="Ops.subdistrictCOps"
         option-value="id"
-        :label="`${'แขวง / ตำบล '}`"
+        :label="`${'แขวง/ตำบล '}`"
         @update:model-value="(value: string) => selectSubDistrict(value, '2')"
         use-input
         input-debounce="0"
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue
index 26af481ea..4a1db283d 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue
@@ -586,7 +586,7 @@ onMounted(async () => {
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -596,7 +596,7 @@ onMounted(async () => {
             option-label="name"
             :options="Ops.subdistrictOps"
             option-value="id"
-            :label="`${'แขวง / ตำบล '}`"
+            :label="`${'แขวง/ตำบล '}`"
             @update:model-value="(value: string) => selectSubDistrict(value, '1')"
             use-input
             input-debounce="0"
@@ -730,7 +730,7 @@ onMounted(async () => {
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -740,7 +740,7 @@ onMounted(async () => {
             option-label="name"
             :options="Ops.subdistrictCOps"
             option-value="id"
-            :label="`${'แขวง / ตำบล '}`"
+            :label="`${'แขวง/ตำบล '}`"
             @update:model-value="(value: string) => selectSubDistrict(value, '2')"
             use-input
             input-debounce="0"
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index fb2e966ce..35c25c205 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -16,8 +16,6 @@ import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 import AddList from "../ListRetirement/AddList.vue";
 
-const modalPersonal = ref<boolean>(false);
-const personId = ref<string>("");
 /** Use */
 const route = useRoute();
 const checkRoutePermisson = ref<boolean>(route.name == "retirementidDetail");
@@ -38,10 +36,12 @@ const myForm = ref<QForm | null>(null);
 
 /** ตัวแปร  */
 const retireld_params = route.params.retirementId;
+const retireld = ref<string>(retireld_params.toString());
+const modalPersonal = ref<boolean>(false);
+const personId = ref<string>("");
 const modalNote = ref<boolean>(false);
 const note = ref<string>("");
 const retireProfileId = ref<string>("");
-const retireld = ref<string>(retireld_params.toString());
 const profileId = ref<string>("");
 const filter = ref<string>("");
 const statusUpload = ref<boolean>();
@@ -56,7 +56,69 @@ const statusReport = ref<boolean>();
 const dataProfile = ref<Object>([]);
 
 /** คอลัมน์ที่แสดง */
-const columns = ref<any["columns"]>([]);
+const columns = ref<any["columns"]>([
+  {
+    name: "order",
+    label: "ลำดับ",
+    title: "ลำดับ",
+    field: "order",
+    align: "left",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    title: "ชื่อ-นามสกุล",
+    field: "name",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    title: "ตำแหน่ง",
+    subtitle: employeeType.value == "OFFICER" ? "ในสายงาน" : "",
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionType",
+    align: "left",
+    label: "ตำแหน่ง",
+    title: "ตำแหน่ง",
+    subtitle: employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน",
+    field: "positionType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+
+  {
+    name: "positionNumber",
+    align: "left",
+    label: "ตำแหน่ง (เลขที่) ",
+    title: "ตำแหน่ง",
+    subtitle: "เลขที่",
+    field: "positionNumber",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "organization",
+    align: "left",
+    label: "สังกัด",
+    title: "สังกัด",
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val: any, row: any) {
+      return findOrgName(row);
+    },
+  },
+]);
 const rows = ref<RetirementList[]>([]);
 const visibleColumns = ref<string[]>([
   "order",
@@ -79,118 +141,58 @@ function closeDialog() {
 }
 
 // fecthlist
-async function fecthlistprofile(id: string) {
+async function fetchlistprofile(id: string) {
   showLoader();
   await http
     .get(config.API.listRetire(id))
-    .then((res) => {
-      dataProfile.value = res.data.result;
-      round.value = res.data.result.round;
-      statusReport.value = res.data.result.json;
-      typeReport.value = res.data.result.typeReport;
-      textReport.value = res.data.result.detail;
-      employeeType.value = res.data.result.type;
+    .then(async (res) => {
+      const data = await res.data.result;
+
+      dataProfile.value = data;
+      round.value = data.round;
+      statusReport.value = data.json;
+      typeReport.value = data.typeReport;
+      textReport.value = data.detail;
+      employeeType.value = data.type;
 
       // รายชื่อผู้เกษียณอายุราชการ
-      rows.value = res.data.result.profile.map((e: any) => ({
-        id: e.id,
-        profileId: e.profileId,
-        order: e.order,
-        prefix: e.prefix,
-        firstName: e.firstName,
-        lastName: e.lastName,
-        name: e.prefix + e.firstName + " " + e.lastName,
-        organization: e.root,
-        position: e.position,
-        positionNumber: e.posNo,
-        positionType: e.posTypeName,
-        positionLevel: e.posLevelName,
-        reason: e.reason,
-        remove: e.remove,
-        root: e.root,
-        rootId: e.rootId,
-        child1: e.child1,
-        child1Id: e.child1Id,
-        child2: e.child2,
-        child2Id: e.child2Id,
-        child3: e.child3,
-        child3Id: e.child3Id,
-        child4: e.child4,
-        child4Id: e.child4Id,
-      }));
+      if (data.profile !== null) {
+        rows.value = data.profile.map((e: any) => ({
+          id: e.id,
+          profileId: e.profileId,
+          order: e.order,
+          prefix: e.prefix,
+          firstName: e.firstName,
+          lastName: e.lastName,
+          name: e.prefix + e.firstName + " " + e.lastName,
+          organization: e.root,
+          position: e.position,
+          positionNumber: e.posNo,
+          positionType: e.posTypeName,
+          positionLevel: e.posLevelName,
+          reason: e.reason,
+          remove: e.remove,
+          root: e.root,
+          rootId: e.rootId,
+          child1: e.child1,
+          child1Id: e.child1Id,
+          child2: e.child2,
+          child2Id: e.child2Id,
+          child3: e.child3,
+          child3Id: e.child3Id,
+          child4: e.child4,
+          child4Id: e.child4Id,
+        }));
+      }
+
       if (statusReport.value == false) {
-        fecthCheck(retireld.value);
+        await fecthCheck(retireld.value);
       } else statusUpload.value = true;
     })
     .catch((e) => {
       messageError($q, e);
     })
     .finally(() => {
-      //คอลัมน์
-      columns.value = [
-        {
-          name: "order",
-          label: "ลำดับ",
-          title: "ลำดับ",
-          field: "order",
-          align: "left",
-          headerStyle: "font-size: 14px",
-          style: "font-size: 14px",
-        },
-        {
-          name: "name",
-          align: "left",
-          label: "ชื่อ - นามสกุล",
-          title: "ชื่อ - นามสกุล",
-          field: "name",
-          headerStyle: "font-size: 14px",
-          style: "font-size: 14px",
-        },
-        {
-          name: "position",
-          align: "left",
-          label: "ตำแหน่ง",
-          title: "ตำแหน่ง",
-          subtitle: employeeType.value == "OFFICER" ? "ในสายงาน" : "",
-          field: "position",
-          headerStyle: "font-size: 14px",
-          style: "font-size: 14px",
-        },
-        {
-          name: "positionType",
-          align: "left",
-          label: "ตำแหน่ง",
-          title: "ตำแหน่ง",
-          subtitle: employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน",
-          field: "positionType",
-          headerStyle: "font-size: 14px",
-          style: "font-size: 14px",
-        },
-
-        {
-          name: "positionNumber",
-          align: "left",
-          label: "ตำแหน่ง (เลขที่) ",
-          title: "ตำแหน่ง",
-          subtitle: "เลขที่",
-          field: "positionNumber",
-          headerStyle: "font-size: 14px",
-          style: "font-size: 14px",
-        },
-        {
-          name: "organization",
-          align: "left",
-          label: "สังกัด",
-          title: "สังกัด",
-          field: "organization",
-          headerStyle: "font-size: 14px",
-          style: "font-size: 14px",
-          format(val: any, row: any) {
-            return findOrgName(row);
-          },
-        },
-      ];
-
       hideLoader();
     });
 }
@@ -212,21 +214,23 @@ function clickDelete() {
   dialogRemove(
     $q,
     async () => {
+      showLoader();
       await http
         .post(config.API.removeProfile(), {
           retireProfileId: retireProfileId.value,
           reason: note.value,
         })
-        .then(() => {
+        .then(async () => {
+          retireld.value = retireld_params.toString();
+          await fetchlistprofile(retireld.value);
+          modalNote.value = false;
           success($q, "ลบข้อมูลสำเร็จ");
         })
         .catch((e) => {
           messageError($q, e);
         })
         .finally(async () => {
-          retireld.value = retireld_params.toString();
-          await fecthlistprofile(retireld.value);
-          modalNote.value = false;
+          hideLoader();
         });
     },
     "ยืนยันการลบข้อมูล",
@@ -239,21 +243,23 @@ function saveNote() {
   dialogConfirm(
     $q,
     async () => {
+      showLoader();
       await http
         .post(config.API.createnote(), {
           retireProfileId: retireProfileId.value,
           reason: note.value,
         })
-        .then(() => {
+        .then(async () => {
+          retireld.value = retireld_params.toString();
+          await fetchlistprofile(retireld.value);
+          modalNote.value = false;
           success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((e) => {
           messageError($q, e);
         })
-        .finally(async () => {
-          retireld.value = retireld_params.toString();
-          fecthlistprofile(retireld.value);
-          modalNote.value = false;
+        .finally(() => {
+          hideLoader();
         });
     },
     "ยืนยันการบันทึกข้อมูล",
@@ -264,7 +270,7 @@ function saveNote() {
 //อัพเดท ListId
 function UpdateListId(retireld: string, pId: string) {
   profileId.value = pId;
-  fecthlistprofile(retireld);
+  fetchlistprofile(retireld);
 }
 
 // กลับหน้าเดิม
@@ -300,18 +306,18 @@ async function uploadFile(event: any, signDate: any) {
                 formdata
               )
               .then(async (res) => {
+                await fetchlistprofile(retireld.value);
+                modalUpload.value = false;
+                success($q, "เพิ่มไฟล์สำเร็จ");
                 fileUpload.value = null;
                 signDate.value = null;
-                modalUpload.value = false;
-                await fecthlistprofile(retireld.value);
-                await fecthCheck(retireld.value);
-                hideLoader();
-                success($q, "เพิ่มไฟล์สำเร็จ");
               })
               .catch((err) => {
                 messageError($q, err);
               })
-              .finally(() => {});
+              .finally(() => {
+                hideLoader();
+              });
           },
           "ยืนยันการอัปโหลดเอกสาร",
           "ต้องการยืนยันการอัปโหลดเอกสารนี้หรือไม่ ?"
@@ -333,13 +339,13 @@ async function downloadAttachment(type: string, id: string) {
     .then(async (res) => {
       const data = res.data.result;
       await genReport(data, `รายชื่อผู้เกษียณอายุราชการ`, type);
-      hideLoader();
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 // ยืนยันการแก้ไขข้อมูล
@@ -349,17 +355,19 @@ function saveEdiitReport(reason: string) {
   dialogConfirm(
     $q,
     async () => {
+      showLoader();
       await http
         .put(config.API.editDetail(retireld.value), formdata)
         .then(() => {
+          fetchlistprofile(retireld.value);
+          modalEdit.value = false;
           success($q, "แก้ไขข้อความสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);
         })
         .finally(() => {
-          fecthlistprofile(retireld.value);
-          modalEdit.value = false;
+          hideLoader();
         });
     },
     "ยืนยันการแก้ไขข้อมูล",
@@ -400,9 +408,9 @@ function updatemodalPersonal(modal: boolean) {
 }
 
 /** Hook */
-onMounted(() => {
+onMounted(async () => {
   retireld.value = retireld_params.toString();
-  fecthlistprofile(retireld.value);
+  await fetchlistprofile(retireld.value);
 });
 </script>
 
@@ -525,7 +533,6 @@ onMounted(() => {
               map-options
               :options="columns"
               option-value="name"
-              
               style="min-width: 140px"
               class="gt-xs q-ml-sm"
             >
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 91ea55927..808e2c9bc 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -308,7 +308,7 @@ const filterOption = ref<OptionData[]>([
   },
   {
     id: "fullName",
-    name: "ชื่อ - นามสกุล",
+    name: "ชื่อ-นามสกุล",
   },
 ]);
 
diff --git a/src/modules/07_insignia/views/03_ResultMain.vue b/src/modules/07_insignia/views/03_ResultMain.vue
index da524ca7a..f2790ec0c 100644
--- a/src/modules/07_insignia/views/03_ResultMain.vue
+++ b/src/modules/07_insignia/views/03_ResultMain.vue
@@ -98,7 +98,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
diff --git a/src/modules/07_insignia/views/05_BorrowMain.vue b/src/modules/07_insignia/views/05_BorrowMain.vue
index c2854387e..d092982f4 100644
--- a/src/modules/07_insignia/views/05_BorrowMain.vue
+++ b/src/modules/07_insignia/views/05_BorrowMain.vue
@@ -76,7 +76,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     headerStyle: "font-size: 14px",
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 5a730c157..95c39fca9 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -128,12 +128,13 @@ const columns = ref<QTableProps["columns"]>([
   },
 
   {
-    name: "salaryDate",
+    name: "dateAppoint",
     align: "left",
     label: "วันที่แต่งตั้ง",
     sortable: true,
-    field: "salaryDate",
+    field: "dateAppoint",
     headerStyle: "font-size: 14px",
+    format: (val) => date2Thai(val),
     style: "font-size: 14px",
   },
   {
@@ -191,6 +192,7 @@ const visibleColumns = ref<String[]>([
   "createdAt",
   "dateRetireLaw",
   "statustext",
+  "dateAppoint",
 ]);
 
 /**
diff --git a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue b/src/modules/09_leave/components/01_RoundTime/DialogForm.vue
similarity index 97%
rename from src/modules/09_leave/components/3_WorkTime/DialogForm.vue
rename to src/modules/09_leave/components/01_RoundTime/DialogForm.vue
index 96dfb155e..e225204db 100644
--- a/src/modules/09_leave/components/3_WorkTime/DialogForm.vue
+++ b/src/modules/09_leave/components/01_RoundTime/DialogForm.vue
@@ -16,7 +16,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
 const $q = useQuasar();
 
 const mixin = useCounterMixin();
-const { dialogConfirm, success, messageError } = mixin;
+const { dialogConfirm, success, messageError, showLoader, hideLoader } = mixin;
 const isRead = defineModel<boolean>("isRead", { required: true });
 /** propsData จาก RoundMain */
 const props = defineProps({
@@ -104,22 +104,25 @@ function onSubmit() {
 
 /** Function สร้างรอบการปฏิบัติงาน*/
 async function postRoundDuty() {
+  showLoader();
   await http
     .post(config.API.roundDutytime(), formData)
-    .then(() => {
+    .then(async () => {
+      await props.fetchData?.();
+      await props.closeDialog?.();
       success($q, "บันทึกข้อมูล");
     })
     .catch((err) => {
       messageError($q, err);
     })
     .finally(() => {
-      props.fetchData?.();
-      props.closeDialog?.();
+      hideLoader();
     });
 }
 
 /** Functiom แก้ไข้รอบการปฏิบัติงาน*/
 async function putRoundDuty(id: string) {
+  showLoader();
   const data = {
     description: formData.description,
     isDefault: formData.isDefault,
@@ -127,15 +130,16 @@ async function putRoundDuty(id: string) {
   };
   await http
     .put(config.API.roundDutytimeByid(id), data)
-    .then(() => {
+    .then(async () => {
+      await props.fetchData?.();
+      await props.closeDialog?.();
       success($q, "บันทึกข้อมูล");
     })
     .catch((err) => {
       messageError($q, err);
     })
     .finally(() => {
-      props.fetchData?.();
-      props.closeDialog?.();
+      hideLoader();
     });
 }
 
diff --git a/src/modules/09_leave/components/1_Work/DialogDetail.vue b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
similarity index 99%
rename from src/modules/09_leave/components/1_Work/DialogDetail.vue
rename to src/modules/09_leave/components/02_WorkList/DialogDetail.vue
index 1a58058d9..2f24fad01 100644
--- a/src/modules/09_leave/components/1_Work/DialogDetail.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
@@ -8,7 +8,7 @@ import { useQuasar } from "quasar";
 import type { FormDetail } from "@/modules/09_leave/interface/response/work";
 
 /** importComponents*/
-import Map from "@/modules/09_leave/components/1_Work/DialogMap.vue";
+import Map from "@/modules/09_leave/components/02_WorkList/DialogMap.vue";
 
 /** importStores */
 import { useCounterMixin } from "@/stores/mixin";
diff --git a/src/modules/09_leave/components/1_Work/DialogEdit.vue b/src/modules/09_leave/components/02_WorkList/DialogEdit.vue
similarity index 94%
rename from src/modules/09_leave/components/1_Work/DialogEdit.vue
rename to src/modules/09_leave/components/02_WorkList/DialogEdit.vue
index 4245853cb..b9649d968 100644
--- a/src/modules/09_leave/components/1_Work/DialogEdit.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogEdit.vue
@@ -65,7 +65,9 @@ async function onClickSave() {
       showLoader();
       await http
         .put(config.API.leaveEditCheckin(props.detail?.id), body)
-        .then(() => {
+        .then(async () => {
+          await props.fetchData?.();
+          await props.close?.();
           success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((err) => {
@@ -73,14 +75,12 @@ async function onClickSave() {
         })
         .finally(() => {
           hideLoader();
-          props.fetchData?.();
-          props.close?.();
         });
     });
   }
 }
 
-function filterFnOptions(val: any, update: Function) {
+function filterFnOptions(val: string, update: Function) {
   update(() => {
     options.value = optionsMain.value.filter(
       (v: DataOption) => v.name.indexOf(val) > -1
@@ -143,7 +143,7 @@ watch(
               :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
               hide-bottom-space
               use-input
-              @filter="(inputValue: any,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
+              @filter="(inputValue: string,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
               ><template v-slot:no-option>
                 <q-item>
                   <q-item-section class="text-grey">
@@ -178,7 +178,7 @@ watch(
               :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
               hide-bottom-space
               use-input
-              @filter="(inputValue: any,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
+              @filter="(inputValue: string,doneFn: Function) => filterFnOptions(inputValue, doneFn)"
               ><template v-slot:no-option>
                 <q-item>
                   <q-item-section class="text-grey">
diff --git a/src/modules/09_leave/components/1_Work/DialogMap.vue b/src/modules/09_leave/components/02_WorkList/DialogMap.vue
similarity index 100%
rename from src/modules/09_leave/components/1_Work/DialogMap.vue
rename to src/modules/09_leave/components/02_WorkList/DialogMap.vue
diff --git a/src/modules/09_leave/components/1_Work/DialogReport.vue b/src/modules/09_leave/components/02_WorkList/DialogReport.vue
similarity index 97%
rename from src/modules/09_leave/components/1_Work/DialogReport.vue
rename to src/modules/09_leave/components/02_WorkList/DialogReport.vue
index 007efd4b2..eddf37943 100644
--- a/src/modules/09_leave/components/1_Work/DialogReport.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogReport.vue
@@ -21,8 +21,8 @@ const mixin = useCounterMixin();
 const $q = useQuasar();
 const { date2Thai, monthYear2Thai, dateToISO, messageError } = mixin;
 
-const apiGenReport =
-  "https://report-server.frappet.synology.me/api/v1/report-template/xlsx";
+// const apiGenReport =
+//   "https://report-server.frappet.synology.me/api/v1/report-template/xlsx";
 
 const props = defineProps({
   modal: {
@@ -126,7 +126,7 @@ function filterFnOptions(val: any, update: Function) {
  */
 async function genReportXLSX(data: any) {
   await axios
-    .post(apiGenReport, data, {
+    .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
         accept:
           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
@@ -134,9 +134,9 @@ async function genReportXLSX(data: any) {
       },
       responseType: "blob",
     })
-    .then((res) => {
+    .then(async (res) => {
       const blob = new Blob([res.data]);
-      downloadReport(blob, "xlsx");
+      await downloadReport(blob, "xlsx");
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
diff --git a/src/modules/09_leave/components/1_Work/Tab1.vue b/src/modules/09_leave/components/02_WorkList/Tab1.vue
similarity index 97%
rename from src/modules/09_leave/components/1_Work/Tab1.vue
rename to src/modules/09_leave/components/02_WorkList/Tab1.vue
index cd820c101..484ec5b44 100644
--- a/src/modules/09_leave/components/1_Work/Tab1.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab1.vue
@@ -12,8 +12,8 @@ import type {
 } from "@/modules/09_leave/interface/response/work";
 
 /** importComponents */
-import ToolBar from "@/modules/09_leave/components/1_Work/ToolBar.vue";
-import TableList from "@/modules/09_leave/components/1_Work/TableList.vue";
+import ToolBar from "@/modules/09_leave/components/02_WorkList/ToolBar.vue";
+import TableList from "@/modules/09_leave/components/02_WorkList/TableList.vue";
 
 /** importStores */
 import { useCounterMixin } from "@/stores/mixin";
@@ -121,6 +121,7 @@ const rows = ref<TableRowsTime[]>([]);
 
 /** function เรียกข้อมูล รายการลงเวลาที่ประมวลผลแล้ว*/
 async function fetchListTimeRecord() {
+  rows.value = [];
   const date = new Date(workStore.selectDate as string | Date);
   const querySting = {
     startDate: dateToISO(date), //*วันที่เริ่ม
diff --git a/src/modules/09_leave/components/1_Work/Tab2.vue b/src/modules/09_leave/components/02_WorkList/Tab2.vue
similarity index 96%
rename from src/modules/09_leave/components/1_Work/Tab2.vue
rename to src/modules/09_leave/components/02_WorkList/Tab2.vue
index 5b4742843..5bfa5752e 100644
--- a/src/modules/09_leave/components/1_Work/Tab2.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab2.vue
@@ -12,8 +12,8 @@ import type {
 } from "@/modules/09_leave/interface/response/work";
 
 /** importComponents */
-import ToolBarDate from "@/modules/09_leave/components/1_Work/ToolBarDate.vue";
-import TableList from "@/modules/09_leave/components/1_Work/TableList.vue";
+import ToolBarDate from "@/modules/09_leave/components/02_WorkList/ToolBarDate.vue";
+import TableList from "@/modules/09_leave/components/02_WorkList/TableList.vue";
 
 /** importStores */
 import { useCounterMixin } from "@/stores/mixin";
@@ -102,6 +102,7 @@ const maxPage = ref<number>(1);
 
 /** function เรียกข้อมูลรายการลงเวลาปฏิบัติงาน (รายการลงเวลา) */
 async function fetchListLogRecord() {
+  rows.value = [];
   showLoader();
   const date = new Date(workStore.selectDate as string | Date);
   await http
@@ -132,7 +133,6 @@ async function fetchListLogRecord() {
     })
     .catch((err) => {
       messageError($q, err);
-      rows.value = [];
     })
     .finally(() => {
       hideLoader();
diff --git a/src/modules/09_leave/components/1_Work/TableList.vue b/src/modules/09_leave/components/02_WorkList/TableList.vue
similarity index 96%
rename from src/modules/09_leave/components/1_Work/TableList.vue
rename to src/modules/09_leave/components/02_WorkList/TableList.vue
index 565121632..d61e0ceec 100644
--- a/src/modules/09_leave/components/1_Work/TableList.vue
+++ b/src/modules/09_leave/components/02_WorkList/TableList.vue
@@ -5,8 +5,8 @@ import { checkPermission } from "@/utils/permissions";
 import { useWorklistDataStore } from "@/modules/09_leave/stores/WorkStore";
 
 /** importComponents */
-import DialogDetail from "@/modules/09_leave/components/1_Work/DialogDetail.vue";
-import DialogEdit from "@/modules/09_leave/components/1_Work/DialogEdit.vue";
+import DialogDetail from "@/modules/09_leave/components/02_WorkList/DialogDetail.vue";
+import DialogEdit from "@/modules/09_leave/components/02_WorkList/DialogEdit.vue";
 
 const workStore = useWorklistDataStore();
 const props = defineProps({
@@ -44,7 +44,7 @@ const emit = defineEmits(["update:pagination"]);
 
 /** ข้อมูล popup */
 const modal = ref<boolean>(false);
-const dataDetail = ref<any>([]);
+const dataDetail = ref<any>();
 const modalEdit = ref<boolean>(false);
 
 /** pagination */
diff --git a/src/modules/09_leave/components/1_Work/ToolBar.vue b/src/modules/09_leave/components/02_WorkList/ToolBar.vue
similarity index 100%
rename from src/modules/09_leave/components/1_Work/ToolBar.vue
rename to src/modules/09_leave/components/02_WorkList/ToolBar.vue
diff --git a/src/modules/09_leave/components/1_Work/ToolBarDate.vue b/src/modules/09_leave/components/02_WorkList/ToolBarDate.vue
similarity index 100%
rename from src/modules/09_leave/components/1_Work/ToolBarDate.vue
rename to src/modules/09_leave/components/02_WorkList/ToolBarDate.vue
diff --git a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
similarity index 100%
rename from src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
rename to src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
similarity index 100%
rename from src/modules/09_leave/components/4_specialTime/DialogApprove.vue
rename to src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
diff --git a/src/modules/09_leave/components/4_specialTime/Table.vue b/src/modules/09_leave/components/04_SpecialTime/Table.vue
similarity index 100%
rename from src/modules/09_leave/components/4_specialTime/Table.vue
rename to src/modules/09_leave/components/04_SpecialTime/Table.vue
diff --git a/src/modules/09_leave/components/2_Leave/Calendar.vue b/src/modules/09_leave/components/05_Leave/Calendar.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/Calendar.vue
rename to src/modules/09_leave/components/05_Leave/Calendar.vue
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/05_Leave/DetailLeave.vue
similarity index 95%
rename from src/modules/09_leave/components/2_Leave/DetailLeave.vue
rename to src/modules/09_leave/components/05_Leave/DetailLeave.vue
index 3b1ddf7a9..e45daa5ee 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeave.vue
@@ -16,18 +16,18 @@ import type { LeaveType } from "@/modules/09_leave/interface/response/leave";
 
 /** importForm*/
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
-import FormMain from "@/modules/09_leave/components/2_Leave/formDetail/formMain.vue"; // from ซ้าย
-import FormLeave from "@/modules/09_leave/components/2_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
-import FormChildbirth from "@/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
-import FormHoliday from "@/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
-import FormUpasom from "@/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
-import FormHajj from "@/modules/09_leave/components/2_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
-import FormCheckSelect from "@/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
-import FormStudy from "@/modules/09_leave/components/2_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
-import FormLeaveToTraining from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
-import FormLeaveToWorkInternational from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
-import FormSpouse from "@/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
-import FormVocationalRehabilitation from "@/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
+import FormMain from "@/modules/09_leave/components/05_Leave/formDetail/formMain.vue"; // from ซ้าย
+import FormLeave from "@/modules/09_leave/components/05_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
+import FormChildbirth from "@/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
+import FormHoliday from "@/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
+import FormUpasom from "@/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
+import FormHajj from "@/modules/09_leave/components/05_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
+import FormCheckSelect from "@/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
+import FormStudy from "@/modules/09_leave/components/05_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
+import FormLeaveToTraining from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
+import FormLeaveToWorkInternational from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
+import FormSpouse from "@/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
+import FormVocationalRehabilitation from "@/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
 import WorkFlow from "@/components/Workflow/Main.vue";
 
 /** use */
@@ -574,7 +574,7 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 row">
                     <div class="col-xs-5 col-sm-3 text-grey-8">
-                      ชื่อ - นามสกุล
+                      ชื่อ-นามสกุล
                     </div>
                     <div class="col text-weight-medium">
                       {{ formData.fullName }}
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
similarity index 94%
rename from src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
rename to src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
index aad0434ea..475ad5c19 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
@@ -19,18 +19,18 @@ import type { FremData } from "@/modules/09_leave/interface/request/leave";
 
 /** importForm*/
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
-import FormMain from "@/modules/09_leave/components/2_Leave/formDetail/formMain.vue"; // from ซ้าย
-import FormLeave from "@/modules/09_leave/components/2_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
-import FormChildbirth from "@/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
-import FormHoliday from "@/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
-import FormUpasom from "@/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
-import FormHajj from "@/modules/09_leave/components/2_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
-import FormCheckSelect from "@/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
-import FormStudy from "@/modules/09_leave/components/2_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
-import FormLeaveToTraining from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
-import FormLeaveToWorkInternational from "@/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
-import FormSpouse from "@/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
-import FormVocationalRehabilitation from "@/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
+import FormMain from "@/modules/09_leave/components/05_Leave/formDetail/formMain.vue"; // from ซ้าย
+import FormLeave from "@/modules/09_leave/components/05_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
+import FormChildbirth from "@/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
+import FormHoliday from "@/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue"; //ลาพักผ่อน
+import FormUpasom from "@/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue"; // ลาอุปสมบท
+import FormHajj from "@/modules/09_leave/components/05_Leave/formDetail/formHajj.vue"; //ลาประกอบพิธีฮัจญ์
+import FormCheckSelect from "@/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue"; //ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล
+import FormStudy from "@/modules/09_leave/components/05_Leave/formDetail/formStudy.vue"; //ลาไปศึกษา
+import FormLeaveToTraining from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue"; // ลาไปฝึกอบรม ปฏิบัติการวิจัย หรือดูงาน
+import FormLeaveToWorkInternational from "@/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue"; // ลาไปปฏิบัติงานในองค์การระหว่างประเทศ
+import FormSpouse from "@/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue"; // ลาติดตามคู่สมรส
+import FormVocationalRehabilitation from "@/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue"; //ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ
 import WorkFlow from "@/components/Workflow/Main.vue";
 
 /** use */
@@ -549,7 +549,7 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
                   </div>
                   <div class="col-12 row">
                     <div class="col-xs-5 col-sm-3 text-grey-8">
-                      ชื่อ - นามสกุล
+                      ชื่อ-นามสกุล
                     </div>
                     <div class="col text-weight-medium">
                       {{ formData.fullName }}
diff --git a/src/modules/09_leave/components/2_Leave/Tab1.vue b/src/modules/09_leave/components/05_Leave/Tab1.vue
similarity index 83%
rename from src/modules/09_leave/components/2_Leave/Tab1.vue
rename to src/modules/09_leave/components/05_Leave/Tab1.vue
index d48562785..eca64a497 100644
--- a/src/modules/09_leave/components/2_Leave/Tab1.vue
+++ b/src/modules/09_leave/components/05_Leave/Tab1.vue
@@ -8,14 +8,11 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
 
 /**importType*/
-import type {
-  QuerySting,
-  DateFilter,
-} from "@/modules/09_leave/interface/request/leave";
+import type { QuerySting } from "@/modules/09_leave/interface/request/leave";
 
-import TableList from "@/modules/09_leave/components/2_Leave/TableList.vue";
-import ToolBar from "@/modules/09_leave/components/2_Leave/ToolBarLeave.vue";
-import CalendarView from "@/modules/09_leave/components/2_Leave/Calendar.vue";
+import TableList from "@/modules/09_leave/components/05_Leave/TableList.vue";
+import ToolBar from "@/modules/09_leave/components/05_Leave/ToolBarLeave.vue";
+import CalendarView from "@/modules/09_leave/components/05_Leave/Calendar.vue";
 
 const $q = useQuasar(); //ใช้ noti quasar
 const mixin = useCounterMixin();
@@ -49,13 +46,13 @@ async function fecthLeaveList() {
     showLoader();
     await http
       .post(config.API.leaveList(), querySting)
-      .then((res) => {
+      .then(async (res) => {
         const data = res.data.result;
         totalList.value = Math.ceil(
           res.data.result.total / querySting.pageSize
         );
         total.value = res.data.result.total;
-        leaveStore.fetchListLeave(data.data); /** ส่งข้อมูลไป stores*/
+        await leaveStore.fetchListLeave(data.data); /** ส่งข้อมูลไป stores*/
       })
       .catch((err) => {
         messageError($q, err);
@@ -75,8 +72,7 @@ async function fetchOption() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {});
+    });
 }
 
 function getSearch() {
@@ -95,13 +91,12 @@ watch(
   () => leaveStore.tabView,
   async () => {
     leaveStore.tabView === "list" &&
-      (await fecthLeaveList(), await fetchOption());
+      (await Promise.all([fetchOption(), fecthLeaveList()]));
   }
 );
 
 onMounted(async () => {
-  await fetchOption();
-  await fecthLeaveList();
+  await Promise.all([fetchOption(), fecthLeaveList()]);
 });
 </script>
 <template>
@@ -144,7 +139,12 @@ onMounted(async () => {
     </q-tabs>
   </q-toolbar>
   <div v-if="leaveStore.tabView === 'list'">
-    <ToolBar :dataToobar="dataToobar" v-model:query-sting="querySting" :get-list="fecthLeaveList" :get-search="getSearch"/>
+    <ToolBar
+      :dataToobar="dataToobar"
+      v-model:query-sting="querySting"
+      :get-list="fecthLeaveList"
+      :get-search="getSearch"
+    />
     <TableList
       v-model:total="total"
       v-model:total-list="totalList"
diff --git a/src/modules/09_leave/components/2_Leave/Tab2.vue b/src/modules/09_leave/components/05_Leave/Tab2.vue
similarity index 74%
rename from src/modules/09_leave/components/2_Leave/Tab2.vue
rename to src/modules/09_leave/components/05_Leave/Tab2.vue
index b1c4cf4b1..9daa0ade5 100644
--- a/src/modules/09_leave/components/2_Leave/Tab2.vue
+++ b/src/modules/09_leave/components/05_Leave/Tab2.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted,watch } from "vue";
+import { ref, reactive, onMounted, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
@@ -13,8 +13,8 @@ import type {
   DateFilter,
 } from "@/modules/09_leave/interface/request/leave";
 
-import TableList from "@/modules/09_leave/components/2_Leave/TableList.vue";
-import ToolBar from "@/modules/09_leave/components/2_Leave/ToolBarLeave.vue";
+import TableList from "@/modules/09_leave/components/05_Leave/TableList.vue";
+import ToolBar from "@/modules/09_leave/components/05_Leave/ToolBarLeave.vue";
 
 const mixin = useCounterMixin();
 const leaveStore = useLeavelistDataStore();
@@ -63,28 +63,6 @@ async function fecthLeaveList() {
         hideLoader();
       });
   }
-  // const data = APIDATA.data;
-}
-
-/**
- *
- * @param newPage หน้า
- * @param pageSize จำนวนต่อแถว
- * @param dateFilter ข้อมูลค้นหา
- */
-async function updatePaging(
-  newPage: number,
-  pageSize: number,
-  dateFilter: DateFilter
-) {
-  querySting.year = dateFilter ? dateFilter.year : querySting.year;
-  querySting.type = dateFilter ? dateFilter.type : querySting.type;
-  querySting.status = dateFilter ? dateFilter.status : querySting.status;
-  querySting.page = newPage;
-  querySting.pageSize = pageSize ? pageSize : querySting.pageSize;
-  querySting.keyword = dateFilter ? dateFilter.keyword : querySting.keyword;
-
-  await fecthLeaveList();
 }
 
 /** function เรียกข้อมูลสถานะ*/
@@ -96,8 +74,7 @@ async function fetchOption() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {});
+    });
 }
 
 function getSearch() {
@@ -113,8 +90,7 @@ watch(
 );
 
 onMounted(async () => {
-  await fetchOption();
-  await fecthLeaveList();
+  await Promise.all([fetchOption(), fecthLeaveList()]);
 });
 </script>
 <template>
diff --git a/src/modules/09_leave/components/2_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
similarity index 98%
rename from src/modules/09_leave/components/2_Leave/TableList.vue
rename to src/modules/09_leave/components/05_Leave/TableList.vue
index 491d3a1c9..30f52e52c 100644
--- a/src/modules/09_leave/components/2_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -261,7 +261,7 @@ onMounted(() => {
     dense
     class="custom-header-table"
     :visible-columns="leaveStore.visibleColumns"
-    :rows-per-page-options="[1, 25, 50, 100]"
+    :rows-per-page-options="[10, 25, 50, 100]"
     @update:pagination="updatePagination"
   >
     <template v-slot:header="props">
@@ -290,9 +290,7 @@ onMounted(() => {
         <q-td v-for="col in props.cols" :key="col.name" :props="props">
           <div v-if="col.name == 'no'">
             {{
-              (pagination.page - 1) * pagination.pageSize +
-              props.rowIndex +
-              1
+              (pagination.page - 1) * pagination.pageSize + props.rowIndex + 1
             }}
           </div>
           <div v-else-if="col.name == 'leaveTypeName'">
diff --git a/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue b/src/modules/09_leave/components/05_Leave/ToolBarLeave.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
rename to src/modules/09_leave/components/05_Leave/ToolBarLeave.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue b/src/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formCheckSelect.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue b/src/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formChildbirth.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formHajj.vue b/src/modules/09_leave/components/05_Leave/formDetail/formHajj.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formHajj.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formHajj.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue b/src/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formHoliday.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formHoliday.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue b/src/modules/09_leave/components/05_Leave/formDetail/formLeave.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formLeave.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue b/src/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formLeaveToTraining.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue b/src/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formLeaveToWorkInternational.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue b/src/modules/09_leave/components/05_Leave/formDetail/formMain.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formMain.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue b/src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formStudy.vue b/src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formStudy.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formStudy.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue b/src/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formUpasom.vue
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue b/src/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue
similarity index 100%
rename from src/modules/09_leave/components/2_Leave/formDetail/formVocationalRehabilitation.vue
rename to src/modules/09_leave/components/05_Leave/formDetail/formVocationalRehabilitation.vue
diff --git a/src/modules/09_leave/interface/request/changeRound.ts b/src/modules/09_leave/interface/request/changeRound.ts
index 51154ff24..ed8c9347a 100644
--- a/src/modules/09_leave/interface/request/changeRound.ts
+++ b/src/modules/09_leave/interface/request/changeRound.ts
@@ -1,4 +1,4 @@
-interface dataPost {
+interface DataPost {
   cardId: string;
   firstName: string;
   lastName: string;
@@ -28,7 +28,7 @@ interface MyObjectRoundChangeMainRef {
   [key: string]: any;
 }
 export type {
-  dataPost,
+  DataPost,
   changeRoundEdit,
   MyObjectRoundChangeRef,
   MyObjectRoundChangeMainRef,
diff --git a/src/modules/09_leave/router.ts b/src/modules/09_leave/router.ts
index cda8f8e50..6666df9f0 100644
--- a/src/modules/09_leave/router.ts
+++ b/src/modules/09_leave/router.ts
@@ -1,16 +1,15 @@
-const workMain = () => import("@/modules/09_leave/views/WorkingMain.vue");
-const leaveMain = () => import("@/modules/09_leave/views/LeaveListMain.vue");
+const workMain = () => import("@/modules/09_leave/views/02_WorkingMain.vue");
+const leaveMain = () => import("@/modules/09_leave/views/05_LeaveListMain.vue");
 const leaveDetail = () =>
-  import("@/modules/09_leave/components/2_Leave/DetailLeave.vue");
+  import("@/modules/09_leave/components/05_Leave/DetailLeave.vue");
 const leaveDetailReject = () =>
-  import("@/modules/09_leave/components/2_Leave/DetailLeaveReject.vue");
-const RoundMain = () => import("@/modules/09_leave/views/RoundMain.vue");
+  import("@/modules/09_leave/components/05_Leave/DetailLeaveReject.vue");
+const RoundMain = () => import("@/modules/09_leave/views/01_RoundMain.vue");
 const ChangeRoundMain = () =>
-  import("@/modules/09_leave/views/ChangeRoundMain.vue");
+  import("@/modules/09_leave/views/03_ChangeRoundMain.vue");
 const SpecialTimeMain = () =>
-  import("@/modules/09_leave/views/SpecialTimeMain.vue");
-const leaveReport = () =>
-  import("@/modules/09_leave/components/3_Report/LeaveReport.vue");
+  import("@/modules/09_leave/views/04_SpecialTimeMain.vue");
+const leaveReport = () => import("@/modules/09_leave/views/06_ReportMain.vue");
 export default [
   {
     path: "/round-time",
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 6e5250267..183770760 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -116,7 +116,6 @@ export const useChangeRoundDataStore = defineStore(
 
     // ข้อมูลในตาราง
     function setProfileId(id: string) {
-      console.log(profileId);
       profileId.value = id;
     }
 
@@ -125,6 +124,7 @@ export const useChangeRoundDataStore = defineStore(
 
     function fetchDataForCardId(dataDetail: any) {
       if (dataDetail) {
+        rows.value = [];
         showLoader();
         http
           .post(config.API.leaveSearch(), {
@@ -152,8 +152,6 @@ export const useChangeRoundDataStore = defineStore(
                 currentRound: `${e.startTimeMorning}-${e.leaveTimeAfterNoon}`,
                 effectiveDate: date2Thai(e.effectiveDate) ?? "-",
               }));
-              console.log(profileId.value);
-              console.log(apiData.length);
             } else {
               rows.value = [];
               checkCilck.value = true;
diff --git a/src/modules/09_leave/stores/RoundStores.ts b/src/modules/09_leave/stores/RoundStores.ts
index b0f1d5d9e..c25ad5737 100644
--- a/src/modules/09_leave/stores/RoundStores.ts
+++ b/src/modules/09_leave/stores/RoundStores.ts
@@ -62,7 +62,7 @@ export const useRoundDataStore = defineStore("roundWorkStore", () => {
    * Function รับข้อมูลจาก API map
    * @param data รับข้อมูลจาก API
    */
-  function fetchData(data: dataRowRound[]) {
+  async function fetchData(data: dataRowRound[]) {
     let datalist: roundShow[] = data.map((e: dataRowRound) => {
       return {
         id: e.id,
diff --git a/src/modules/09_leave/views/RoundMain.vue b/src/modules/09_leave/views/01_RoundMain.vue
similarity index 94%
rename from src/modules/09_leave/views/RoundMain.vue
rename to src/modules/09_leave/views/01_RoundMain.vue
index 42c03c2c3..0ab49da05 100644
--- a/src/modules/09_leave/views/RoundMain.vue
+++ b/src/modules/09_leave/views/01_RoundMain.vue
@@ -9,7 +9,7 @@ import { useRoundDataStore } from "@/modules/09_leave/stores/RoundStores";
 import { useCounterMixin } from "@/stores/mixin";
 
 /** ImportComponents*/
-import DialogForm from "@/modules/09_leave/components/3_WorkTime/DialogForm.vue";
+import DialogForm from "@/modules/09_leave/components/01_RoundTime/DialogForm.vue";
 import { checkPermission } from "@/utils/permissions";
 
 const $q = useQuasar(); //ใช้ noti quasar
@@ -35,13 +35,13 @@ const resetFilter = () => {
 };
 
 /** Function get ข้อมูลรายการรอบการปฏิบัติงาน */
-async function fetchListRoind() {
+async function fetchListRound() {
   showLoader();
   await http
     .get(config.API.roundDutytime())
-    .then((res) => {
-      const data = res.data.result;
-      fetchData(data);
+    .then(async (res) => {
+      const data = await res.data.result;
+      await fetchData(data);
     })
     .catch((err) => {
       messageError($q, err);
@@ -57,16 +57,18 @@ async function fetchListRoind() {
  */
 function onClickDelete(id: string) {
   dialogRemove($q, async () => {
+    showLoader();
     await http
       .delete(config.API.roundDutytimeByid(id))
-      .then(() => {
+      .then(async () => {
+        await fetchListRound();
         success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
         messageError($q, err);
       })
-      .finally(async () => {
-        await fetchListRoind();
+      .finally(() => {
+        hideLoader();
       });
   });
 }
@@ -112,8 +114,8 @@ const pagination = ref({
 });
 
 /** Hook*/
-onMounted(() => {
-  fetchListRoind();
+onMounted(async () => {
+  await fetchListRound();
 });
 </script>
 <template>
@@ -172,7 +174,6 @@ onMounted(() => {
         map-options
         :options="dataStore.columns"
         option-value="name"
-        
         style="min-width: 140px"
         class="col-xs-12 col-sm-3 col-md-2"
       />
@@ -285,7 +286,7 @@ onMounted(() => {
     :closeDialog="closeDialog"
     :editCheck="editCheck"
     :detailData="detailData"
-    :fetchData="fetchListRoind"
+    :fetchData="fetchListRound"
     v-model:isRead="isRead"
   />
 </template>
diff --git a/src/modules/09_leave/views/WorkingMain.vue b/src/modules/09_leave/views/02_WorkingMain.vue
similarity index 87%
rename from src/modules/09_leave/views/WorkingMain.vue
rename to src/modules/09_leave/views/02_WorkingMain.vue
index 788a1f48d..0335224c2 100644
--- a/src/modules/09_leave/views/WorkingMain.vue
+++ b/src/modules/09_leave/views/02_WorkingMain.vue
@@ -2,9 +2,9 @@
 import { ref } from "vue";
 
 /** import Components */
-import Tab1 from "@/modules/09_leave/components/1_Work/Tab1.vue";
-import Tab2 from "@/modules/09_leave/components/1_Work/Tab2.vue";
-import DialogReport from "@/modules/09_leave/components/1_Work/DialogReport.vue";
+import Tab1 from "@/modules/09_leave/components/02_WorkList/Tab1.vue";
+import Tab2 from "@/modules/09_leave/components/02_WorkList/Tab2.vue";
+import DialogReport from "@/modules/09_leave/components/02_WorkList/DialogReport.vue";
 
 const tab = ref("1");
 
diff --git a/src/modules/09_leave/views/ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
similarity index 98%
rename from src/modules/09_leave/views/ChangeRoundMain.vue
rename to src/modules/09_leave/views/03_ChangeRoundMain.vue
index 24633bf0a..52021281d 100644
--- a/src/modules/09_leave/views/ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -8,9 +8,9 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useChangeRoundDataStore } from "@/modules/09_leave/stores/ChangeRoundStore";
 import { checkPermission } from "@/utils/permissions";
 
-import type { dataPost } from "@/modules/09_leave/interface/request/changeRound";
+import type { DataPost } from "@/modules/09_leave/interface/request/changeRound";
 
-import Dialogform from "@/modules/09_leave/components/4_ChangeRound/DialogForm.vue";
+import Dialogform from "@/modules/09_leave/components/03_ChangeRound/DialogForm.vue";
 
 /** useStore */
 const mixin = useCounterMixin();
@@ -32,7 +32,7 @@ const dateWork = ref<string>("NORMAL");
 const modalFix = ref<boolean>(false);
 const editCheck = ref<string>("");
 const DataRow = ref<any>();
-const formData = reactive<dataPost>({
+const formData = reactive<DataPost>({
   cardId: "",
   firstName: "",
   lastName: "",
@@ -97,12 +97,12 @@ function save() {
       })
       .then(() => {
         success($q, "บันทึกข้อมูลสำเร็จ");
+        closeDialog();
       })
       .catch((err) => {
         messageError($q, err);
       })
       .finally(() => {
-        closeDialog();
         hideLoader();
       });
   });
diff --git a/src/modules/09_leave/views/SpecialTimeMain.vue b/src/modules/09_leave/views/04_SpecialTimeMain.vue
similarity index 98%
rename from src/modules/09_leave/views/SpecialTimeMain.vue
rename to src/modules/09_leave/views/04_SpecialTimeMain.vue
index a42162a49..fde61f269 100644
--- a/src/modules/09_leave/views/SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/04_SpecialTimeMain.vue
@@ -16,7 +16,7 @@ import type {
 } from "@/modules/09_leave/interface/request/specialTime";
 
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
-import DialogApprove from "@/modules/09_leave/components/4_specialTime/DialogApprove.vue";
+import DialogApprove from "@/modules/09_leave/components/04_SpecialTime/DialogApprove.vue";
 
 const $q = useQuasar(); // show dialog
 const mixin = useCounterMixin();
@@ -86,7 +86,6 @@ const visibleColumns = ref<String[]>([
   "timeAfternoon",
   "description",
 ]);
-
 const columns = ref<QTableProps["columns"]>([
   {
     name: "no",
@@ -199,14 +198,14 @@ async function clickSave(reason: string) {
   };
   await http
     .put(config.API.specialTimeReject(id.value), body)
-    .then(() => {
+    .then(async () => {
+      await fetchData();
       success($q, "บันทึกข้อมูลสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
-      await fetchData();
+    .finally(() => {
       hideLoader();
     });
 }
@@ -396,7 +395,6 @@ onMounted(async () => {
         map-options
         :options="columns"
         option-value="name"
-        
         style="min-width: 140px"
         class="col-xs-12 col-sm-3 col-md-2"
       />
diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/05_LeaveListMain.vue
similarity index 88%
rename from src/modules/09_leave/views/LeaveListMain.vue
rename to src/modules/09_leave/views/05_LeaveListMain.vue
index afba501f3..89258e08d 100644
--- a/src/modules/09_leave/views/LeaveListMain.vue
+++ b/src/modules/09_leave/views/05_LeaveListMain.vue
@@ -3,8 +3,8 @@
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
 
 /**importComponets*/
-import Tab1 from "@/modules/09_leave/components/2_Leave/Tab1.vue";
-import Tab2 from "@/modules/09_leave/components/2_Leave/Tab2.vue";
+import Tab1 from "@/modules/09_leave/components/05_Leave/Tab1.vue";
+import Tab2 from "@/modules/09_leave/components/05_Leave/Tab2.vue";
 
 const leaveStore = useLeavelistDataStore();
 </script>
diff --git a/src/modules/09_leave/components/3_Report/LeaveReport.vue b/src/modules/09_leave/views/06_ReportMain.vue
similarity index 98%
rename from src/modules/09_leave/components/3_Report/LeaveReport.vue
rename to src/modules/09_leave/views/06_ReportMain.vue
index eef8fc11a..819acff74 100644
--- a/src/modules/09_leave/components/3_Report/LeaveReport.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -82,17 +82,17 @@ async function fetchLeaveday(
 
   await http
     .post(config.API.leaveReportLeaveday(type), body)
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
-      data && genReport(data);
-      !data && hideLoader();
+      data && (await genReport(data));
       detailReport.value = data;
     })
     .catch((err) => {
       messageError($q, err);
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /**
@@ -101,7 +101,7 @@ async function fetchLeaveday(
  */
 async function genReport(data: any) {
   await axios
-    .post(apiGenReport, data, {
+    .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
         accept: "application/pdf",
         "content-Type": "application/json",
@@ -135,7 +135,7 @@ async function genReport(data: any) {
  */
 async function genReportXLSX(data: any) {
   await axios
-    .post(apiGenReport, data, {
+    .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
         accept:
           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
index f0eb3f714..39fb12305 100644
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@@ -98,7 +98,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index bbc32d36f..f2af446c5 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -1348,7 +1348,7 @@ onMounted(async () => {
                               @click="openEditDirector(props.row)"
                               icon="edit"
                             >
-                              <q-tooltip>แก้ไข</q-tooltip>
+                              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                             </q-btn>
                             <q-btn
                               v-if="!checkRoutePermisson && !isReadonly"
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 5e5c7f84f..fd73a0892 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -1551,7 +1551,7 @@ onMounted(async () => {
                               @click="openEditDirector(props.row)"
                               icon="edit"
                             >
-                              <q-tooltip>แก้ไข</q-tooltip>
+                              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                             </q-btn>
 
                             <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 9cb121eb7..2324e6888 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -114,7 +114,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index 3b43898f6..d93112597 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -127,7 +127,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index b1edc616c..21b5199dc 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -201,7 +201,7 @@ export const useInvestigateDisStore = defineStore(
       {
         name: "name",
         align: "left",
-        label: "ชื่อ - นามสกุล",
+        label: "ชื่อ-นามสกุล",
         sortable: true,
         field: "name",
         headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts
index e37d4634f..3ee4a8fd4 100644
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@@ -56,7 +56,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     {
       name: "name",
       align: "left",
-      label: "ชื่อ - นามสกุล",
+      label: "ชื่อ-นามสกุล",
       sortable: true,
       field: "name",
       headerStyle: "font-size: 14px",
@@ -153,7 +153,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     {
       name: "name",
       align: "left",
-      label: "ชื่อ - นามสกุล",
+      label: "ชื่อ-นามสกุล",
       sortable: true,
       field: "name",
       headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts
index 99dd8b3c8..303933fc2 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -192,7 +192,7 @@ export const useDisciplineResultStore = defineStore(
       {
         name: "name",
         align: "left",
-        label: "ชื่อ - นามสกุล",
+        label: "ชื่อ-นามสกุล",
         sortable: true,
         field: "name",
         headerStyle: "font-size: 14px",
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
index 52f1b7027..e17b9e92d 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
@@ -49,7 +49,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
index e9ffe3b37..244a78daa 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
@@ -161,7 +161,7 @@ onMounted(() => {
                 borderless
                 readonly
                 :model-value="formDetail.fullName"
-                label="ชื่อ - นามสกุล"
+                label="ชื่อ-นามสกุล"
               />
             </div>
             <div class="col-xs-6 col-sm-4 col-md-3">
diff --git a/src/modules/12_evaluatePersonal/components/Director/Form.vue b/src/modules/12_evaluatePersonal/components/Director/Form.vue
index 8797e028e..5d3621980 100644
--- a/src/modules/12_evaluatePersonal/components/Director/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue
@@ -106,7 +106,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
index 39555009e..2da533f73 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -105,7 +105,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/components/Record.vue b/src/modules/15_development/components/Record.vue
index 9c9559df5..726d6e0fb 100644
--- a/src/modules/15_development/components/Record.vue
+++ b/src/modules/15_development/components/Record.vue
@@ -64,7 +64,7 @@ const baseColumns = ref<QTableProps["columns"]>([
   {
     name: "fullName",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullName",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index 1ad00f9df..fecb20164 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -26,7 +26,7 @@ const order = ref<string>(""); //เลขที่คำสั่ง/เลข
 /** ตัวแปรข้อมูลข้าราชการ */
 const formMain = reactive<FormAddHistory>({
   id: "",
-  name: "", //ชื่อ - นามสกุล
+  name: "", //ชื่อ-นามสกุล
   prefix: "", //คำนำหน้าชื่อ
   rank: "", //ยศ
   firstName: "", //ชื่อ
@@ -147,7 +147,7 @@ onMounted(async () => {
               </div>
               <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-                  ชื่อ - นามสกุล
+                  ชื่อ-นามสกุล
                 </div>
 
                 <div class="col-12 col-sm-12 col-md-7">
diff --git a/src/modules/15_development/components/history/DialogGov.vue b/src/modules/15_development/components/history/DialogGov.vue
index 753b7ecb2..851f715c4 100644
--- a/src/modules/15_development/components/history/DialogGov.vue
+++ b/src/modules/15_development/components/history/DialogGov.vue
@@ -56,7 +56,7 @@ const govOp = ref<DataOption[]>([
   },
   {
     id: "fullName",
-    name: "ชื่อ - นามสกุล",
+    name: "ชื่อ-นามสกุล",
   },
 ]);
 
@@ -82,7 +82,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index 8319c75e2..07f0048c4 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -29,7 +29,7 @@ const order = ref<string>("");
 /** ตัวแปรข้อมูลข้าราชการ */
 const formMain = reactive<FormAddHistoryEmployee>({
   id: "",
-  name: "", //ชื่อ - นามสกุล
+  name: "", //ชื่อ-นามสกุล
   prefix: "", //คำนำหน้าชื่อ
   rank: "", //ยศ
   firstName: "", //ชื่อ
@@ -159,7 +159,7 @@ onMounted(() => {
               </div>
               <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-                  ชื่อ - นามสกุล
+                  ชื่อ-นามสกุล
                 </div>
 
                 <div class="col-12 col-sm-12 col-md-7">
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index eec0c747b..009ad031a 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -88,7 +88,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index 8866491f9..62d5196e3 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -65,7 +65,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",