From f1e12f8b8d7a711f4d503cab092defbdc6c4f955 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 6 Jan 2026 10:23:56 +0700
Subject: [PATCH] fix(organization):show draft or current

---
 .../components/DialogHistoryPos.vue              | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index 2acfd5cd7..4b9651bcf 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -154,7 +154,7 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     sortable: false,
     format(val) {
-      return date2Thai(val);
+      return date2Thai(val, true, true);
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -265,15 +265,17 @@ watch(
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 <div v-if="col.name == 'no'">
                   {{
-                    store.typeOrganizational === "current" ||
-                    (store.typeOrganizational === "draft" &&
-                      historyType === "OWNER_HISTORY")
+                    historyType === "OWNER_HISTORY"
                       ? props.rowIndex + 1
-                      : props.rowIndex + 1 == 1
+                      : props.rowIndex + 1 == 1 &&
+                        (store.typeOrganizational === "draft" ||
+                          store.typeOrganizational === "old")
                       ? "1 (แบบร่าง)"
-                      : props.rowIndex + 1 == 2
+                      : props.rowIndex + 1 == 2 &&
+                        (store.typeOrganizational === "draft" ||
+                          store.typeOrganizational === "old")
                       ? "2 (ปัจจุบัน)"
-                      : props.rowIndex + 1
+                      : props.rowIndex + 1 
                   }}
                 </div>