diff --git a/src/modules/13_salary/components/SalaryLists/Dashboard.vue b/src/modules/13_salary/components/SalaryLists/Dashboard.vue
index 7da38e319..63b71215f 100644
--- a/src/modules/13_salary/components/SalaryLists/Dashboard.vue
+++ b/src/modules/13_salary/components/SalaryLists/Dashboard.vue
@@ -4,15 +4,24 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
+/** importType*/
 import type { QTableProps } from "quasar";
+import type {
+  DataOption,
+  ItemsCards,
+} from "@/modules/13_salary/interface/index/Main";
+import type { ResSalaryOrg } from "@/modules/13_salary/interface/response/SalaryList";
 
+/** importStore*/
 import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
 import { useCounterMixin } from "@/stores/mixin";
 
+/** use*/
 const $q = useQuasar();
 const store = useSalaryListSDataStore();
 const { messageError, showLoader, hideLoader } = useCounterMixin();
 
+/** props*/
 const props = defineProps({
   year: Number,
   snapShot: String,
@@ -20,111 +29,110 @@ const props = defineProps({
 });
 
 const gruup = ref<string>("");
-const options = ref([
+const options = ref<DataOption[]>([
   { id: "", name: "ทั้งหมด" },
   { id: "GROUP1", name: "กลุ่ม 1" },
   { id: "GROUP2", name: "กลุ่ม 2" },
 ]);
 
 /** itemsCard*/
-const itemsCardAPR = ref([
+const itemsCardAPR = ref<ItemsCards[]>([
   {
-    lable: "จำนวนคนทั้งหมด",
+    label: "จำนวนคนทั้งหมด",
     name: "group1",
     color: "secondary",
     total: 0,
   },
   {
-    lable: "15% ของจำนวนคน",
+    label: "15% ของจำนวนคน",
     name: "group2",
     color: "light-blue-4",
     total: 0,
   },
   {
-    lable: "เลือกไปแล้ว",
+    label: "เลือกไปแล้ว",
     name: "group2",
     color: "primary",
     total: 0,
   },
   {
-    lable: "คงเหลือโควตา",
+    label: "คงเหลือโควตา",
     name: "group2",
     color: "indigo-6",
     total: 0,
   },
   {
-    lable: "สำรอง",
+    label: "สำรอง",
     name: "group2",
     color: "red-6",
     total: 0,
   },
 ]);
-const itemsCardOCT = ref([
+const itemsCardOCT = ref<ItemsCards[]>([
   {
-    lable: "จำนวนเงินคนครองปัจจุบัน",
+    label: "จำนวนเงินคนครองปัจจุบัน",
     name: "group1",
     color: "secondary",
     total: 0,
   },
 
   {
-    lable: "วงเงิน 6%",
+    label: "วงเงิน 6%",
     name: "group2",
     color: "light-blue-4",
     total: 0,
   },
   {
-    lable: "ยอดเงินที่ใช้ไป",
+    label: "ยอดเงินที่ใช้ไป",
     name: "group2",
     color: "primary",
     total: 0,
   },
   {
-    lable: "วงเงิน 6%-ยอดเงินที่ใช้ไป",
+    label: "วงเงิน 6%-ยอดเงินที่ใช้ไป",
     name: "group2",
     color: "indigo-6",
     total: 0,
   },
   {
-    lable: "ใช้ไปเท่าไหร่",
+    label: "ใช้ไปเท่าไหร่",
     name: "group2",
     color: "blue-6",
     total: 0,
   },
   {
-    lable: "เหลือเท่าไหร่",
+    label: "เหลือเท่าไหร่",
     name: "group2",
     color: "green-6",
     total: 0,
   },
   {
-    lable: "สำรอง",
+    label: "สำรอง",
     name: "group2",
     color: "red-6",
     total: 0,
   },
 ]);
-const itemsCardSpeciel = ref([
+const itemsCardSpeciel = ref<ItemsCards[]>([
   {
-    lable: "จำนวนคนทั้งหมด",
+    label: "จำนวนคนทั้งหมด",
     name: "group1",
     color: "secondary",
     total: 0,
   },
   {
-    lable: "เลือกไปแล้ว",
+    label: "เลือกไปแล้ว",
     name: "group2",
     color: "primary",
     total: 0,
   },
   {
-    lable: "สำรอง",
+    label: "สำรอง",
     name: "group2",
     color: "red-6",
     total: 0,
   },
 ]);
-
 const itemsCard = computed(() => {
   const items =
     store.roundMainCode === "APR"
@@ -135,7 +143,8 @@ const itemsCard = computed(() => {
   return items;
 });
 
-const rows = ref<any>([]);
+/** ข้อมูล Table*/
+const rows = ref<ResSalaryOrg[]>([]);
 const columnsAPR = ref<QTableProps["columns"]>([
   {
     name: "org",
@@ -351,7 +360,6 @@ const columnsSpeciel = ref<QTableProps["columns"]>([
     format: (v) => Number(v).toLocaleString(),
   },
 ]);
-
 const columns = computed(() => {
   const columnsss =
     store.roundMainCode === "APR"
@@ -362,23 +370,7 @@ const columns = computed(() => {
   return columnsss;
 });
 
-const visibleColumns = ref<string[]>(
-  store.roundMainCode === "APR"
-    ? ["org", "total", "fifteenPercent", "chosen", "remaining", "totalBackup"]
-    : store.roundMainCode === "OCT"
-    ? [
-        "org",
-        "currentAmount",
-        "sixPercentAmount",
-        "spentAmount",
-        "sixPercentSpentAmount",
-        "useAmount",
-        "remainingAmount",
-        "totalBackup",
-      ]
-    : []
-);
-
+/** function fetch ข้อมูลสถิติ*/
 function fetchDataDashboard() {
   showLoader();
   const formData = {
@@ -435,6 +427,8 @@ function fetchDataDashboard() {
       itemsCardSpeciel.value[0].total = quota.total;
       itemsCardSpeciel.value[1].total = quota.chosen;
       itemsCardSpeciel.value[2].total = quota.totalBackup;
+      console.log(res.data.result.salaryOrg);
+
       rows.value = res.data.result.salaryOrg;
     })
     .catch((err) => {
@@ -445,6 +439,7 @@ function fetchDataDashboard() {
     });
 }
 
+/** HookLifecycle*/
 onMounted(() => {
   fetchDataDashboard();
 });
@@ -486,7 +481,7 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
           <q-card-section>
             <div class="row items-center no-wrap">
               <div class="col">
-                <div class="">{{ item.lable }}</div>
+                <div class="">{{ item.label }}</div>
               </div>
 
               <div :class="`text-${item.color} text-bold`">
diff --git a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
index 509466ed6..c4cc965ab 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
@@ -141,7 +141,6 @@ function onClickAddPerson(data: DataPerson) {
     type: store.tabType,
     ...data,
   };
-
   dialogConfirm(
     $q,
     () => {
diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
index 50547bb49..d4af1ccc9 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
@@ -63,15 +63,7 @@ const typeRangeOps = computed(() => {
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
   if (typeRef.value.validate()) {
-    // if (
-    //   store.roundMainCode === "APR" &&
-    //   store.remaining === 0 &&
-    //   type.value === "FULL"
-    // ) {
-    //   dialogMessageNotify($q, "ไม่สามารถย้ายขั้นได้เนื่องจากโควตาคงเหลือไม่พอ");
-    // } else {
     onSubmit();
-    // }
   }
 }
 
diff --git a/src/modules/13_salary/components/SalaryLists/DialogProperties.vue b/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
index 9b5b70b0c..0f9f4fc36 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
@@ -62,9 +62,8 @@ const typeRangeOps = computed(() => {
 
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
-    onSubmit();
-  }
-
+  onSubmit();
+}
 
 /** function ปืด Popup */
 function close() {
@@ -77,10 +76,10 @@ function onSubmit() {
   dialogConfirm($q, () => {
     showLoader();
     const body = {
-        isPunish: isPunish.value,
-        isSuspension: isSuspension.value,
-        isAbsent: isAbsent.value,
-        isLeave: isLeave.value,
+      isPunish: isPunish.value,
+      isSuspension: isSuspension.value,
+      isAbsent: isAbsent.value,
+      isLeave: isLeave.value,
     };
     http
       .put(config.API.salaryProperty(profileId.value), body)
@@ -107,13 +106,6 @@ watch(
     isLeave.value = props.isLeave;
   }
 );
-
-function inputEdit(val: boolean) {
-  return {
-    "full-width cursor-pointer inputgreen ": val,
-    "full-width cursor-pointer inputgreen": !val,
-  };
-}
 </script>
 
 <template>
@@ -125,28 +117,28 @@ function inputEdit(val: boolean) {
       <q-card-section class="scroll" style="max-height: 70vh">
         <div class="q-gutter-y-sm column">
           <q-checkbox
-          toggle-indeterminate
+            toggle-indeterminate
             keep-color
             label="ไม่ถูกลงโทษทางวินัย"
             dense
             v-model="isPunish"
           />
           <q-checkbox
-          toggle-indeterminate
+            toggle-indeterminate
             keep-color
             label="ไม่ถูกพักราชการ"
             dense
             v-model="isSuspension"
           />
           <q-checkbox
-          toggle-indeterminate
+            toggle-indeterminate
             keep-color
             label="ไม่ขาดราชการ"
             dense
             v-model="isAbsent"
           />
           <q-checkbox
-          toggle-indeterminate
+            toggle-indeterminate
             keep-color
             label="วันลาไม่เกิน"
             dense
@@ -157,7 +149,6 @@ 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"
diff --git a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
index 7358765bc..cdf5bf79e 100644
--- a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
+++ b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
@@ -1,37 +1,50 @@
 <script setup lang="ts">
-import { ref, defineProps,onMounted } from "vue";
+import { ref, defineProps, onMounted } from "vue";
 import { useQuasar } from "quasar";
-
+import axios from "axios";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import DialogPopupReason from "@/components/Dialogs/PopupReason.vue"; //หมายเหตุ
-import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
-const store = useSalaryListSDataStore();
-import { useCounterMixin } from "@/stores/mixin";
-import axios from "axios";
 
-const modalRecommend = ref<boolean>(false);
-const titleRecommend = ref<string>("");
-const listFile = ref<any>([])
+/** importComponents*/
+import DialogPopupReason from "@/components/Dialogs/PopupReason.vue"; //หมายเหตุ
+
+/** importStore*/
+import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
+import { useCounterMixin } from "@/stores/mixin";
+
+/* use**/
 const $q = useQuasar(); //ใช้ noti quasar
-const mixin = useCounterMixin();
-const { messageError, dialogConfirm, showLoader, hideLoader, success,dialogRemove } = mixin;
-const type = ref<string>("");
-const sendStep = ref<number>(1);
-const fileUpload = ref<any>(null);
-const document = ref<string>("");
+const store = useSalaryListSDataStore();
+const {
+  messageError,
+  dialogConfirm,
+  showLoader,
+  hideLoader,
+  success,
+  dialogRemove,
+} = useCounterMixin();
+
+/** props*/
 const props = defineProps({
   rootId: String,
   periodId: String,
   getData: Function,
 });
+
+const modalRecommend = ref<boolean>(false);
+const titleRecommend = ref<string>("");
+const listFile = ref<any>([]);
+const type = ref<string>("");
+const sendStep = ref<number>(1);
+const fileUpload = ref<any>(null);
+const document = ref<string>("");
+
 /**
  * function อัปโหลดไฟล์เจ้าหน้าที่
  * @param event file
  */
 async function uploadFile(event: any) {
   const fileName = { fileName: event.name };
-
   dialogConfirm(
     $q,
     async () => {
@@ -57,7 +70,8 @@ async function uploadFile(event: any) {
               res.data[key]?.fileName !== undefined &&
               res.data[key]?.fileName !== ""
           );
-          foundKey && uploadfile(res.data[foundKey]?.uploadUrl, fileUpload.value);
+          foundKey &&
+            uploadfile(res.data[foundKey]?.uploadUrl, fileUpload.value);
         })
         .catch((err) => {
           messageError($q, err);
@@ -93,6 +107,7 @@ async function uploadfile(uploadUrl: string, file: any) {
     });
 }
 
+/** function fetchList ไฟล์*/
 function getListFile() {
   http
     .get(
@@ -104,12 +119,11 @@ function getListFile() {
       )
     )
     .then((res) => {
-      listFile.value = res.data
+      listFile.value = res.data;
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {});
+    });
 }
 
 function saveReccommend(reason: string) {
@@ -128,7 +142,7 @@ function saveReccommend(reason: string) {
             titleRecommend: reason,
           }
         )
-        .then((res) => {
+        .then(() => {
           props.getData?.();
         })
         .catch((e) => {
@@ -158,7 +172,7 @@ function sendToDirector(msg: string, type: string) {
             props.rootId ? props.rootId : ""
           )
         )
-        .then((res) => {
+        .then(() => {
           props.getData?.();
         })
         .catch((e) => {
@@ -173,6 +187,10 @@ function sendToDirector(msg: string, type: string) {
   );
 }
 
+/**
+ *  function โหลดไฟล์
+ * @param fileName  ชื่อไฟล์
+ */
 function downloadFile(fileName: string) {
   showLoader();
   http
@@ -197,6 +215,10 @@ function downloadFile(fileName: string) {
     });
 }
 
+/**
+ *  function ลบไฟล์
+ * @param fileName  ชื่อไฟล์
+ */
 function deleteFile(fileName: string) {
   dialogRemove($q, () => {
     showLoader();
@@ -230,9 +252,9 @@ function sendAndRecommend(title: string, typeOrder: string) {
   type.value = typeOrder;
 }
 
-onMounted(()=>{
-  getListFile()
-})
+onMounted(() => {
+  getListFile();
+});
 </script>
 
 <template>
diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index c340ca980..6b7aa1dc7 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -4,7 +4,6 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import genReportXLSX from "@/plugins/genreportxlsx";
-import DialogInfoCriteria from "@/modules/13_salary/components/SalaryLists/DialogInfoCriteria.vue";
 
 /** importType*/
 import type { DataOption } from "@/modules/13_salary/interface/index/Main";
@@ -17,6 +16,7 @@ import type {
 /** importComponents*/
 import TableTabType1 from "@/modules/13_salary/components/SalaryLists/TableTypePending.vue";
 import TableTabType2 from "@/modules/13_salary/components/SalaryLists/TableTypeOther.vue";
+import DialogInfoCriteria from "@/modules/13_salary/components/SalaryLists/DialogInfoCriteria.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -64,11 +64,7 @@ const itemsTabType = computed(() => {
           name: "tab1",
           type: "PENDING",
         },
-        // {
-        //   lable: "รายชื่อผู้เกษียณอายุราชการ",
-        //   name: "tab5",
-        //   type: "RETIRE",
-        // },
+
         {
           lable: "1 ขั้น",
           name: "tab2",
@@ -223,7 +219,6 @@ const maxPage = ref<number>(1);
  * @param id กลุ่ม
  */
 function fetchDataQuota(id: string) {
-  // showLoader();
   http
     .get(config.API.salaryListPeriodQuota(id))
     .then((res) => {
@@ -249,9 +244,6 @@ function fetchDataQuota(id: string) {
     .catch((err) => {
       messageError($q, err);
     });
-  // .finally(() => {
-  //   hideLoader();
-  // });
 }
 
 /**
diff --git a/src/modules/13_salary/interface/index/Main.ts b/src/modules/13_salary/interface/index/Main.ts
index e7541d3e1..e0207a954 100644
--- a/src/modules/13_salary/interface/index/Main.ts
+++ b/src/modules/13_salary/interface/index/Main.ts
@@ -23,6 +23,13 @@ interface ItemsMenu {
   type: string;
 }
 
+interface ItemsCards {
+  label: string;
+  name: string;
+  color: string;
+  total: number;
+}
+
 interface FormData {
   name: string;
   posTypeId: string;
@@ -47,4 +54,12 @@ interface FormSalaryRate {
   isNext: boolean;
 }
 
-export type { DataOption, NewPagination, ItemsMenu, DataOptionShort, FormData ,FormSalaryRate};
+export type {
+  DataOption,
+  NewPagination,
+  ItemsMenu,
+  DataOptionShort,
+  FormData,
+  FormSalaryRate,
+  ItemsCards,
+};
diff --git a/src/modules/13_salary/interface/response/SalaryList.ts b/src/modules/13_salary/interface/response/SalaryList.ts
index a3fdc365e..962346b98 100644
--- a/src/modules/13_salary/interface/response/SalaryList.ts
+++ b/src/modules/13_salary/interface/response/SalaryList.ts
@@ -121,6 +121,22 @@ interface DataPeriod {
   status: string;
   type: string;
 }
+
+interface ResSalaryOrg {
+  chosen: number;
+  currentAmount: number;
+  fifteenPercent: number;
+  org: string;
+  remaining: number;
+  remainingAmount: number;
+  sixPercentAmount: number;
+  sixPercentSpentAmount: number;
+  spentAmount: number;
+  total: number;
+  totalAmountSpecial: number;
+  totalBackup: number;
+  useAmount: number;
+}
 export type {
   DataPeriodLatest,
   DataPeriodQuota,
@@ -128,4 +144,5 @@ export type {
   DataAgency,
   DataPerson,
   DataPeriod,
+  ResSalaryOrg,
 };
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 524a17dcc..154001d45 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { onMounted, ref, computed, nextTick } from "vue";
+import { onMounted, ref, nextTick } from "vue";
 import { useQuasar } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";
 import ProcessStep from "@/modules/13_salary/components/SalaryLists/ProcessStep.vue";
 import PageDashBoard from "@/modules/13_salary/components/SalaryLists/Dashboard.vue";
+
 /** importType*/
 import type {
   DataOption,
@@ -164,7 +165,6 @@ async function getAgency(id: string) {
             name: x.orgRootName,
           }))
         );
-        // agencyFilter.value = store.rootId;
       })
       .catch((err) => {
         messageError($q, err);
@@ -240,7 +240,6 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
       })
       .catch((err) => {
         messageError($q, err);
-        // isLoad.value = true;
       })
       .finally(() => {
         setTimeout(() => {
@@ -259,7 +258,6 @@ async function onChangeRound() {
   }
   getSnap(roundFilter.value.shortCode);
   await getAgency(roundFilter.value.revisionId);
-  // await getAgencyPosition(roundFilter.value.revisionId);
   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
     fetchSalalyPeriod(
       agencyFilter.value,
@@ -288,7 +286,6 @@ async function onChangeSnap() {
 /** function เปลี่ยนหน่วยงาน*/
 async function onChangeAgency() {
   store.rootId = agencyFilter.value;
-
   if (
     agencyFilter.value !== "ALL" &&
     roundFilter.value.id &&
@@ -325,11 +322,11 @@ function onScroll({ to, ref }: { to: number; ref: any }) {
   }
 }
 
+/** function fetch PeriodQuota*/
 function getQuota() {
   http
     .get(config.API.salaryListPeriodQuota(store.groupId))
     .then((res) => {
-      console.log("q", res);
       const data = res.data.result;
       store.statusQuota = data.status;
     })
@@ -338,8 +335,8 @@ function getQuota() {
     })
     .finally(() => {});
 }
-onMounted(async () => {
-  await getRound();
+onMounted(() => {
+  getRound();
 });
 </script>
 
@@ -445,25 +442,6 @@ onMounted(async () => {
     />
   </div>
 
-  <!-- <q-card> -->
-  <!-- <q-tabs
-      v-model="tabMain"
-      dense
-      class="text-grey"
-      active-color="secondary"
-      indicator-color="secondary"
-      align="justify"
-    >
-      <q-tab
-        name="first_snapshot"
-        :label="store.titelPage === 'OCT' ? '1 มีนาคม' : '1 กันยายน'"
-      />
-      <q-tab
-        name="two_snapshot"
-        :label="store.titelPage === 'OCT' ? '1 เมษายน' : '1 ตุลาคม'"
-      />
-    </q-tabs>
-    <q-separator /> -->
   <q-card flat bordered>
     <div v-if="agencyFilter !== 'ALL'">
       <TabGroup
@@ -503,8 +481,6 @@ onMounted(async () => {
       :get-data="getQuota"
     />
   </q-card>
-
-  <!-- </q-card> -->
 </template>
 
 <style lang="sass" scoped>