From e3a91f1c710572e7eaee9c7b37bae13a3f5315b2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 19 Dec 2024 15:17:24 +0700
Subject: [PATCH] fix table

---
 .../02_organization/components/DialogMovePos.vue    | 13 +++----------
 src/modules/02_organization/components/MainView.vue |  3 +++
 .../02_organization/components/TableMain.vue        |  2 ++
 .../16_positionEmployee/components/TableMain.vue    |  2 ++
 src/modules/16_positionEmployee/views/main.vue      |  3 +++
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/modules/02_organization/components/DialogMovePos.vue b/src/modules/02_organization/components/DialogMovePos.vue
index 2a9a3f992..658d0a541 100644
--- a/src/modules/02_organization/components/DialogMovePos.vue
+++ b/src/modules/02_organization/components/DialogMovePos.vue
@@ -85,7 +85,6 @@ const pagination = ref({
 
 /**
  * ปิดปุ่มย้ายตำแหน่ง
- *
  * เมื่อไม่ได้เลือกตำแหน่งที่ต้องการย้ายและหน่วยงานที่ต้องการย้ายปุ่มย้ายตำแหน่งจะปืด
  */
 const isDisable = computed(() => {
@@ -94,17 +93,13 @@ const isDisable = computed(() => {
   } else return false;
 });
 
-/**
- * function เลือกข้อมูลหน่วยงาน
- */
+/** function เลือกข้อมูลหน่วยงาน*/
 function updateSelected(data: DataTree) {
   levelTree.value = data.orgLevel;
   selectedTree.value = data.orgTreeId;
 }
 
-/**
- * function ยืนยันการย้ายแหน่งจากหน่วยงาน/ส่วนราชการปัจจุบัน
- */
+/** function ยืนยันการย้ายแหน่งจากหน่วยงาน/ส่วนราชการปัจจุบัน*/
 function onClickMovePos() {
   if (selectedTree.value === "" || selectedTree.value === null) {
     dialogMessageNotify($q, "กรุณาเลือกหน่วยงานที่จะย้ายไป");
@@ -156,9 +151,7 @@ function onSearchData() {
   props.fetchDataTable?.(store.treeId, store.level, false);
 }
 
-/**
- * ดูการเปลี่ยนแปลง  modal เมื่อเป็น true
- */
+/** ดูการเปลี่ยนแปลง  modal เมื่อเป็น true*/
 watch(
   () => modal.value,
   () => {
diff --git a/src/modules/02_organization/components/MainView.vue b/src/modules/02_organization/components/MainView.vue
index 7fc90f9db..f4ba6ca58 100644
--- a/src/modules/02_organization/components/MainView.vue
+++ b/src/modules/02_organization/components/MainView.vue
@@ -50,6 +50,7 @@ const reqMaster = reactive<FilterMaster>({
   revisionId: "",
 });
 const totalPage = ref<number>(1);
+const totalData = ref<number>(1);
 const action1 = ref<boolean>(false);
 const posMaster = ref<PosMaster2[]>([]);
 const shortName = ref<string>("");
@@ -116,6 +117,7 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
     .then(async (res) => {
       const dataMain: PosMaster[] = [];
       totalPage.value = Math.ceil(res.data.result.total / reqMaster.pageSize);
+      totalData.value = res.data.result.total;
       res.data.result.data.forEach((e: PosMaster) => {
         const p = e.positions;
         if (p.length !== 0) {
@@ -334,6 +336,7 @@ onMounted(async () => {
                 v-model:req-master="reqMaster"
                 v-model:total-page="totalPage"
                 v-model:org-root-id="orgRootId"
+                v-model:total-data="totalData"
                 :short-name="shortName"
                 :main-tree="mainTree"
                 :fetch-data-table="fetchDataTable"
diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index db853c03e..688e6f045 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -42,6 +42,7 @@ const orgLevel = defineModel<number>("orgLevel", { required: true });
 const treeId = defineModel<string>("treeId", { required: true });
 const reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
 const totalPage = defineModel<number>("totalPage", { required: true });
+const totalData = defineModel<number>("totalData", { required: true });
 const posMaster = defineModel<PosMaster2[]>("posMaster", { required: true });
 const orgRootId = defineModel<string>("orgRootId", { required: true });
 const props = defineProps({
@@ -887,6 +888,7 @@ watch(
         </q-tr>
       </template>
       <template v-slot:pagination="scope">
+        ทั้งหมด {{ totalData }} รายการ
         <q-pagination
           v-model="reqMaster.page"
           active-color="primary"
diff --git a/src/modules/16_positionEmployee/components/TableMain.vue b/src/modules/16_positionEmployee/components/TableMain.vue
index 1931afecb..4713c9c5c 100644
--- a/src/modules/16_positionEmployee/components/TableMain.vue
+++ b/src/modules/16_positionEmployee/components/TableMain.vue
@@ -49,6 +49,7 @@ const orgLevel = defineModel<number>("orgLevel", { required: true });
 const treeId = defineModel<string>("treeId", { required: true });
 const reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
 const totalPage = defineModel<number>("totalPage", { required: true });
+const totalData = defineModel<number>("totalData", { required: true });
 const posMaster = defineModel<PosMaster2[]>("posMaster", { required: true });
 const props = defineProps({
   filterKeyword: { type: Function, require: true, default: () => {} },
@@ -634,6 +635,7 @@ watch(
         </q-tr>
       </template>
       <template v-slot:pagination="scope">
+        ทั้งหมด {{ totalData }} รายการ
         <q-pagination
           v-model="reqMaster.page"
           active-color="primary"
diff --git a/src/modules/16_positionEmployee/views/main.vue b/src/modules/16_positionEmployee/views/main.vue
index a8b72dfbe..7b64bc8c4 100644
--- a/src/modules/16_positionEmployee/views/main.vue
+++ b/src/modules/16_positionEmployee/views/main.vue
@@ -49,6 +49,7 @@ const reqMaster = reactive<FilterMaster>({
   revisionId: "",
 });
 const totalPage = ref<number>(1); //จำนวนหน้า
+const totalData = ref<number>(1); //จำนวนหน้า
 const action1 = ref<boolean>(false);
 const posMaster = ref<PosMaster2[]>([]); //รายการตำแหน่ง
 const shortName = ref<string>(""); //ชื่อย่อย
@@ -100,6 +101,7 @@ function fetchDataTable(id: string, level: number, action: boolean) {
     .then(async (res) => {
       const dataMain: PosMaster[] = [];
       totalPage.value = Math.ceil(res.data.result.total / reqMaster.pageSize);
+      totalData.value = res.data.result.total;
       res.data.result.data.forEach((e: PosMaster) => {
         const p = e.positions;
         if (p.length !== 0) {
@@ -294,6 +296,7 @@ onMounted(() => {
                       v-model:pos-master="posMaster"
                       v-model:req-master="reqMaster"
                       v-model:total-page="totalPage"
+                      v-model:total-data="totalData"
                       :short-name="shortName"
                       :main-tree="mainTree"
                       :fetch-data-table="fetchDataTable"