From c78cc9b0bdacfe0cc55065423347a5ae147bd7f1 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 27 Nov 2023 12:16:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=AB=E0=B8=A1=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B9=80=E0=B8=AB=E0=B8=95=E0=B8=B8=E0=B9=83=E0=B8=99?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=20=E0=B8=A5=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableHistory.vue |  9 +++++----
 src/components/ToolBar.vue      |  2 +-
 src/views/HistoryView.vue       |  4 +++-
 src/views/HomeView.vue          | 12 ++++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/TableHistory.vue b/src/components/TableHistory.vue
index e46d8bb..fde3e66 100644
--- a/src/components/TableHistory.vue
+++ b/src/components/TableHistory.vue
@@ -17,10 +17,10 @@ const props = defineProps({
     type: Boolean,
     defualt: false,
   },
-  selected: {
-    type: Array,
-    defualt: [],
-  },
+  // selected: {
+  //   type: Array,
+  //   defualt: [],
+  // },
   pageSize: {
     type: Number,
     defualt: 10,
@@ -281,6 +281,7 @@ const checkRequestEdit = (checkInStatus: string, checkOutStatus: string) => {
     v-model:selected="selected"
     :virtual-scroll-sticky-size-start="48"
     :style="$q.screen.gt.xs ? 'max-height: 64vh' : ''"
+    :rows-per-page-options="[10, 25, 50, 100]"
     :grid="$q.screen.gt.xs ? false : true"
     :pagination="initialPagination"
     @update:pagination="updatePagination"
diff --git a/src/components/ToolBar.vue b/src/components/ToolBar.vue
index 78e1dcb..1b77c86 100644
--- a/src/components/ToolBar.vue
+++ b/src/components/ToolBar.vue
@@ -35,7 +35,7 @@ function onClickClose() {
       <datepicker
         menu-class-name="modalfix"
         v-model="filterYear"
-        class="col-2"
+        class="col-xs-5 col-sm-3 col-md-2"
         :locale="'th'"
         autoApply
         year-picker
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index 3a92dd6..1bbee5b 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -52,7 +52,9 @@ async function fetchlistHistory(loading = true) {
   await http
     .get(
       config.API.history() +
-        `?year=${year.value}&page=${page.value}&pageSize=${pageSize.value}&keyword=${filter.value}`
+        `?year=${year.value}&page=${page.value}&pageSize=${
+          pageSize.value
+        }&keyword=${filter.value ? filter.value : ''}`
     )
     .then(async (res) => {
       const data = res.data.result.data
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 1d3c81a..f51a920 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -489,6 +489,18 @@ onMounted(async () => {
                   </div>
                 </q-card>
 
+                <q-card bordered flat class="q-pa-sm">
+                  <div class="col-12">
+                    <q-input
+                      outlined
+                      v-model="remark"
+                      label="หมายเหตุ"
+                      lazy-rules
+                      dense
+                    />
+                  </div>
+                </q-card>
+
                 <div class="col-12 text-right">
                   <q-separator />
                   <div class="col-12 q-pa-md">