diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue index 1c9328919..423d1caaf 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue +++ b/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 () => { diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue index 78adb7183..06779bb5b 100644 --- a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue @@ -453,7 +453,7 @@ watch( }}
- {{ `${props.row.orgShortName}${props.row.posMasterNo}` }} + {{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
{{ diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue index b69df9e81..e055cd0a3 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue @@ -464,7 +464,7 @@ watch( }}
- {{ `${props.row.orgShortName}${props.row.posMasterNo}` }} + {{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
{{ diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 3231a8487..c8270e24e 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -233,7 +233,7 @@ const activeBtn = () => { }; const isSsoToken = ref(false); -const interval = ref(null); +// const interval = ref(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); + // } }); /**