diff --git a/src/modules/02_organization/components/DialogFormPosition.vue b/src/modules/02_organization/components/DialogFormPosition.vue index f0197b7fe..b2c0c9e52 100644 --- a/src/modules/02_organization/components/DialogFormPosition.vue +++ b/src/modules/02_organization/components/DialogFormPosition.vue @@ -841,7 +841,10 @@ async function emitSearch(keyword: string, typeSelect: string) { icon="mdi-dots-horizontal-circle-outline" round > - + - + { - success($q, "ลบข้อมูลสำเร็จ"); - searchInput(); + .then(async () => { + await searchInput(); + await success($q, "ลบข้อมูลสำเร็จ"); }) .catch((err) => { messageError($q, err); @@ -629,11 +633,14 @@ watch( - + - + {{ diff --git a/src/modules/16_positionEmployee/components/DialogMovePos.vue b/src/modules/16_positionEmployee/components/DialogMovePos.vue index f66c63d11..12b58e8fd 100644 --- a/src/modules/16_positionEmployee/components/DialogMovePos.vue +++ b/src/modules/16_positionEmployee/components/DialogMovePos.vue @@ -123,10 +123,10 @@ function onClickMovePos() { showLoader(); await http .post(config.API.orgPosMoveEmp, body) - .then(() => { - props.fetchDataTree?.(store.activeId); + .then(async () => { + await props.fetchDataTree?.(store.activeId); + await success($q, "ย้ายตำแหน่งสำเร็จ"); modal.value = false; - success($q, "ย้ายตำแหน่งสำเร็จ"); }) .catch((err) => { messageError($q, err); diff --git a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue index cf254922b..76e9525bd 100644 --- a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue +++ b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue @@ -4,7 +4,7 @@ import { useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; -/** +/** * importType */ import type { QTableProps } from "quasar"; @@ -279,10 +279,10 @@ function onSubmit() { showLoader(); http .post(config.API.orgProfileEmp, body) - .then(() => { - props.fetchDataTable?.(store.treeId, store.level, false); - props.getSummary(); - success($q, "บันทึกข้อมูลสำเร็จ"); + .then(async () => { + await props.fetchDataTable?.(store.treeId, store.level, false); + await props.getSummary(); + await success($q, "บันทึกข้อมูลสำเร็จ"); }) .catch((err) => { messageError($q, err); diff --git a/src/modules/16_positionEmployee/components/TreeTable.vue b/src/modules/16_positionEmployee/components/TreeTable.vue index 403a6581d..0820911df 100644 --- a/src/modules/16_positionEmployee/components/TreeTable.vue +++ b/src/modules/16_positionEmployee/components/TreeTable.vue @@ -193,10 +193,14 @@ function onClickDelete(id: string) { showLoader(); await http .delete(config.API.orgPosMasterByIdEmp(id)) - .then(() => { + .then(async () => { + await props.fetchDataTable?.( + reqMaster.value.id, + reqMaster.value.type, + false + ); + await getSummary(); success($q, "ลบข้อมูลสำเร็จ"); - props.fetchDataTable?.(reqMaster.value.id, reqMaster.value.type, false); - getSummary(); }) .catch((err) => { messageError($q, err); @@ -262,14 +266,14 @@ function removePerson(id: string) { showLoader(); await http .post(config.API.orgDeleteProfileEmp(id)) - .then(() => { - success($q, "ลบข้อมูลสำเร็จ"); - props.fetchDataTable?.( + .then(async () => { + await props.fetchDataTable?.( reqMaster.value.id, reqMaster.value.type, false ); - getSummary(); + await getSummary(); + await success($q, "ลบข้อมูลสำเร็จ"); }) .catch((err) => { messageError($q, err);