From 7eb364b152aecbf6b12416e57be5120889bdb19d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 23 Apr 2024 16:21:59 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AA=E0=B8=A1=E0=B8=A3=E0=B8=A3=E0=B8=96?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B0=20=3D>=20Bug=20paging=20=E0=B8=81=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B8=E0=B9=88=E0=B8=A1=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competency/01ListCompetency.vue           |  1 +
 .../competency/02ListLinkPosition.vue         | 76 +++++++++++++++++--
 .../components/competency/03ListLinkGroup.vue | 34 +++------
 3 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/src/modules/14_KPI/components/competency/01ListCompetency.vue b/src/modules/14_KPI/components/competency/01ListCompetency.vue
index f0dd94301..57db8c08e 100644
--- a/src/modules/14_KPI/components/competency/01ListCompetency.vue
+++ b/src/modules/14_KPI/components/competency/01ListCompetency.vue
@@ -185,6 +185,7 @@ onMounted(() => {
     bordered
     :paging="true"
     dense
+    :rows-per-page-options="[10, 25, 50, 100]"
     class="custom-header-table"
     :visible-columns="visibleColumns"
   >
diff --git a/src/modules/14_KPI/components/competency/02ListLinkPosition.vue b/src/modules/14_KPI/components/competency/02ListLinkPosition.vue
index 9deefd0b0..dd6050cc0 100644
--- a/src/modules/14_KPI/components/competency/02ListLinkPosition.vue
+++ b/src/modules/14_KPI/components/competency/02ListLinkPosition.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
+import { ref, onMounted, reactive, watch } from "vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 
 import dialogHeader from "@/components/DialogHeader.vue";
-import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
+import type {
+  DataOption,
+  NewPagination,
+} from "@/modules/14_KPI/interface/index/Main";
 import type { ResponseObject } from "@/modules/14_KPI/interface/response/KpiGroup";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -66,13 +69,25 @@ const filterKeyword = ref<string>("");
 
 const visibleColumns = ref<string[]>(["nameGroupKPI"]);
 
+const formQuery = reactive({
+  page: 1,
+  pageSize: 10,
+  keyword: "",
+});
+const totalList = ref<number>(1); //จำนวนข้อมูลรายการ
+
 /** ดึงข้อมูล */
 async function fetchData() {
   showLoader();
   await http
-    .get(config.API.kpiGroup)
+    .get(
+      config.API.kpiGroup +
+        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}`
+    )
     .then(async (res) => {
-      rows.value = res.data.result.data;
+      const data = res.data.result;
+      totalList.value = Math.ceil(res.data.result.total / formQuery.pageSize);
+      rows.value = data.data;
     })
     .catch((err) => {
       messageError($q, err);
@@ -161,6 +176,26 @@ async function onSubmit() {
   );
 }
 
+/**
+ * function updatePagination
+ * @param newPagination ข้อมูล Pagination ใหม่
+ */
+function updatePagination(newPagination: NewPagination) {
+  formQuery.page = 1;
+  formQuery.pageSize = newPagination.rowsPerPage;
+}
+function fetchNewList() {
+  formQuery.page = 1;
+  fetchData();
+}
+
+watch(
+  () => formQuery.pageSize,
+  () => {
+    fetchNewList();
+  }
+);
+
 onMounted(async () => {
   fetchData();
 });
@@ -173,7 +208,22 @@ onMounted(async () => {
     </q-btn>
     <q-space />
     <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
+      <q-input
+        outlined
+        dense
+        v-model="formQuery.keyword"
+        label="ค้นหา"
+        @keyup.enter="fetchNewList()"
+      >
+        <template v-slot:append>
+          <q-icon v-if="formQuery.keyword == ''" name="search" />
+          <q-icon
+            v-if="formQuery.keyword !== ''"
+            name="clear"
+            class="cursor-pointer"
+            @click="(formQuery.keyword = ''), fetchNewList()"
+          /> </template
+      ></q-input>
       <q-select
         v-model="visibleColumns"
         multiple
@@ -195,14 +245,15 @@ onMounted(async () => {
     ref="table"
     :columns="columns"
     :rows="rows"
-    :filter="filterKeyword"
     row-key="id"
     flat
     bordered
     :paging="true"
     dense
     class="custom-header-table"
+    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
+    @update:pagination="updatePagination"
   >
     <template v-slot:header="props">
       <q-tr :props="props">
@@ -249,6 +300,19 @@ onMounted(async () => {
         </q-td>
       </q-tr>
     </template>
+    <template v-slot:pagination="scope">
+      <q-pagination
+        v-model="formQuery.page"
+        active-color="primary"
+        color="dark"
+        :max="Number(totalList)"
+        size="sm"
+        boundary-links
+        direction-links
+        :max-pages="5"
+        @update:model-value="fetchData"
+      ></q-pagination>
+    </template>
   </d-table>
 
   <q-dialog v-model="modal" persistent>
diff --git a/src/modules/14_KPI/components/competency/03ListLinkGroup.vue b/src/modules/14_KPI/components/competency/03ListLinkGroup.vue
index 822de30e7..749498430 100644
--- a/src/modules/14_KPI/components/competency/03ListLinkGroup.vue
+++ b/src/modules/14_KPI/components/competency/03ListLinkGroup.vue
@@ -174,7 +174,7 @@ function onAdd() {
   modal.value = true;
 }
 
- async function onEdit(data: any) {
+async function onEdit(data: any) {
   id.value = data;
   await getOptions();
   await getListGroup();
@@ -191,11 +191,11 @@ function getDataEdit(id: string) {
     .then((res) => {
       const data = res.data.result;
       groupName.value = {
-        id:data.groupId,
-        name:data.groupName
-      }
-      position.value = data.positions.map((i:any) => i.name);
-      competency.value = data.capacitys.map((i:any) => i.id);
+        id: data.groupId,
+        name: data.groupName,
+      };
+      position.value = data.positions.map((i: any) => i.name);
+      competency.value = data.capacitys.map((i: any) => i.id);
     })
     .finally(() => {
       hideLoader();
@@ -213,7 +213,7 @@ function onSubmit() {
   };
   dialogConfirm($q, () => {
     http[editStatus.value ? "put" : "post"](url, body)
-      .then((res) => {
+      .then(() => {
         success($q, "บันทึกสำเร็จ");
         close();
         getData();
@@ -272,18 +272,6 @@ onMounted(async () => {
 
 <template>
   <q-toolbar style="padding: 0">
-    <!-- <q-select
-      v-model="competencyType"
-      outlined
-      label="ประเภทสมรรถนะ"
-      dense
-      option-label="name"
-      option-value="id"
-      :options="competencyTypeOp"
-      style="min-width: 200px"
-      emit-value
-      map-options
-    /> -->
     <q-btn flat round color="primary" icon="add" @click="onAdd()">
       <q-tooltip> เพิ่มข้อมูล </q-tooltip>
     </q-btn>
@@ -321,6 +309,7 @@ onMounted(async () => {
     class="custom-header-table"
     :visible-columns="visibleColumns"
     :separator="'cell'"
+    :rows-per-page-options="[10, 25, 50, 100]"
   >
     <template v-slot:header="props">
       <q-tr :props="props">
@@ -332,12 +321,7 @@ onMounted(async () => {
     </template>
     <template v-slot:body="props">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td
-          v-for="col in props.cols"
-          :key="col.id"
-          class="vertical-top"
-          
-        >
+        <q-td v-for="col in props.cols" :key="col.id" class="vertical-top">
           <div v-if="col.name == 'positions'">
             <div v-if="col.value.length !== 0">
               <div v-for="(pos, index) in col.value" :key="pos.id">