Merge branch 'develop' into devTee

src/modules/02_organizationalNew/components/DialogNewStructure.vue

@@ -29,6 +29,7 @@ const props = defineProps({
   fetchActive: {
     type: Function,
     require: true,
+    default: () => "fetchActive function",
   },
 });
 
@@ -84,7 +85,6 @@ function validateForm() {
   }
   if (hasError.every((result) => result === true)) {
     onSubmit();
-  } else {
   }
 }
 
@@ -102,7 +102,7 @@ function onSubmit() {
           store.draftId = res.data.result.id;
           store.statusView = "list";
           success($q, "บันทึกข้อมูลสำเร็จ");
-          props.fetchActive?.();
+          props.fetchActive();
         })
         .catch((err) => {
           messageError($q, err);

src/modules/02_organizationalNew/views/main.vue

@@ -29,8 +29,8 @@ const modalDateTime = ref<boolean>(false); //  ตั้งเวลาเผย
 
 /** สถานะ*/
 const isStatusData = ref<boolean>(false); // แสดงตั้งเวลาเผยแพร่
-const ishasActive = ref<boolean>(false); // สถานะการทำงาน
+// const ishasActive = ref<boolean>(false); // สถานะการทำงาน
-const ishasDraft = ref<boolean>(false); // สถานะแบบร่าง
+// const ishasDraft = ref<boolean>(false); // สถานะแบบร่าง
 /** List เพิ่มโครงสร้าง*/
 const itemStructure = ref<DataOption[]>([
   {
@@ -73,10 +73,10 @@ async function fetchOrganizationActive() {
           isStatusData.value = true;
           if (isStatusData.value) {
             if (data.activeName === null) {
-              ishasActive.value = true;
+              // ishasActive.value = true;
               store.typeOrganizational = "draft";
             } else if (data.draftName === null) {
-              ishasDraft.value = true;
+              // ishasDraft.value = true;
               store.typeOrganizational = "current";
             }
           }
@@ -143,6 +143,7 @@ function onClickHistory(id: string, name: string) {
 
 /** lifecycleHook */
 onMounted(async () => {
+  store.typeOrganizational = "current";
   await fetchOrganizationActive();
   await fetchHistory();
 });
@@ -225,6 +226,7 @@ onMounted(async () => {
                 :outline="store.typeOrganizational === 'current' ? false : true"
                 color="blue"
                 label="ปัจจุบัน"
+                :disable="store.activeId == '' || store.activeId == null"
                 @click="
                   (store.typeOrganizational = 'current'),
                     (labelHistory = 'ประวัติโครงสร้าง')
@@ -237,11 +239,11 @@ onMounted(async () => {
                 :outline="store.typeOrganizational === 'draft' ? false : true"
                 color="blue"
                 label="แบบร่าง"
+                :disable="store.draftId == '' || store.draftId == null"
                 @click="
                   (store.typeOrganizational = 'draft'),
                     (labelHistory = 'ประวัติโครงสร้าง')
                 "
-                :disable="ishasDraft"
               />
               <q-btn-dropdown
                 v-if="itemHistory.length !== 0"

src/modules/13_salary/components/SalaryLists/TabMain.vue

@@ -185,7 +185,7 @@ const maxPage = ref<number>(1);
  * @param id กลุ่ม
  */
 function fetchDataQuota(id: string) {
-  showLoader();
+  // showLoader();
   http
     .get(config.API.salaryListPeriodQuota(id))
     .then((res) => {
@@ -205,10 +205,10 @@ function fetchDataQuota(id: string) {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
+  // .finally(() => {
+  //   hideLoader();
+  // });
 }
 
 /**

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

@@ -77,9 +77,9 @@ function getRound() {
 
       store.roundMainCode = roundFilter.value.shortCode;
 
-      getSnap(roundFilter.value.shortCode);
+      await getSnap(roundFilter.value.shortCode);
-      getAgency(roundFilter.value.revisionId);
+      await getAgency(roundFilter.value.revisionId);
-      getAgencyPosition(roundFilter.value.revisionId);
+      await getAgencyPosition(roundFilter.value.revisionId);
 
       //   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
       //     await fetchSalalyPeriod(
@@ -149,7 +149,7 @@ async function getAgency(id: string) {
           id: x.id,
           name: x.orgRootName,
         }));
-        agencyFilter.value = store.rootId;
+        // agencyFilter.value = store.rootId;
       })
       .catch((err) => {
         messageError($q, err);
@@ -165,11 +165,12 @@ async function getAgencyPosition(id: string) {
     await http
       .get(config.API.keycloakPositionByid(id))
       .then(async (res) => {
-        const data = res.data.result;
+        const data = await res.data.result;
 
         const position = agencyOptions.value?.find(
           (e: DataOption) => e.id === data.rootId
         );
+
         agencyFilter.value = position ? position.id : "";
 
         if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
@@ -217,7 +218,9 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
       messageError($q, err);
     })
     .finally(() => {
-      hideLoader();
+      setTimeout(() => {
+        hideLoader();
+      }, 800);
     });
 }