From 8ba9c1b1b1f40733fd7e54037aa92b7fa67e4724 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 4 Apr 2025 09:31:35 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D=3D>=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=B7=E0=B8=94=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=97=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=81=20SNAP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/04_salaryLists/TableTypeOther.vue  | 15 ++++++---------
 .../04_salaryLists/TableTypePending.vue           | 10 ++++------
 .../05_salaryListsEmployee/TableTypeOther.vue     | 10 ++++------
 .../05_salaryListsEmployee/TableTypePending.vue   | 12 +++++-------
 4 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
index e32f93751..78adb7183 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
@@ -60,7 +60,7 @@ const baseColumns = ref<QTableProps["columns"]>([
     name: "posNo",
     align: "left",
     label: "เลขที่ตำแหน่ง",
-   sortable: false,
+    sortable: false,
     field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -70,7 +70,7 @@ const baseColumns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ชื่อ-นามสกุล",
     field: "fullName",
-   sortable: false,
+    sortable: false,
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -78,7 +78,7 @@ const baseColumns = ref<QTableProps["columns"]>([
     name: "position",
     align: "left",
     label: "ตำแหน่งในสายงาน",
-   sortable: false,
+    sortable: false,
     field: "position",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -296,12 +296,9 @@ watch(
 </script>
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
+    <!-- && snapShot === 'SNAP1' -->
     <q-btn
-      v-if="
-        !store.isClosedRound &&
-        checkPermission($route)?.attrIsCreate &&
-        snapShot === 'SNAP1'
-      "
+      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
       flat
       round
       dense
@@ -376,10 +373,10 @@ watch(
     <template v-slot:body="props">
       <q-tr :props="props">
         <q-td>
+          <!-- snapShot === 'SNAP1' && -->
           <q-btn
             v-if="
               !store.isClosedRound &&
-              snapShot === 'SNAP1' &&
               (checkPermission($route)?.attrIsUpdate ||
                 checkPermission($route)?.attrIsDelete)
             "
diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
index f95ef55cb..a6c8a6e06 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@@ -327,12 +327,10 @@ function onClickViewInfo(type: string, id: string) {
 
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
+    <!-- &&
+    snapShot === 'SNAP1' -->
     <q-btn
-      v-if="
-        !store.isClosedRound &&
-        checkPermission($route)?.attrIsCreate &&
-        snapShot === 'SNAP1'
-      "
+      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
       flat
       round
       dense
@@ -394,10 +392,10 @@ function onClickViewInfo(type: string, id: string) {
     <template v-slot:body="props">
       <q-tr :props="props">
         <q-td>
+          <!-- snapShot === 'SNAP1' && -->
           <q-btn
             v-if="
               !store.isClosedRound &&
-              snapShot === 'SNAP1' &&
               (checkPermission($route)?.attrIsUpdate ||
                 checkPermission($route)?.attrIsDelete)
             "
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
index ea764988f..b69df9e81 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@@ -307,12 +307,10 @@ watch(
 </script>
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
+    <!-- &&
+    snapShot === 'SNAP1' -->
     <q-btn
-      v-if="
-        !store.isClosedRound &&
-        checkPermission($route)?.attrIsCreate &&
-        snapShot === 'SNAP1'
-      "
+      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
       flat
       round
       dense
@@ -387,10 +385,10 @@ watch(
     <template v-slot:body="props">
       <q-tr :props="props">
         <q-td>
+          <!-- snapShot === 'SNAP1' && -->
           <q-btn
             v-if="
               !store.isClosedRound &&
-              snapShot === 'SNAP1' &&
               (checkPermission($route)?.attrIsUpdate ||
                 checkPermission($route)?.attrIsDelete)
             "
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
index 9a41b1481..a7f41281d 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@@ -342,12 +342,10 @@ watch(
 
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
+    <!-- &&
+    snapShot === 'SNAP1' -->
     <q-btn
-      v-if="
-        !store.isClosedRound &&
-        checkPermission($route)?.attrIsCreate &&
-        snapShot === 'SNAP1'
-      "
+      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
       flat
       round
       dense
@@ -384,7 +382,7 @@ watch(
       : columns"
       option-value="name"
       style="min-width: 140px"
-      class=" q-ml-sm"
+      class="q-ml-sm"
     />
   </q-toolbar>
   <d-table
@@ -413,10 +411,10 @@ watch(
     <template v-slot:body="props">
       <q-tr :props="props">
         <q-td>
+          <!-- snapShot === 'SNAP1' && -->
           <q-btn
             v-if="
               !store.isClosedRound &&
-              snapShot === 'SNAP1' &&
               (checkPermission($route)?.attrIsUpdate ||
                 checkPermission($route)?.attrIsDelete)
             "

From 87d4d8bd6a6b8bfbfb9f24a74dc50ef7a6cd64f5 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 4 Apr 2025 10:02:19 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=9C=E0=B8=B9=E0=B9=89?=
 =?UTF-8?q?=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=88=E0=B8=B2=E0=B8=81=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registryPerson/components/TableView.vue       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index 1a0b4a933..f3e6b7ffd 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -2,7 +2,7 @@
 import { ref, watch, computed, onMounted } from "vue";
 
 import { checkPermission } from "@/utils/permissions";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import { useCounterMixin } from "@/stores/mixin";
 
@@ -18,6 +18,7 @@ import DialogHistory from "@/modules/04_registryPerson/components/DialogHistory.
 
 /* use*/
 const $q = useQuasar();
+const route = useRoute();
 const router = useRouter();
 const mixin = useCounterMixin();
 const { date2Thai } = mixin;
@@ -220,14 +221,21 @@ watch(
   }
 );
 
+const isPageRetired = ref<boolean>(false); // หน้าทะเบียนประวัติข้าราชการพ้นจากราชการ
 onMounted(() => {
   checkFilterDateAppoint();
+  if (
+    route.name === "registryRetireOfficer" ||
+    route.name === "registryRetireEmployee"
+  ) {
+    isPageRetired.value = true;
+  }
 });
 </script>
 
 <template>
   <div class="col-12 row q-pb-sm q-col-gutter-sm items-center">
-    <div class="row q-gutter-sm">
+    <div v-if="!isPageRetired" class="row q-gutter-sm">
       <q-btn
         v-if="
           empType === 'officer' ||