From 638154bebab0ef9fa8a904d90eee57d60406f7b5 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 14 Aug 2024 11:15:30 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/components/results/tableResults.vue  | 4 ++--
 src/modules/14_KPI/views/list.vue                       | 7 +++++--
 src/modules/15_development/components/ProjectDetail.vue | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index d8b6e9d1e..e7a427b39 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -84,7 +84,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "createdAt",
     headerStyle: "font-size: 14px",
     format(val, row) {
-      return date2Thai(val);
+      return date2Thai(val, false, true);
     },
     style: "font-size: 14px",
   },
@@ -380,7 +380,7 @@ onMounted(() => {
       :paging="true"
       :visible-columns="visibleColumns"
     >
-      <template v-slot:header-selection="scope"  v-if="tab === 'COMPLETE'">
+      <template v-slot:header-selection="scope" v-if="tab === 'COMPLETE'">
         <q-checkbox
           v-if="tab === 'COMPLETE' && checkPermission($route)?.attrIsUpdate"
           keep-color
diff --git a/src/modules/14_KPI/views/list.vue b/src/modules/14_KPI/views/list.vue
index 05e654429..04a42647e 100644
--- a/src/modules/14_KPI/views/list.vue
+++ b/src/modules/14_KPI/views/list.vue
@@ -53,7 +53,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "createdAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -364,7 +364,10 @@ onMounted(async () => {
                     <q-tooltip>รายละเอียด</q-tooltip>
                   </q-btn>
                   <q-btn
-                    v-if="checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsGet"
+                    v-if="
+                      checkPermission($route)?.attrIsUpdate &&
+                      checkPermission($route)?.attrIsGet
+                    "
                     @click="redirectViewDetail(props.row.id)"
                     round
                     color="edit"
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 5ec7ab03f..5c1231577 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -567,7 +567,7 @@ defineExpose({
         <div
           class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
         >
-          เวลาและสถานที่ดำเนินการ
+        ระยะเวลาและสถานที่ดำเนินการ
         </div>
         <q-separator />
         <q-card-section>