From aa9b04772b356f47c7e533070e7460b1355dee83 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 4 Nov 2024 14:52:02 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=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/views/04_salaryLists.vue        | 28 ++++++++++++++-----
 .../views/05_salaryListsEmployee.vue          | 20 ++++++++-----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index 1937e7652..c1277a66e 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -56,13 +56,27 @@ const modalCommand = ref<boolean>(false);
 const isOfficer = ref<boolean>(false);
 const isStaff = ref<boolean>(false);
 const titleCommand = computed(() => {
-  return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
-    roundFilter.value?.shortCode === "SPECIAL"
-      ? roundFilter.value?.name
-        ? roundFilter.value?.name
-        : ""
-      : `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
-  } `;
+  let txt = "";
+  switch (roundFilter.value?.shortCode) {
+    case "OCT":
+      txt = "1 ตุลาคม";
+      break;
+    case "APR":
+      txt = "1 เมษายน";
+      break;
+    case "SPECIAL":
+      txt = " รอบพิเศษ";
+      break;
+  }
+  return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${txt}`;
+
+  // return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
+  //   roundFilter.value?.shortCode === "SPECIAL"
+  //     ? roundFilter.value?.name
+  //       ? roundFilter.value?.name
+  //       : ""
+  //     : `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
+  // } `;
 });
 
 /**
diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index e367af9b5..8a5ba899a 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -58,13 +58,19 @@ const modalCommand = ref<boolean>(false);
 const isOfficer = ref<boolean>(false);
 const isStaff = ref<boolean>(false);
 const titleCommand = computed(() => {
-  return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
-    roundFilter.value?.shortCode === "SPECIAL"
-      ? roundFilter.value?.name
-        ? roundFilter.value?.name
-        : ""
-      : `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
-  } `;
+  let txt = "";
+  switch (roundFilter.value?.shortCode) {
+    case "OCT":
+      txt = " 1 ตุลาคม";
+      break;
+    case "APR":
+      txt = " 1 เมษายน";
+      break;
+    case "SPECIAL":
+      txt = " รอบพิเศษ";
+      break;
+  }
+  return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นค่าจ้าง${txt}`;
 });
 
 /**