Merge branch 'nice_dev' into develop

src/modules/13_salary/views/salaryEmployeeLists.vue

@@ -210,19 +210,9 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
     .post(config.API.salaryListPeriodLatestEmp, body)
     .then(async (res) => {
       const data = res.data.result;
-      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;
-        isLoad.value = true;
-      }
+      data && store.fetchPeriodLatest(data, store.tabGroup);
+      periodLatest.value = data;
+      isLoad.value = true;
     })
     .catch((err) => {
       messageError($q, err);
@@ -301,8 +291,12 @@ function onScroll({ to, ref }: { to: number; ref: any }) {
   }
 }
 
-onMounted(async () => {
-  await getRound();
+function getQuota() {
+  fetchSalalyPeriod(agencyFilter.value, roundFilter.value.id, snapFilter.value);
+}
+
+onMounted(() => {
+  getRound();
 });
 </script>
 
@@ -394,7 +388,11 @@ onMounted(async () => {
     bordered
     class="row col-12 q-mt-xs"
   >
-    <ProcessStep />
+    <ProcessStep
+      :periodId="roundFilter.id"
+      :rootId="agencyFilter"
+      :get-data="getQuota"
+    />
   </q-card>
 
   <!-- </q-card> -->

src/modules/13_salary/views/salaryLists.vue

@@ -423,7 +423,12 @@ onMounted(async () => {
     <q-separator /> -->
   <q-card flat bordered>
     <div v-if="agencyFilter !== 'ALL'">
-      <TabGroup v-if="isLoad" :periodLatest="periodLatest" />
+      <TabGroup
+        v-if="isLoad"
+        :periodLatest="periodLatest"
+        :periodId="roundFilter.id"
+        :rootId="agencyFilter"
+      />
       <q-card v-else class="q-pa-sm">
         <div class="q-pa-sm">
           <q-banner inline-actions rounded class="bg-grey-1 text-center">