Merge branch 'develop' into devTee

src/modules/12_evaluatePersonal/components/Detail/step/step8.vue

@@ -193,7 +193,7 @@ async function confirmApprove() {
               data
             )
             .then(async () => {
-              updateEvaluationResult();
+              await updateEvaluationResult();
               await nextStep();
               modalConfirm.value = false;
             })
@@ -328,18 +328,18 @@ async function fetchDataSigner() {
     });
 }
 
-function updateEvaluationResult() {
+async function updateEvaluationResult() {
   http
     .put(config.API.updateEvaluationResult(id.value), {
       result: checkBox.value,
     })
-    .then((res) => {
-      hideLoader();
-    })
+    .then(() => {})
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 onMounted(async () => {

src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue

@@ -453,7 +453,7 @@ watch(
             }}
           </div>
           <div v-else-if="col.name === 'posNo'">
-            {{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
+            {{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
           </div>
           <div v-else-if="col.name === 'fullName'">
             {{

src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue

@@ -464,7 +464,7 @@ watch(
             }}
           </div>
           <div v-else-if="col.name === 'posNo'">
-            {{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
+            {{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
           </div>
           <div v-else-if="col.name === 'fullName'">
             {{

src/views/MainLayout.vue

@@ -233,7 +233,7 @@ const activeBtn = () => {
 };
 
 const isSsoToken = ref<boolean>(false);
-const interval = ref<any>(null);
+// const interval = ref<any>(null);
 /**
  * เมื่อเริ่มต้นโปรแกรมให้ฟัง event resize และ function myEventHandler
  * set function myEventHandler เพราะ state ยังไม่เซ็ท , state เซ็ทเมื่อ หน้าจอเริ่ม ขยับหน้าจอ
@@ -259,9 +259,9 @@ onMounted(async () => {
 
   fetchmsgNoread();
   // fetch noread noti every 15 seconds
-  interval.value = setInterval(() => {
-    fetchmsgNoread();
-  }, 15000);
+  // interval.value = setInterval(() => {
+  //   fetchmsgNoread();
+  // }, 15000);
 
   myEventHandler(null, false);
   window.addEventListener("resize", (e: any) => {
@@ -276,9 +276,9 @@ onUnmounted(() => {
   window.removeEventListener("resize", (e: any) => {
     myEventHandler(e, true);
   });
-  if (interval.value) {
-    clearInterval(interval.value);
-  }
+  // if (interval.value) {
+  //   clearInterval(interval.value);
+  // }
 });
 
 /**