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)
             "