From 9c57d155d43ddb51c9f09c5762dc1c7476e92f76 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 22 Feb 2024 11:45:47 +0700
Subject: [PATCH] =?UTF-8?q?-=20=E0=B8=9B=E0=B8=B4=E0=B8=94=20sort=20?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=20-=20?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20option=20=E0=B8=97?=
 =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organizationalNew/components/TreeTable.vue      | 10 ++++++----
 .../components/probation/MainProbation.vue             |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
index b8d270194..005c7af5a 100644
--- a/src/modules/02_organizationalNew/components/TreeTable.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -129,7 +129,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "posMasterNo",
     align: "left",
     label: "เลขที่ตำแหน่ง",
-    sortable: true,
+    sortable: false,
     field: "posMasterNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -139,6 +139,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ตำแหน่งในสายงาน",
     field: "positionName",
+    sortable: false,
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -146,7 +147,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "posTypeName",
     align: "left",
     label: "ประเภทตำแหน่ง",
-    sortable: true,
+    sortable: false,
     field: "posTypeName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -155,7 +156,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "posLevelName",
     align: "left",
     label: "ระดับตำแหน่ง",
-    sortable: true,
+    sortable: false,
     field: "posLevelName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -164,12 +165,13 @@ const columns = ref<QTableProps["columns"]>([
     name: "positionIsSelected",
     align: "left",
     label: "คนครอง",
-    sortable: true,
+    sortable: false,
     field: "positionIsSelected",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
 ]);
+
 const columnsExpand = ref<QTableProps["columns"]>([
   {
     name: "no",
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 2cb48755f..6fe63e94b 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -34,7 +34,7 @@ const probationlist = ref<any>([]);
 const filterKeyword = ref<string>("");
 const fillterStatus = ref<any>([]);
 const filterKeyword2 = ref<string>("");
-const Opfillter2 = ref<any[]>([]);
+const Opfillter2 = ref<OpfillterType[]>([{ id: 0, value: "ทั้งหมด" }]);
 
 const storeFn = useTransferDataStore();
 const mixin = useCounterMixin();