diff --git a/src/api/13_salary/api.salary.ts b/src/api/13_salary/api.salary.ts
index 742d940ae..0c023d038 100644
--- a/src/api/13_salary/api.salary.ts
+++ b/src/api/13_salary/api.salary.ts
@@ -71,6 +71,8 @@ export default {
   salaryListPeriodProfileByIdEmp: (id: string) =>
     `${salaryPeriodEmp}/profile/${id}`,
 
+  salaryDashboardEmp: `${salaryPeriodEmp}/summary/all`,
+
   salaryPeriodStatusEmp: (type: string, periodId: string, rootId: string) =>
     `${salaryPeriodEmp}/${type}/approve/${periodId}/${rootId}`,
   salaryPeriodStatusCommentEmp: (
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
index 54fa80a1b..6906d91e2 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
@@ -1,10 +1,24 @@
 <script setup lang="ts">
-import { ref, watch, onMounted, reactive, computed } from "vue";
+import { ref, onMounted, watch, computed } from "vue";
+import { useQuasar } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
 import type { QTableProps } from "quasar";
 
 import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
 
+import { useCounterMixin } from "@/stores/mixin";
+
+const $q = useQuasar();
 const store = useSalaryEmployeeListSDataStore();
+const { messageError, showLoader, hideLoader } = useCounterMixin();
+
+const props = defineProps({
+  year: Number,
+  snapShot: String,
+  roundFilter: Object,
+});
 
 /** itemsCard*/
 const itemsCardAPR = ref([
@@ -255,48 +269,75 @@ const visibleColumns = ref<string[]>(
     : []
 );
 
-const isLoad = ref<boolean>(true);
-watch(
-  () => store.roundMainCode,
-  () => {
-    isLoad.value = false;
-    setTimeout(() => {
-      isLoad.value = true;
-    }, 200);
-  }
-);
+function fetchDataDashboard() {
+  const formData = {
+    year: props?.year,
+    group: "",
+    period: props?.roundFilter?.id,
+    snapshot: props?.snapShot,
+  };
+  http
+    .post(config.API.salaryDashboardEmp, formData)
+    .then((res) => {
+      const quota = res.data.result.dashboard;
+      itemsCardAPR.value[0].total = quota.total;
+      itemsCardAPR.value[1].total = quota.fifteenPercent;
+      itemsCardAPR.value[2].total = quota.chosen;
+      itemsCardAPR.value[3].total = quota.remaining;
+      itemsCardAPR.value[4].total = quota.totalBackup;
+
+      itemsCardOCT.value[0].total = quota.currentAmount;
+      itemsCardOCT.value[1].total = quota.sixPercentAmount;
+      itemsCardOCT.value[2].total = quota.spentAmount;
+      itemsCardOCT.value[3].total = quota.sixPercentSpentAmount;
+      itemsCardOCT.value[4].total = quota.useAmount;
+      itemsCardOCT.value[5].total = quota.remainingAmount;
+      itemsCardOCT.value[6].total = quota.totalBackup;
+
+      rows.value = res.data.result.salaryOrg;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    });
+}
+onMounted(() => {
+  fetchDataDashboard();
+});
+
+watch([() => props?.snapShot, () => props.roundFilter], () => {
+  fetchDataDashboard();
+});
 </script>
 
 <template>
   <!-- Card โควต้า -->
 
-  <div v-if="isLoad">
-    <div class="row col-12 q-pa-md bg-grey-2">
-      <div class="row col-12 q-col-gutter-sm">
-        <div
-          v-for="(item, index) in itemsCard"
-          :key="index"
-          :class="
-            store.roundMainCode === 'APR'
-              ? 'col-6 col-sm-4 col-md-3 col-lg-2'
-              : 'col-3'
-          "
-        >
-          <q-card>
-            <q-card-section>
-              <div class="row items-center no-wrap">
-                <div class="col">
-                  <div class="">{{ item.lable }}</div>
-                </div>
-
-                <div :class="`text-${item.color} text-bold`">
-                  {{ item.total ? item.total.toLocaleString() : 0 }}
-                </div>
+  <div class="row col-12 q-pa-md bg-grey-2">
+    <div class="row col-12 q-col-gutter-sm">
+      <div
+        v-for="(item, index) in itemsCard"
+        :key="index"
+        :class="
+          store.roundMainCode === 'APR'
+            ? 'col-6 col-sm-4 col-md-3 col-lg-2'
+            : 'col-3'
+        "
+      >
+        <q-card>
+          <q-card-section>
+            <div class="row items-center no-wrap">
+              <div class="col">
+                <div class="">{{ item.lable }}</div>
               </div>
-            </q-card-section>
-          </q-card>
-        </div>
-        <!-- <div class="row col justify-end self-center">
+
+              <div :class="`text-${item.color} text-bold`">
+                {{ item.total ? item.total.toLocaleString() : 0 }}
+              </div>
+            </div>
+          </q-card-section>
+        </q-card>
+      </div>
+      <!-- <div class="row col justify-end self-center">
           <q-btn-dropdown color="blue-5" label="ดาวน์โหลด">
             <q-list>
               <q-item
@@ -317,40 +358,39 @@ watch(
             </q-list>
           </q-btn-dropdown>
         </div> -->
-      </div>
-    </div>
-    <q-separator />
-    <div class="col-12 q-pa-md">
-      <d-table
-        for="table"
-        ref="table"
-        :columns="columns"
-        :rows="rows"
-        row-key="id"
-        flat
-        bordered
-        dense
-        class="custom-header-table"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div class="table_ellipsis">
-                {{ col.value ? col.value : "-" }}
-              </div>
-            </q-td>
-          </q-tr>
-        </template>
-      </d-table>
     </div>
   </div>
+  <q-separator />
+  <div class="col-12 q-pa-md">
+    <d-table
+      for="table"
+      ref="table"
+      :columns="columns"
+      :rows="rows"
+      row-key="id"
+      flat
+      bordered
+      dense
+      class="custom-header-table"
+    >
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th v-for="col in props.cols" :key="col.name" :props="props">
+            <span class="text-weight-medium">{{ col.label }}</span>
+          </q-th>
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props" class="cursor-pointer">
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div class="table_ellipsis">
+              {{ col.value ? col.value : "-" }}
+            </div>
+          </q-td>
+        </q-tr>
+      </template>
+    </d-table>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue
index 2c68cc393..b8c7f7d6f 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue
@@ -137,9 +137,11 @@ function fetchListPerson() {
  * @param data ข้อมูลคนที่เพิ่ม
  */
 function onClickAddPerson(data: DataPerson) {
+  data.rank = undefined;
   const body: DataPersonReq = {
     id: store.groupId,
     type: store.tabType,
+
     ...data,
   };
 
diff --git a/src/modules/13_salary/interface/response/SalaryList.ts b/src/modules/13_salary/interface/response/SalaryList.ts
index 3b00b392d..a3fdc365e 100644
--- a/src/modules/13_salary/interface/response/SalaryList.ts
+++ b/src/modules/13_salary/interface/response/SalaryList.ts
@@ -74,6 +74,7 @@ interface DataPerson {
   prefix: string;
   root: string;
   rootId: string;
+  rank: string | undefined;
 }
 
 interface DataPeriod {
diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue
index 14076fefd..cc202d66f 100644
--- a/src/modules/13_salary/views/salaryEmployeeLists.vue
+++ b/src/modules/13_salary/views/salaryEmployeeLists.vue
@@ -437,7 +437,11 @@ onMounted(() => {
       </q-card>
     </div>
     <div v-else>
-      <PageDashBoard />
+      <PageDashBoard
+        :year="year"
+        :snapShot="snapFilter"
+        :roundFilter="roundFilter"
+      />
     </div>
   </q-card>