From fea2d8f972a1be3128822d3b2030f238f1989f60 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Thu, 26 Oct 2023 16:55:20 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20UI=20-?=
 =?UTF-8?q?=20=E0=B8=AA=E0=B8=B7=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B9=80=E0=B8=97=E0=B9=87=E0=B8=88?=
 =?UTF-8?q?=E0=B8=88=E0=B8=A3=E0=B8=B4=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_InvestigateFacts/MainPage.vue    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
index 8f038ca43..72eb8c80f 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
@@ -34,17 +34,13 @@ const resetFilter = () => {
 };
 
 const attrs = ref<any>(useAttrs());
-const paging = ref<boolean>(true);
 const pagination = ref({
   // sortBy: "desc",
   descending: false,
   page: 1,
   rowsPerPage: 10,
 });
-const paginationLabel = (start: string, end: string, total: string) => {
-  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
-  else return start + "-" + end + " ใน " + total;
-};
+
 
 const clickAdd = () => {
   router.push(`/discipline/investigatefacts/add`);
@@ -156,7 +152,6 @@ onMounted(async() => {
         class="custom-header-table"
         v-bind="attrs"
         :visible-columns="dataInvestigate.visibleColumns"
-        :pagination-label="paginationLabel"
         v-model:pagination="pagination"
       >
         <template v-slot:header="props">
@@ -176,9 +171,9 @@ onMounted(async() => {
         <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-if="col.name == 'no'">
+              <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}
-              </q-td>
+              </div>
               <div>
                 {{ col.value }}
               </div>
@@ -192,8 +187,8 @@ onMounted(async() => {
                   v-if="props.row.status === 'ยุติเรื่อง'"
                   for="#cancel"
                   dense
-                  outline
-                  color="deep-orange-7"
+                  unelevated 
+                  color="primary"
                   class="q-px-sm"
                   >ยกเลิกยุติเรื่อง</q-btn
                 >