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(false); const isOfficer = ref(false); const isStaff = ref(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(false); const isOfficer = ref(false); const isStaff = ref(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}`; }); /**