From 38fc145e931c96354b9f5df862605a4167f36488 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 25 Nov 2025 09:43:44 +0700
Subject: [PATCH 1/2] fix(probation): probationPersonalList  status

---
 .../components/probation/DialogOrder.vue         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/05_placement/components/probation/DialogOrder.vue b/src/modules/05_placement/components/probation/DialogOrder.vue
index 6cc4f26bc..351cc3d92 100644
--- a/src/modules/05_placement/components/probation/DialogOrder.vue
+++ b/src/modules/05_placement/components/probation/DialogOrder.vue
@@ -96,7 +96,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "name",
     align: "left",
     label: "ชื่อ-นามสกุล",
-    sortable: true,
+    sortable: false,
     field: "name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -105,7 +105,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "position_line",
     align: "left",
     label: "ตำแหน่งในสายงาน",
-    sortable: true,
+    sortable: false,
     field: "position_line",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -114,7 +114,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "position_level",
     align: "left",
     label: "ระดับ",
-    sortable: true,
+    sortable: false,
     field: "position_level",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -123,7 +123,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "organization",
     align: "left",
     label: "สังกัด",
-    sortable: true,
+    sortable: false,
     field: "organization",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px ",
@@ -133,7 +133,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "probation_no",
     align: "center",
     label: "ครั้งที่ทดลองปฏิบัติหน้าที่ราชการ",
-    sortable: true,
+    sortable: false,
     field: "probation_no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -145,7 +145,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "order_number",
     align: "center",
     label: "เลขที่คําสั่งบรรจุแต่งตั้ง",
-    sortable: true,
+    sortable: false,
     field: "order_number",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -157,7 +157,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "probation_status",
     align: "left",
     label: "สถานะ",
-    sortable: true,
+    sortable: false,
     field: "probation_status",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -203,7 +203,7 @@ async function getList() {
     .get(
       config.API.probationPersonalList() +
         `?status=${
-          commandType.value ? (commandType.value == "C-PM-11" ? 2 : 3) : ""
+          commandType.value ? (commandType.value == "C-PM-11" ? 3 : 2) : ""
         }&page=${pagination.value.page}&pageSize=${
           pagination.value.rowsPerPage
         }&keyword=${filter.value.trim()}`

From 273487cb50926e0cd63fb9c2f927b0848e43ec0d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 25 Nov 2025 10:39:51 +0700
Subject: [PATCH 2/2] fix(salary): status isPunish

---
 .../13_salary/components/04_salaryLists/TableTypePending.vue  | 2 +-
 .../components/05_salaryListsEmployee/TableTypePending.vue    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
index b9c8dd646..dde372515 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@@ -529,7 +529,7 @@ function onClickViewInfo(type: string, id: string) {
           </div>
           <div v-else-if="col.name == 'discipline'">
             <q-btn
-              v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
+              v-if="checkPermission($route)?.attrIsGet && !props.row.isPunish"
               flat
               dense
               icon="info"
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
index 7ce838598..addcdb8e8 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@@ -432,7 +432,7 @@ async function updateCurrentPageAndfetchData() {
     bordered
     :paging="true"
     dense
-    :rows-per-page-options="[1,10, 25, 50, 100]"
+    :rows-per-page-options="[1, 10, 25, 50, 100]"
     :visible-columns="visibleColumns"
     v-model:pagination="pagination"
     @request="props.onRequest"
@@ -546,7 +546,7 @@ async function updateCurrentPageAndfetchData() {
 
           <div v-else-if="col.name == 'discipline'">
             <q-btn
-              v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
+              v-if="checkPermission($route)?.attrIsGet && !props.row.isPunish"
               flat
               dense
               icon="info"