diff --git a/src/modules/16_positionEmployee/components/TableMain.vue b/src/modules/16_positionEmployee/components/TableMain.vue index c8298c04a..e01f1cdcd 100644 --- a/src/modules/16_positionEmployee/components/TableMain.vue +++ b/src/modules/16_positionEmployee/components/TableMain.vue @@ -5,6 +5,7 @@ import { useQuasar } from "quasar"; import { usePositionEmp } from "@/modules/16_positionEmployee/store/organizational"; import { useCounterMixin } from "@/stores/mixin"; import { checkPermission } from "@/utils/permissions"; +import { updateCurrentPage } from "@/utils/function"; import genreport from "@/plugins/genreportxlsx"; import config from "@/app.config"; import http from "@/plugins/http"; @@ -203,12 +204,20 @@ function onClickDelete(id: string) { await http .delete(config.API.orgPosMasterByIdEmp(id)) .then(async () => { - await props.fetchDataTable?.( - reqMaster.value.id, - reqMaster.value.type, - false + reqMaster.value.page = await updateCurrentPage( + reqMaster.value.page, + totalPage.value, + posMaster.value.length ); - await getSummary(); + + await Promise.all([ + props.fetchDataTable?.( + reqMaster.value.id, + reqMaster.value.type, + false + ), + getSummary(), + ]); success($q, "ลบข้อมูลสำเร็จ"); }) .catch((err) => { diff --git a/src/modules/20_positionTemp/components/TableMain.vue b/src/modules/20_positionTemp/components/TableMain.vue index a58b969fe..c2b47f56e 100644 --- a/src/modules/20_positionTemp/components/TableMain.vue +++ b/src/modules/20_positionTemp/components/TableMain.vue @@ -5,6 +5,7 @@ import { useQuasar } from "quasar"; import { usePositionEmp } from "@/modules/20_positionTemp/store/organizational"; import { useCounterMixin } from "@/stores/mixin"; import { checkPermission } from "@/utils/permissions"; +import { updateCurrentPage } from "@/utils/function"; import genreport from "@/plugins/genreportxlsx"; import config from "@/app.config"; import http from "@/plugins/http"; @@ -204,12 +205,20 @@ function onClickDelete(id: string) { await http .delete(config.API.orgPosMasterByIdEmpTemp(id)) .then(async () => { - await props.fetchDataTable?.( - reqMaster.value.id, - reqMaster.value.type, - false + reqMaster.value.page = await updateCurrentPage( + reqMaster.value.page, + totalPage.value, + posMaster.value.length ); - await getSummary(); + await Promise.all([ + props.fetchDataTable?.( + reqMaster.value.id, + reqMaster.value.type, + false + ), + getSummary(), + ]); + success($q, "ลบข้อมูลสำเร็จ"); }) .catch((err) => {