แก้การส่งค่า & fix bug รอบ ระบบเงินเดือน

src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue

@@ -387,7 +387,10 @@ function fetchDataDashboard() {
     .then((res) => {
       const quota = res.data.result.dashboard;
       itemsCardAPR.value[0].total = quota.total;
-      itemsCardAPR.value[1].total = quota.fifteenPercent;
+      itemsCardAPR.value[1].total = quota.fifteenPercent.toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      });
       itemsCardAPR.value[2].total = quota.chosen;
       itemsCardAPR.value[3].total = quota.remaining;
       itemsCardAPR.value[4].total = quota.totalBackup;

src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue

@@ -256,7 +256,12 @@ function fetchDataPeriod(id: string) {
     pageSize: formFilter.pageSize.toString(),
     keyword: formFilter.keyword,
     type: store.tabType,
-    isRetire: isRetire.value === true ? "1" : "0",
+    isRetire:
+      store.roundMainCode === "APR"
+        ? null
+        : isRetire.value === true
+        ? "1"
+        : "0",
   };
 
   http

src/modules/13_salary/components/SalaryLists/Dashboard.vue

@@ -392,17 +392,44 @@ function fetchDataDashboard() {
     .then((res) => {
       const quota = res.data.result.dashboard;
       itemsCardAPR.value[0].total = quota.total;
-      itemsCardAPR.value[1].total = quota.fifteenPercent;
+      itemsCardAPR.value[1].total = quota.fifteenPercent.toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      });
       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[0].total = quota.currentAmount.toLocaleString("en", {
-      itemsCardOCT.value[1].total = quota.sixPercentAmount;
+        minimumFractionDigits: 2,
-      itemsCardOCT.value[2].total = quota.spentAmount;
+        maximumFractionDigits: 2,
-      itemsCardOCT.value[3].total = quota.sixPercentSpentAmount;
+      });
-      itemsCardOCT.value[4].total = quota.useAmount;
+      itemsCardOCT.value[1].total = quota.sixPercentAmount.toLocaleString(
-      itemsCardOCT.value[5].total = quota.remainingAmount;
+        "en",
+        {
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        }
+      );
+      itemsCardOCT.value[2].total = quota.spentAmount.toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      });
+      itemsCardOCT.value[3].total = quota.sixPercentSpentAmount.toLocaleString(
+        "en",
+        {
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        }
+      );
+      itemsCardOCT.value[4].total = quota.useAmount.toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      });
+      itemsCardOCT.value[5].total = quota.remainingAmount.toLocaleString("en", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      });
       itemsCardOCT.value[6].total = quota.totalBackup;
 
       itemsCardSpeciel.value[0].total = quota.total;

src/modules/13_salary/components/SalaryLists/TabMain.vue

@@ -265,7 +265,12 @@ function fetchDataPeriod(id: string) {
     pageSize: formFilter.pageSize.toString(),
     keyword: formFilter.keyword,
     type: store.tabType,
-    isRetire: isRetire.value === true ? "1" : "0",
+    isRetire:
+      store.roundMainCode === "APR"
+        ? null
+        : isRetire.value === true
+        ? "1"
+        : "0",
   };
 
   http

src/modules/13_salary/views/salaryRound.vue

@@ -421,8 +421,7 @@ onMounted(async () => {
                             color="edit"
                             size="17px"
                             :name="
-                              dateToISO(new Date()) >=
+                              props.row.revisionId !== null
-                              dateToISO(props.row.effectiveDate)
                                 ? 'mdi-eye-outline'
                                 : 'edit'
                             "
@@ -439,7 +438,10 @@ onMounted(async () => {
                     </q-item>
 
                     <q-item
-                      v-if="props.row.revisionId !== null"
+                      v-if="
+                        props.row.isClose === false &&
+                        props.row.isActive === true
+                      "
                       clickable
                       v-close-popup
                       @click.stop="dialogClose(props.row.id)"