Merge branch 'develop' into devTee

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"
   >
     <div
-      v-for="(item, index) in itemsTabGroup"
+      v-for="(item, index) in store.roundCode === 'SPECIAL'
+        ? itemsTabGroup.slice(2, 3)
+        : itemsTabGroup.slice(0, 2)"
       :key="index"
       @click="changeTabGroup"
     >

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)) {
+      if (roundFilter.value.shortCode !== "SPECIAL") {
-        isLoad.value = false;
+        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(){
+function getQuota() {
-  fetchSalalyPeriod(
+  fetchSalalyPeriod(agencyFilter.value, roundFilter.value.id, snapFilter.value);
-      agencyFilter.value,
-      roundFilter.value.id,
-      snapFilter.value
-    );
 }
 onMounted(async () => {
   await getRound();
@@ -354,6 +357,7 @@ onMounted(async () => {
       </template>
     </q-select>
     <q-select
+      v-if="roundFilter ? roundFilter.shortCode !== 'SPECIAL' : false"
       class="q-ml-xs"
       v-model="snapFilter"
       label="รอบ"
@@ -428,7 +432,11 @@ onMounted(async () => {
     bordered
     class="row col-12 q-mt-xs"
   >
-    <ProcessStep :periodId="roundFilter.id" :rootId="agencyFilter" :get-data="getQuota"/>
+    <ProcessStep
+      :periodId="roundFilter.id"
+      :rootId="agencyFilter"
+      :get-data="getQuota"
+    />
   </q-card>
 
   <!-- </q-card> -->