diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index ef3bc6a27..b45d39e88 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -49,6 +49,10 @@ const itemsTabGroup = ref([
lable: "กลุ่ม 2",
name: "group2",
},
+ {
+ lable: "รายชื่อรอบพิเศษ",
+ name: "group1",
+ },
]);
/** itemsTab ขั้น*/
@@ -341,7 +345,9 @@ onMounted(() => {
align="left"
>
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index d2e2282d4..26fdc63ed 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -219,8 +219,14 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
.post(config.API.salaryListPeriodLatest, body)
.then(async (res) => {
const data = res.data.result;
- if (Object.values(data).includes(null)) {
- isLoad.value = false;
+ if (roundFilter.value.shortCode !== "SPECIAL") {
+ if (Object.values(data).includes(null)) {
+ isLoad.value = false;
+ } else {
+ data && store.fetchPeriodLatest(data, store.tabGroup);
+ periodLatest.value = data;
+ isLoad.value = true;
+ }
} else {
data && store.fetchPeriodLatest(data, store.tabGroup);
periodLatest.value = data;
@@ -241,8 +247,9 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
async function onChangeRound() {
// เก็บสถานะการปิดรอบในตัวแปร isClosedRound เพื่อใช้ในการเช็ค
store.isClosedRound = roundFilter.value.isClose;
- console.log(roundFilter.value);
-
+ if (roundFilter.value.shortCode === "SPECIAL") {
+ store.tabGroup = "group1";
+ }
await getSnap(roundFilter.value.shortCode);
await getAgency(roundFilter.value.revisionId);
await getAgencyPosition(roundFilter.value.revisionId);
@@ -311,12 +318,8 @@ function onScroll({ to, ref }: { to: number; ref: any }) {
}
}
-function getQuota(){
- fetchSalalyPeriod(
- agencyFilter.value,
- roundFilter.value.id,
- snapFilter.value
- );
+function getQuota() {
+ fetchSalalyPeriod(agencyFilter.value, roundFilter.value.id, snapFilter.value);
}
onMounted(async () => {
await getRound();
@@ -354,6 +357,7 @@ onMounted(async () => {
{
bordered
class="row col-12 q-mt-xs"
>
-
+