From 6cfee6bab68528d847fed166a266cabbca3f63ba Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 7 Mar 2024 12:05:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B9=83?=
 =?UTF-8?q?=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B9=80=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/components/SalaryLists/TabMain.vue       |  7 ++-----
 .../components/SalaryLists/TableTypePending.vue        | 10 +++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index 9125ded00..42028eba8 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -314,14 +314,11 @@ onMounted(async () => {
     <q-btn
       dense
       flat
-      round
       icon="info"
-      color="info"
       class="q-mr-sm"
+      label="หลักเกณฑ์การพิจารณาเลื่อนขั้นเงินข้าราชการ"
       @click="() => (modalDialogInfoCriteria = true)"
-    >
-      <q-tooltip>หลักเกณฑ์การพิจารณาเลื่อนขั้นเงินข้าราชการ</q-tooltip>
-    </q-btn>
+    />
   </q-tabs>
   <q-separator />
   <q-tab-panels v-model="store.tabGroup" animated class="bg-grey-1">
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
index 1509a9193..392b51079 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
@@ -82,7 +82,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "result",
     align: "center",
-    label: "ผลการประเมินผลการปฏิบัติราชการ",
+    label: "ผลการประเมินฯ",
     sortable: false,
     field: "result",
     headerStyle: "font-size: 14px",
@@ -100,7 +100,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "punish",
     align: "center",
-    label: "การลงโทษทางวินัย",
+    label: "ไม่ถูกลงโทษทางวินัย",
     sortable: false,
     field: "punish",
     headerStyle: "font-size: 14px",
@@ -109,7 +109,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "retired",
     align: "center",
-    label: "พักราชการ",
+    label: "ไม่ถูกพักราชการ",
     sortable: false,
     field: "retired",
     headerStyle: "font-size: 14px",
@@ -118,7 +118,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "retired2",
     align: "center",
-    label: "ขาดราชการ",
+    label: "ไม่ขาดราชการ",
     sortable: false,
     field: "retired2",
     headerStyle: "font-size: 14px",
@@ -127,7 +127,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "leave",
     align: "center",
-    label: "วันลา",
+    label: "วันลาไม่เกิน",
     sortable: false,
     field: "leave",
     headerStyle: "font-size: 14px",