From b7869a5f399af5b18e05756702ec4953c3c7a360 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 29 Feb 2024 11:39:43 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20columns=20table=20=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/components/SalaryLists/TabMain.vue     |  2 +-
 .../components/SalaryLists/TableTypeOther.vue        | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index ac9b28f3f..3ec16d409 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -310,7 +310,7 @@ onMounted(async () => {
                   </div>
 
                   <div :class="`text-${item.color} text-bold`">
-                    {{ item.total.toLocaleString() }}
+                    {{ item.total ? item.total.toLocaleString() : 0 }}
                   </div>
                 </div>
               </q-card-section>
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
index 90c9637bb..04cab0cbb 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
@@ -73,10 +73,19 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "posType",
+    align: "left",
+    label: "ตำแหน่งประเภท",
+    sortable: false,
+    field: "posType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "posLevel",
     align: "left",
-    label: "ตำแหน่งประเภทระดับ",
+    label: "ระดับตำแหน่ง",
     sortable: false,
     field: "posLevel",
     headerStyle: "font-size: 14px",
@@ -115,6 +124,7 @@ const visibleColumns = ref<string[]>([
   "posNo",
   "fullName",
   "position",
+  "posType",
   "posLevel",
   "posExecutive",
   "amount",