From abb55a77919cf88969c98e3d354ab6e7597dd76a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 29 Mar 2024 09:15:28 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=20format?=
 =?UTF-8?q?=20=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B9=80=E0=B8=A5=E0=B8=82?=
 =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SalaryEmployeeLists/Dashboard.vue    | 13 +++++++++++++
 .../13_salary/components/SalaryLists/Dashboard.vue  | 12 ++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
index 726b954b4..f74d35699 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
@@ -149,6 +149,7 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "total",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 
   {
@@ -159,6 +160,11 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "fifteenPercent",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) =>
+      Number(v).toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }),
   },
   {
     name: "chosen",
@@ -168,6 +174,7 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "chosen",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
   {
     name: "remaining",
@@ -177,6 +184,7 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "remaining",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
   {
     name: "totalBackup",
@@ -186,6 +194,7 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "totalBackup",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 ]);
 const columnsOCT = ref<QTableProps["columns"]>([
@@ -292,6 +301,7 @@ const columnsOCT = ref<QTableProps["columns"]>([
     field: "totalBackup",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 ]);
 
@@ -313,6 +323,7 @@ const columnsSpeciel = ref<QTableProps["columns"]>([
     field: "total",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 
   {
@@ -323,6 +334,7 @@ const columnsSpeciel = ref<QTableProps["columns"]>([
     field: "chosen",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 
   {
@@ -333,6 +345,7 @@ const columnsSpeciel = ref<QTableProps["columns"]>([
     field: "totalBackup",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 ]);
 const columns = computed(() => {
diff --git a/src/modules/13_salary/components/SalaryLists/Dashboard.vue b/src/modules/13_salary/components/SalaryLists/Dashboard.vue
index fb7719183..ecbd1c1c3 100644
--- a/src/modules/13_salary/components/SalaryLists/Dashboard.vue
+++ b/src/modules/13_salary/components/SalaryLists/Dashboard.vue
@@ -164,6 +164,11 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "fifteenPercent",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) =>
+      Number(v).toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }),
   },
   {
     name: "chosen",
@@ -173,6 +178,7 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "chosen",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
   {
     name: "remaining",
@@ -182,6 +188,7 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "remaining",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
   {
     name: "totalBackup",
@@ -191,6 +198,7 @@ const columnsAPR = ref<QTableProps["columns"]>([
     field: "totalBackup",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 ]);
 const columnsOCT = ref<QTableProps["columns"]>([
@@ -297,6 +305,7 @@ const columnsOCT = ref<QTableProps["columns"]>([
     field: "totalBackup",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 ]);
 const columnsSpeciel = ref<QTableProps["columns"]>([
@@ -317,6 +326,7 @@ const columnsSpeciel = ref<QTableProps["columns"]>([
     field: "total",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 
   {
@@ -327,6 +337,7 @@ const columnsSpeciel = ref<QTableProps["columns"]>([
     field: "chosen",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 
   {
@@ -337,6 +348,7 @@ const columnsSpeciel = ref<QTableProps["columns"]>([
     field: "totalBackup",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
   },
 ]);