diff --git a/src/modules/07_insignia/components/1_Proposals/DialogDetail.vue b/src/modules/07_insignia/components/1_Proposals/DialogDetail.vue
index 1e044415b..13ac2394c 100644
--- a/src/modules/07_insignia/components/1_Proposals/DialogDetail.vue
+++ b/src/modules/07_insignia/components/1_Proposals/DialogDetail.vue
@@ -144,8 +144,8 @@ function onSubmit() {
     httpMethod(url, formData)
       .then(async () => {
         await props.fetchList();
-        onCloseDialog();
         await success($q, "บันทึกข้อมูลสำเร็จ");
+        onCloseDialog();
       })
       .catch((err) => {
         messageError($q, err);
diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
index 341215b73..f855e84de 100644
--- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
@@ -130,11 +130,6 @@ async function fetchData() {
     });
 }
 
-/** Function redirect หน้าข้อมูลรอบการเสนอข้อ */
-function clickEdit(col: ColId) {
-  router.push(`/insignia/round/${col.period_id}`);
-}
-
 /**
  * Function ยืนยันการลบรอบการเสนอขอ
  * @param id  รอบการเสนขอ
@@ -157,38 +152,33 @@ function clickDelete(id: string) {
   });
 }
 
-/** Fnction เพิ่มรอบการเสนอขอพระราชทานเครื่องราชอิสริยาภรณ์ */
-function clickAdd() {
-  router.push({ name: "roundAdd" });
-}
-
 /** Fnction คำนวณรายชื่อผู้ได้รับเครื่องราช */
-async function clickListInsignia(propsId: string) {
-  dialogConfirm(
-    $q,
-    async () => {
-      await getRequest(propsId);
-    },
-    "ยืนยันการคำนวณรายชื่อผู้ได้รับเครื่องราชฯ",
-    "ต้องการยืนยันการคำนวณรายชื่อผู้ได้รับเครื่องราชฯนี้หรือไม่?"
-  );
-}
+// async function clickListInsignia(propsId: string) {
+//   dialogConfirm(
+//     $q,
+//     async () => {
+//       await getRequest(propsId);
+//     },
+//     "ยืนยันการคำนวณรายชื่อผู้ได้รับเครื่องราชฯ",
+//     "ต้องการยืนยันการคำนวณรายชื่อผู้ได้รับเครื่องราชฯนี้หรือไม่?"
+//   );
+// }
 
 /** Fnction เรียกจาก API ข้อมูลผู้ได้รับเครื่องราชฯ */
-async function getRequest(id: string) {
-  showLoader();
-  await http
-    .get(config.API.requestInsignia(id))
-    .then(() => {
-      success($q, "ยืนยันสำเร็จ");
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(async () => {
-      await fetchData();
-    });
-}
+// async function getRequest(id: string) {
+//   showLoader();
+//   await http
+//     .get(config.API.requestInsignia(id))
+//     .then(() => {
+//       success($q, "ยืนยันสำเร็จ");
+//     })
+//     .catch((err) => {
+//       messageError($q, err);
+//     })
+//     .finally(async () => {
+//       await fetchData();
+//     });
+// }
 
 /**  ค้นหาในตาราง */
 const filterKeyword = ref<string>("");
diff --git a/src/modules/13_salary/components/InfoDiscipline.vue b/src/modules/13_salary/components/InfoDiscipline.vue
index 867ee7cf3..1abf65e2e 100644
--- a/src/modules/13_salary/components/InfoDiscipline.vue
+++ b/src/modules/13_salary/components/InfoDiscipline.vue
@@ -178,7 +178,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
+          <q-tr :props="props">
             <q-td v-for="col in props.cols" :key="col.id">
               <div class="table_ellipsis">
                 {{ col.value ? col.value : "-" }}
diff --git a/src/modules/13_salary/components/InfoLeave.vue b/src/modules/13_salary/components/InfoLeave.vue
index d3321f36b..edcdf1846 100644
--- a/src/modules/13_salary/components/InfoLeave.vue
+++ b/src/modules/13_salary/components/InfoLeave.vue
@@ -36,7 +36,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ลำดับ",
     sortable: false,
-    field: "no",
+
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     field: (row) => rows.value.indexOf(row) + 1,
@@ -46,7 +46,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ประเภทการลา",
     sortable: true,
-    field: "leaveType",
+
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     field: (row) => row.leaveType.name,
@@ -56,7 +56,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "วัน เดือน ปี ที่ลา",
     sortable: true,
-    field: "dateLeave",
+
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     field: (row) => dateThaiRange([row.dateLeaveStart, row.dateLeaveEnd]),
@@ -203,7 +203,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
+          <q-tr :props="props" >
             <q-td v-for="col in props.cols" :key="col.id">
               <div class="table_ellipsis">
                 {{ col.value ? col.value : "-" }}
diff --git a/src/modules/13_salary/components/InfoSalary.vue b/src/modules/13_salary/components/InfoSalary.vue
index 07bb77840..c5bcd1770 100644
--- a/src/modules/13_salary/components/InfoSalary.vue
+++ b/src/modules/13_salary/components/InfoSalary.vue
@@ -221,7 +221,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
+          <q-tr :props="props">
             <q-td v-for="col in props.cols" :key="col.id">
               <div class="table_ellipsis">
                 {{ col.value ? col.value : "-" }}
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue
index 98b8fe22f..2022ef5d2 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue
@@ -148,11 +148,12 @@ function onClickAddPerson(data: DataPerson) {
   dialogConfirm(
     $q,
     () => {
+      showLoader();
       http
         .post(config.API.salaryPeriodProfileEmp, body)
-        .then(() => {
-          props.fetchData?.();
-          success($q, "เพื่มรายชื่อสำเร็จ");
+        .then(async () => {
+          await props.fetchData?.();
+          await success($q, "เพื่มรายชื่อสำเร็จ");
           closeModal();
         })
         .catch((err) => {
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogFormEdit.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogFormEdit.vue
index 3f8893b56..89b69c2ba 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogFormEdit.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogFormEdit.vue
@@ -13,7 +13,7 @@ import { useCounterMixin } from "@/stores/mixin";
 /** use*/
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogConfirm, success, messageError } = mixin;
+const { dialogConfirm, success, messageError, showLoader, hideLoader } = mixin;
 
 /** props*/
 const modal = defineModel<boolean>("modal", { required: true });
@@ -44,6 +44,7 @@ function close() {
 function onSubmit() {
   dialogConfirm($q, () => {
     if (amount.value !== null) {
+      showLoader();
       const amountString: string = amount.value.toString();
       const body = {
         profileId: profileId.value,
@@ -54,15 +55,16 @@ function onSubmit() {
       };
       http
         .post(config.API.salaryPeriodEmp() + `/change/amount`, body)
-        .then(() => {
-          success($q, "บันทึกข้อมูลสำเร็จ");
-          props.fetchData?.();
+        .then(async () => {
+          await props.fetchData?.();
+          await success($q, "บันทึกข้อมูลสำเร็จ");
+          close();
         })
         .catch((e) => {
           messageError($q, e);
         })
         .finally(() => {
-          close();
+          hideLoader();
         });
     }
   });
@@ -88,6 +90,7 @@ function onSubmit() {
             :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือนฐาน'}`]"
             lazy-rules
             hide-bottom-space
+            class="inputgreen"
           />
         </div>
       </q-card-section>
@@ -97,10 +100,7 @@ function onSubmit() {
           <q-btn
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveGroup.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveGroup.vue
index 409210efc..28c814adc 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveGroup.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveGroup.vue
@@ -55,16 +55,16 @@ function onSubmit() {
     };
     http
       .post(config.API.salaryPeriod() + `/change/group`, body)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        props.fetchData?.();
+      .then(async () => {
+        await props.fetchData?.();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
+        close();
       })
       .catch((e) => {
         messageError($q, e);
       })
       .finally(() => {
         hideLoader();
-        close();
       });
   });
 }
@@ -120,10 +120,7 @@ function inputEdit(val: boolean) {
           <q-btn
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveLevel.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveLevel.vue
index 00d8267c0..c4fb4e080 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveLevel.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogMoveLevel.vue
@@ -81,15 +81,15 @@ function onSubmit() {
     };
     http
       .post(config.API.salaryPeriodEmp() + `/change/type`, body)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        props.fetchData?.();
+      .then(async () => {
+        await props.fetchData?.();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
+        close();
       })
       .catch((e) => {
         messageError($q, e);
       })
       .finally(() => {
-        close();
         hideLoader();
       });
   });
@@ -168,15 +168,11 @@ function inputEdit(val: boolean) {
       <q-separator />
       <form @submit.prevent="validateForm">
         <q-card-actions align="right" class="bg-white text-teal">
-          <!-- <q-btn flat label="OK" v-close-popup /> -->
           <q-btn
             :disabled="!isChange"
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogProperties.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogProperties.vue
index c9ed6f8c4..ce5e3eefb 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogProperties.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogProperties.vue
@@ -66,15 +66,15 @@ function onSubmit() {
     };
     http
       .put(config.API.salaryPropertyEmp(profileId.value), body)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        props.fetchData?.();
+      .then(async () => {
+        await props.fetchData?.();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
+        close();
       })
       .catch((e) => {
         messageError($q, e);
       })
       .finally(() => {
-        close();
         hideLoader();
       });
   });
@@ -132,14 +132,10 @@ watch(
       <q-separator />
       <form @submit.prevent="validateForm">
         <q-card-actions align="right" class="bg-white text-teal">
-          <!-- <q-btn flat label="OK" v-close-popup /> -->
           <q-btn
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue b/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue
index 5bc5fbc0b..1f44a86b8 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue
@@ -67,7 +67,7 @@ async function uploadFile(event: any) {
               res.data[key]?.fileName !== ""
           );
           const link = res.data[foundKey]?.uploadUrl;
-          fileUpLoad(link);
+          await fileUpLoad(link);
         })
         .catch((err) => {
           messageError($q, err);
@@ -85,10 +85,10 @@ function fileUpLoad(url: string) {
       headers: { "Content-Type": fileUpload.value?.type },
       onUploadProgress: (e) => console.log(e),
     })
-    .then(() => {
-      success($q, "อัปโหลดไฟล์สำเร็จ");
+    .then(async () => {
+      await fetchListFile();
+      await success($q, "อัปโหลดไฟล์สำเร็จ");
       fileUpload.value = null;
-      fetchListFile();
     })
     .catch((e) => {
       messageError($q, e);
@@ -114,9 +114,10 @@ function saveReccommend(reason: string) {
             titleRecommend: reason,
           }
         )
-        .then((res) => {
-          console.log(res);
-          props.getData?.();
+        .then(async () => {
+          await props.getData?.();
+          sendStep.value = sendStep.value + 1;
+          modalRecommend.value = false;
         })
         .catch((e) => {
           messageError($q, e);
@@ -124,8 +125,6 @@ function saveReccommend(reason: string) {
         .finally(() => {
           hideLoader();
         });
-      sendStep.value = sendStep.value + 1;
-      modalRecommend.value = false;
     },
     "ยืนยันการ" + titleRecommend.value,
     "ต้องการยืนยันการ" + titleRecommend.value + "หรือไม่?"
@@ -145,9 +144,9 @@ function sendToDirector(msg: string, type: string) {
             props.rootId ? props.rootId : ""
           )
         )
-        .then((res) => {
-          console.log(res);
-          props.getData?.();
+        .then(async () => {
+          await props.getData?.();
+          sendStep.value = sendStep.value == 3 ? 6 : sendStep.value + 1;
         })
         .catch((e) => {
           messageError($q, e);
@@ -155,7 +154,6 @@ function sendToDirector(msg: string, type: string) {
         .finally(() => {
           hideLoader();
         });
-      sendStep.value = sendStep.value == 3 ? 6 : sendStep.value + 1;
     },
     "ยืนยันการ" + msg,
     "ต้องการยืนยันการ" + msg + "หรือไม่?"
@@ -202,16 +200,16 @@ function onDeleteFile(fileName: string) {
         )
       )
       .then(() => {
-        success($q, "ลบไฟล์สำเร็จ");
-        setTimeout(() => {
-          fetchListFile();
-          hideLoader();
-        }, 1000);
+        setTimeout(async () => {
+          await fetchListFile();
+          await success($q, "ลบไฟล์สำเร็จ");
+          await hideLoader();
+        }, 2000);
       })
       .catch((e) => {
         messageError($q, e);
-      })
-      .finally(async () => {});
+        hideLoader();
+      });
   });
 }
 
@@ -377,9 +375,8 @@ onMounted(() => {
                     dense
                     flat
                     round
-                    size="12px"
                     color="blue"
-                    icon="mdi-download-outline"
+                    icon="mdi-download"
                     @click="downloadFile(item.fileName)"
                   >
                     <q-tooltip>ดาวน์โหลดเอกสาร</q-tooltip>
@@ -391,9 +388,8 @@ onMounted(() => {
                     dense
                     flat
                     round
-                    size="12px"
                     color="red"
-                    icon="mdi-delete-outline"
+                    icon="mdi-delete"
                     @click="onDeleteFile(item.fileName)"
                     ><q-tooltip>ลบเอกสาร</q-tooltip></q-btn
                   >
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
index 702f7a278..4e3d1db50 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
@@ -260,9 +260,9 @@ function onClickDelete(id: string) {
     showLoader();
     await http
       .delete(config.API.salaryListPeriodProfileByIdEmp(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-        props.fetchDataTable?.();
+      .then(async () => {
+        await props.fetchDataTable?.();
+        await success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
         messageError($q, err);
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
index 810ffeb99..605d41ebe 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
@@ -217,9 +217,9 @@ function onClickDelete(id: string) {
     showLoader();
     await http
       .delete(config.API.salaryListPeriodProfileByIdEmp(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-        props.fetchDataTable?.();
+      .then(async () => {
+        await props.fetchDataTable?.();
+        await success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
         messageError($q, err);
@@ -289,7 +289,6 @@ function searchData() {
 }
 
 function onProperties(data: any) {
-  console.log(data);
   modalDialogProperties.value = true;
   profileId.value = data.id;
   isPunish.value = data.isPunish;
@@ -382,7 +381,7 @@ function onClickViewInfo(type: string, id: string) {
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr :props="props" >
+      <q-tr :props="props">
         <q-td>
           <q-btn
             v-if="
diff --git a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
index ec2c2edb0..c560bd54c 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
@@ -144,11 +144,12 @@ function onClickAddPerson(data: DataPerson) {
   dialogConfirm(
     $q,
     () => {
+      showLoader();
       http
         .post(config.API.salaryPeriodProfile, body)
-        .then(() => {
-          props.fetchData?.();
-          success($q, "เพื่มรายชื่อสำเร็จ");
+        .then(async () => {
+          await props.fetchData?.();
+          await success($q, "เพื่มรายชื่อสำเร็จ");
           closeModal();
         })
         .catch((err) => {
@@ -244,11 +245,10 @@ watch(
                   >
                     <span class="text-weight-medium">{{ col.label }}</span>
                   </q-th>
-
                 </q-tr>
               </template>
               <template v-slot:body="props">
-                <q-tr :props="props" class="cursor-pointer">
+                <q-tr :props="props">
                   <q-td>
                     <q-btn
                       outline
@@ -278,7 +278,6 @@ watch(
                       {{ col.value ? col.value : "-" }}
                     </div>
                   </q-td>
-
                 </q-tr>
               </template>
               <template v-slot:pagination="scope">
diff --git a/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue b/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
index 7a76453e0..5714ead95 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
@@ -13,7 +13,7 @@ import { useCounterMixin } from "@/stores/mixin";
 /** use*/
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogConfirm, success, messageError } = mixin;
+const { dialogConfirm, success, messageError, showLoader, hideLoader } = mixin;
 
 /** props*/
 const modal = defineModel<boolean>("modal", { required: true });
@@ -44,6 +44,7 @@ function close() {
 function onSubmit() {
   dialogConfirm($q, () => {
     if (amount.value !== null) {
+      showLoader();
       const amountString: string = amount.value.toString();
       const body = {
         profileId: profileId.value,
@@ -54,15 +55,16 @@ function onSubmit() {
       };
       http
         .post(config.API.salaryPeriod() + `/change/amount`, body)
-        .then(() => {
-          success($q, "บันทึกข้อมูลสำเร็จ");
-          props.fetchData?.();
+        .then(async () => {
+          await props.fetchData?.();
+          await success($q, "บันทึกข้อมูลสำเร็จ");
+          close();
         })
         .catch((e) => {
           messageError($q, e);
         })
         .finally(() => {
-          close();
+          hideLoader();
         });
     }
   });
@@ -88,6 +90,7 @@ function onSubmit() {
             :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือนฐาน'}`]"
             lazy-rules
             hide-bottom-space
+            class="inputgreen"
           />
         </div>
       </q-card-section>
@@ -97,10 +100,7 @@ function onSubmit() {
           <q-btn
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
index a1118830f..6643ae7e5 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
@@ -55,16 +55,16 @@ function onSubmit() {
     };
     http
       .post(config.API.salaryPeriod() + `/change/group`, body)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        props.fetchData?.();
+      .then(async () => {
+        await props.fetchData?.();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
+        close();
       })
       .catch((e) => {
         messageError($q, e);
       })
       .finally(() => {
         hideLoader();
-        close();
       });
   });
 }
@@ -116,14 +116,10 @@ function inputEdit(val: boolean) {
       <q-separator />
       <form @submit.prevent="validateForm">
         <q-card-actions align="right" class="bg-white text-teal">
-          <!-- <q-btn flat label="OK" v-close-popup /> -->
           <q-btn
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
index 831f7d44d..82e43f495 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
@@ -87,15 +87,15 @@ function onSubmit() {
     };
     http
       .post(config.API.salaryPeriod() + `/change/type`, body)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        props.fetchData?.();
+      .then(async () => {
+        await props.fetchData?.();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
+        close();
       })
       .catch((e) => {
         messageError($q, e);
       })
       .finally(() => {
-        close();
         hideLoader();
       });
   });
@@ -179,10 +179,7 @@ function inputEdit(val: boolean) {
             :disabled="!isChange"
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryLists/DialogProperties.vue b/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
index b11de0b02..392868e9d 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
@@ -81,15 +81,15 @@ function onSubmit() {
     };
     http
       .put(config.API.salaryProperty(profileId.value), body)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        props.fetchData?.();
+      .then(async () => {
+        await props.fetchData?.();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
+        close();
       })
       .catch((e) => {
         messageError($q, e);
       })
       .finally(() => {
-        close();
         hideLoader();
       });
   });
@@ -143,10 +143,7 @@ watch(
           <q-btn
             type="submit"
             for="#submitForm"
-            unelevated
-            dense
-            class="q-px-md items-center"
-            color="light-blue-10"
+            color="secondary"
             label="บันทึก"
           />
         </q-card-actions>
diff --git a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
index d6a28d642..ff2edc11b 100644
--- a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
+++ b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
@@ -49,6 +49,7 @@ async function uploadFile(event: any) {
   dialogConfirm(
     $q,
     async () => {
+      showLoader();
       const selectedFile = event;
       const formdata = new FormData();
       formdata.append("Document", selectedFile);
@@ -72,10 +73,11 @@ async function uploadFile(event: any) {
               res.data[key]?.fileName !== ""
           );
           foundKey &&
-            uploadfile(res.data[foundKey]?.uploadUrl, fileUpload.value);
+            (await uploadfile(res.data[foundKey]?.uploadUrl, fileUpload.value));
         })
         .catch((err) => {
           messageError($q, err);
+          hideLoader();
         });
     },
     "ยืนยันการอัปโหลดไฟล์",
@@ -88,17 +90,18 @@ async function uploadFile(event: any) {
  * @param uploadUrl  link อัปโหลด
  * @param file  ไฟล์
  */
-async function uploadfile(uploadUrl: string, file: any) {
+function uploadfile(uploadUrl: string, file: any) {
   showLoader();
-  await axios
+  axios
     .put(uploadUrl, file, {
       headers: {
         "Content-Type": file.type,
       },
     })
-    .then(() => {
-      getListFile();
+    .then(async () => {
+      await getListFile();
       success($q, "อัปโหลไฟล์สำเร็จ");
+      fileUpload.value = null;
     })
     .catch((err) => {
       messageError($q, err);
@@ -143,8 +146,8 @@ function saveReccommend(reason: string) {
             titleRecommend: reason,
           }
         )
-        .then(() => {
-          props.getData?.();
+        .then(async () => {
+          await props.getData?.();
         })
         .catch((e) => {
           messageError($q, e);
@@ -234,16 +237,16 @@ function deleteFile(fileName: string) {
         )
       )
       .then(() => {
-        success($q, "ลบไฟล์สำเร็จ");
-        setTimeout(() => {
-          getListFile();
+        setTimeout(async () => {
+          await getListFile();
+          await success($q, "ลบไฟล์สำเร็จ");
           hideLoader();
-        }, 1000);
+        }, 2000);
       })
       .catch((e) => {
         messageError($q, e);
-      })
-      .finally(async () => {});
+        hideLoader();
+      });
   });
 }
 
@@ -407,9 +410,8 @@ onMounted(() => {
                     dense
                     flat
                     round
-                    size="12px"
                     color="blue"
-                    icon="mdi-download-outline"
+                    icon="mdi-download"
                     @click="downloadFile(item.fileName)"
                   >
                     <q-tooltip>ดาวน์โหลดเอกสาร</q-tooltip>
@@ -421,9 +423,8 @@ onMounted(() => {
                     dense
                     flat
                     round
-                    size="12px"
                     color="red"
-                    icon="mdi-delete-outline"
+                    icon="delete"
                     @click="deleteFile(item.fileName)"
                     ><q-tooltip>ลบเอกสาร</q-tooltip></q-btn
                   >
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
index 8b8f65bbc..21fe4b030 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
@@ -248,9 +248,9 @@ function onClickDelete(id: string) {
     showLoader();
     await http
       .delete(config.API.salaryListPeriodProfileById(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-        props.fetchDataTable?.();
+      .then(async () => {
+        await props.fetchDataTable?.();
+        await success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
         messageError($q, err);
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
index 76de05380..600971fcd 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
@@ -9,11 +9,11 @@ import type { NewPagination } from "@/modules/13_salary/interface/index/Main";
 import type { DataFilter } from "@/modules/13_salary/interface/index/SalaryList";
 
 /** importComponents*/
-import DialogAddPerson from "@/modules/13_salary/components/SalaryLists//DialogAddPerson.vue";
-import DialogFormEdit from "@/modules/13_salary/components/SalaryLists/DialogFormEdit.vue";
-import DialogMoveGroup from "@/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue";
-import DialogMoveLevel from "@/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue";
-import DialogProperties from "@/modules/13_salary/components/SalaryLists/DialogProperties.vue";
+import DialogAddPerson from "@/modules/13_salary/components/SalaryLists//DialogAddPerson.vue"; //เพิ่มคนเลื่อนเงินเดือน
+import DialogFormEdit from "@/modules/13_salary/components/SalaryLists/DialogFormEdit.vue"; // แก้ไขเงินเดือน
+import DialogMoveGroup from "@/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue"; // ย้ายกลุ่ม
+import DialogMoveLevel from "@/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue"; // เลื่อนขั้น
+import DialogProperties from "@/modules/13_salary/components/SalaryLists/DialogProperties.vue"; //แก้ไขคุณสมบัติ
 import DialogInfo from "@/modules/13_salary/components/DialogInfoMain.vue";
 
 /** importStore*/
@@ -204,9 +204,9 @@ function onClickDelete(id: string) {
     showLoader();
     await http
       .delete(config.API.salaryListPeriodProfileById(id))
-      .then(() => {
-        success($q, "ลบข้อมูลสำเร็จ");
-        props.fetchDataTable?.();
+      .then(async () => {
+        await props.fetchDataTable?.();
+        await success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
         messageError($q, err);
@@ -416,11 +416,7 @@ function onClickViewInfo(type: string, id: string) {
                 >
                   <q-item-section>
                     <div class="row items-center">
-                      <q-icon
-                        :color="item.color"
-                        size="xs"
-                        :name="item.icon"
-                      />
+                      <q-icon :color="item.color" size="xs" :name="item.icon" />
                       <div class="q-pl-md">{{ item.label }}</div>
                     </div>
                   </q-item-section>
@@ -514,23 +510,29 @@ function onClickViewInfo(type: string, id: string) {
     </template>
   </d-table>
 
+  <!-- เพิ่มคนเลื่อนเงินเดือน -->
   <DialogAddPerson
     v-model:modal="modalDialogAddPerson"
     :fetchData="props.fetchDataTable"
   />
 
+  <!-- แก้ไขเงินเดือน -->
   <DialogFormEdit
     v-model:modal="modalDialogForm"
     v-model:profileId="profileId"
     v-model:amount="amount"
     :fetchData="props.fetchDataTable"
   />
+
+  <!-- ย้ายกลุ่ม -->
   <DialogMoveGroup
     v-model:modal="modalDialogMoveGroup"
     v-model:profileId="profileId"
     :group="store.tabGroup === 'group1' ? 'กลุ่ม1' : 'กลุ่ม2'"
     :fetchData="props.fetchDataTable"
   />
+
+  <!-- เลื่อนขั้น -->
   <DialogMoveLevel
     :typeLevel="typeLevel"
     :isReserve="isReserve"
@@ -539,6 +541,8 @@ function onClickViewInfo(type: string, id: string) {
     :fetchData="props.fetchDataTable"
     :remark="''"
   />
+
+  <!-- แก้ไขคุณสมบัติ -->
   <DialogProperties
     v-model:modal="modalDialogProperties"
     v-model:id="profileId"
diff --git a/src/modules/13_salary/components/SalaryRound/DialogForm.vue b/src/modules/13_salary/components/SalaryRound/DialogForm.vue
index 5c000139e..1c368a1b3 100644
--- a/src/modules/13_salary/components/SalaryRound/DialogForm.vue
+++ b/src/modules/13_salary/components/SalaryRound/DialogForm.vue
@@ -42,7 +42,6 @@ const props = defineProps({
 });
 
 const period = ref<string>("");
-const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
 const isActive = ref<boolean>(false);
 const effectiveDate = ref<Date | null>(null);
 const typeOptions = ref<DataOption[]>([
@@ -81,10 +80,10 @@ function onSubmit() {
         ? config.API.salaryPeriod()
         : config.API.salaryPeriod() + `/${props.idRound}`;
       await http[!props.edit ? "post" : "put"](url, body);
+      await props.getData?.();
+      await success($q, "บันทีกข้อมูลสำเร็จ");
       modal.value = false;
-      props.getData?.();
       clearForm();
-      success($q, "บันทีกข้อมูลสำเร็จ");
     } catch (err) {
       messageError($q, err);
     } finally {
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index bafc1e27b..6f9d79e48 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -145,9 +145,9 @@ function getSnap(code: string) {
  * function เรียกข้อมูลหน่ยวงาน
  * @param id  revisionId
  */
-async function getAgency(id: string) {
+function getAgency(id: string) {
   if (id) {
-    await http
+    http
       .get(config.API.activeOrganizationRootById(id))
       .then(async (res) => {
         const data = res.data.result;
@@ -179,9 +179,9 @@ async function getAgency(id: string) {
  * function เรียกข้อมูลหน่ยวงานปจุบัน
  * @param id  revisionId
  */
-async function getAgencyPosition(id: string) {
+function getAgencyPosition(id: string) {
   if (id) {
-    await http
+    http
       .get(config.API.keycloakPositionByid(id))
       .then(async (res) => {
         const data = await res.data.result;
diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue
index bcba2d192..4da92db65 100644
--- a/src/modules/13_salary/views/salaryRound.vue
+++ b/src/modules/13_salary/views/salaryRound.vue
@@ -124,7 +124,9 @@ function clickAdd() {
   editCheck.value = false;
 }
 
-/** ดึงข้อมูลเริ่มต้น */
+/**
+ * fetch รายการรอบการขึ้นเงินเดือน
+ */
 function getData() {
   showLoader();
   http
@@ -165,9 +167,9 @@ function deleteData(id: string) {
     showLoader();
     http
       .delete(config.API.salaryPeriod() + `/${id}`)
-      .then(() => {
-        getData();
-        success($q, "ลบข้อมูลสำเร็จ");
+      .then(async () => {
+        await getData();
+        await success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((e) => {
         messageError($q, e);
@@ -204,15 +206,19 @@ function dialogClose(id: string) {
   dialogConfirm(
     $q,
     () => {
+      showLoader();
       http
         .get(config.API.salaryPeriod() + `/close/${id}`)
-        .then((res) => {
+        .then(() => {
           getData();
+          success($q, "ลบข้อมูลสำเร็จ");
         })
         .catch((e) => {
           messageError($q, e);
         })
-        .finally(() => {});
+        .finally(() => {
+          hideLoader();
+        });
     },
     "ยืนยันการปิดรอบ",
     "หากปิดรอบแล้วจะไม่สามารถแก้ไขรายการเงินเดือนของรอบนี้ได้ ต้องการยืนยันการปิดรอบนี้ใช่หรือไม่?"
@@ -406,14 +412,16 @@ onMounted(async () => {
                             color="edit"
                             size="17px"
                             :name="
-                              props.row.revisionId !== null || !checkPermission($route)?.attrIsUpdate
+                              props.row.revisionId !== null ||
+                              !checkPermission($route)?.attrIsUpdate
                                 ? 'mdi-eye-outline'
                                 : 'edit'
                             "
                           />
                           <div class="q-pl-md">
                             {{
-                              props.row.revisionId !== null || !checkPermission($route)?.attrIsUpdate
+                              props.row.revisionId !== null ||
+                              !checkPermission($route)?.attrIsUpdate
                                 ? "ดูข้อมูล"
                                 : "แก้ไขข้อมูล"
                             }}