no message

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

@@ -0,0 +1,4 @@
+<template>
+<q-card class="q-pa-sm"> หน่วยงาน ทั้งหมด </q-card>
+
+</template>

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

@@ -6,6 +6,7 @@ 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";
 import type { DataFilter } from "@/modules/13_salary/interface/index/SalaryList";
@@ -134,13 +135,19 @@ const itemsCard = ref([
     color: "indigo-6",
     total: 0,
   },
-
+  {
+    lable: "สำรอง",
+    name: "group2",
+    color: "red-6",
+    total: 0,
+  },
   {
     lable: "จำนวนเงินคนครองปัจจุบัน",
     name: "group1",
     color: "secondary",
     total: 0,
   },
+
   {
     lable: "วงเงิน 6%",
     name: "group2",
@@ -171,6 +178,12 @@ const itemsCard = ref([
     color: "green-6",
     total: 0,
   },
+  {
+    lable: "สำรอง",
+    name: "group2",
+    color: "red-6",
+    total: 0,
+  },
 ]);
 
 /** ข้อมูลค้นหารายชื่อคยขึ้นเงินเดือน*/
@@ -196,14 +209,17 @@ function fetchDataQuota(id: string) {
       itemsCard.value[0].total = data.total;
       itemsCard.value[1].total = data.fifteenPercent;
       itemsCard.value[2].total = data.chosen;
-      itemsCard.value[3].total = data.remaining;
+      itemsCard.value[3].total = data.remaining;      
+      itemsCard.value[4].total = data.totalBackup;
 
-      itemsCard.value[4].total = data.currentAmount;
-      itemsCard.value[5].total = data.sixPercentAmount;
-      itemsCard.value[6].total = data.spentAmount;
-      itemsCard.value[7].total = data.sixPercentSpentAmount;
-      itemsCard.value[8].total = data.useAmount;
-      itemsCard.value[9].total = data.remainingAmount;
+      itemsCard.value[5].total = data.currentAmount;
+      itemsCard.value[6].total = data.sixPercentAmount;
+      itemsCard.value[7].total = data.spentAmount;
+      itemsCard.value[8].total = data.sixPercentSpentAmount;
+      itemsCard.value[9].total = data.useAmount;
+      itemsCard.value[10].total = data.remainingAmount;
+      
+      itemsCard.value[11].total = data.totalBackup;
     })
     .catch((err) => {
       messageError($q, err);
@@ -333,9 +349,9 @@ onMounted(async () => {
         <div class="row col-12 items-start q-gutter-md items-center">
           <div
             v-for="(item, index) in store.roundMainCode === 'APR'
-              ? itemsCard.slice(0, 4)
+              ? itemsCard.slice(0, 5)
               : store.roundMainCode === 'OCT'
-              ? itemsCard.slice(4, 10)
+              ? itemsCard.slice(5, 12)
               : itemsCard"
             :key="index"
             :class="store.roundMainCode === 'APR' ? 'my-card' : 'col-3'"

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

@@ -255,8 +255,8 @@ watch(
 </script>
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
-    <q-btn flat round dense icon="add" @click="onClickAddPerson">
-      <q-tooltip>เพิ่ม </q-tooltip>
+    <q-btn v-if="!store.isClosedRound" flat round dense icon="add" @click="onClickAddPerson">
+      <q-tooltip>เพิ่ม</q-tooltip>
     </q-btn>
     <q-space />
     <q-input
@@ -313,10 +313,26 @@ watch(
     </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">
+        <q-td
+          v-for="col in props.cols"
+          :key="col.name"
+          :props="props"
+          :class="store.tabType !== 'RETIRE' ? props.row.isNext == true ? 'text-red' : '':''"
+        >
           <div v-if="col.name === 'no'">
             {{
-              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
+              store.tabType == "FULL"
+                ? props.row.isReserve == true
+                  ? (formFilter.page - 1) * formFilter.pageSize +
+                    props.rowIndex +
+                    1 +
+                    "(สำรอง)"
+                  : (formFilter.page - 1) * formFilter.pageSize +
+                    props.rowIndex +
+                    1
+                : (formFilter.page - 1) * formFilter.pageSize +
+                  props.rowIndex +
+                  1
             }}
           </div>
           <div v-else-if="col.name === 'posNo'">
@@ -369,8 +385,9 @@ watch(
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-        <q-td>
+        <q-td >
           <q-btn
+          v-if="!store.isClosedRound"
             flat
             dense
             icon="mdi-dots-vertical"

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

@@ -302,7 +302,7 @@ watch(
 
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
-    <q-btn flat round dense icon="add" @click="onClickAddPerson">
+    <q-btn           v-if="!store.isClosedRound" flat round dense icon="add" @click="onClickAddPerson">
       <q-tooltip>เพิ่ม </q-tooltip>
     </q-btn>
     <q-space />
@@ -485,6 +485,7 @@ watch(
         </q-td>
         <q-td>
           <q-btn
+          v-if="!store.isClosedRound"
             flat
             dense
             icon="mdi-dots-vertical"