diff --git a/src/modules/05_placement/components/probation/MainAppoint.vue b/src/modules/05_placement/components/probation/MainAppoint.vue index 7cba67967..7c29cb8d6 100644 --- a/src/modules/05_placement/components/probation/MainAppoint.vue +++ b/src/modules/05_placement/components/probation/MainAppoint.vue @@ -32,8 +32,6 @@ const filterKeyword = ref(""); const filterKeywordOrder = ref(""); const modalOrder = ref(false); -const total = ref(0); -const totalList = ref(1); const pagination = ref({ sortBy: "createdAt", descending: true, @@ -82,11 +80,6 @@ const columns = ref([ }, ]); -function updatePagination(newPagination: any) { - pagination.value.page = 1; - pagination.value.rowsPerPage = newPagination.rowsPerPage; -} - /** ดึงข้อมูลหลัก */ async function getData() { showLoader(); @@ -96,18 +89,13 @@ async function getData() { const data = await res.data.result; rows.value = data; rowsData.value = data; - hideLoader(); }) .catch((e) => { messageError($q, e); - hideLoader(); }) - .finally(() => {}); -} - -/** reset ฟิลเตอร์ */ -function resetFilter() { - filterKeyword.value = ""; + .finally(() => { + hideLoader(); + }); } /** @@ -126,15 +114,16 @@ function onDelete(id: string) { showLoader(); http .delete(config.API.appointMain + `/${id}`) - .then(async (res) => { + .then(async () => { await getData(); success($q, "ลบข้อมูลสำเร็จ"); }) .catch((e) => { messageError($q, e); - hideLoader(); }) - .finally(() => {}); + .finally(() => { + hideLoader(); + }); }); } @@ -200,7 +189,6 @@ onMounted(async () => { { :options="columns" option-value="name" style="min-width: 140px" - class="col-xs-12 col-sm-3 col-md-2" /> diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index 648c0313d..bdd33b3a0 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -554,7 +554,6 @@ onMounted(async () => { { :options="columns" option-value="name" style="min-width: 140px" - class="col-xs-12 col-sm-3 col-md-2" />
@@ -701,7 +699,6 @@ onMounted(async () => { v-model="formProbation.keyword" ref="filterRef2" outlined - placeholder="ค้นหา" @keydown.enter.prevent="filterKeyword2Fn(formProbation.page)" > diff --git a/src/modules/05_placement/components/probation/MainTabs.vue b/src/modules/05_placement/components/probation/MainTabs.vue index a01807171..5356d8b04 100644 --- a/src/modules/05_placement/components/probation/MainTabs.vue +++ b/src/modules/05_placement/components/probation/MainTabs.vue @@ -5,8 +5,8 @@ import { usePlacementDataStore } from "@/modules/05_placement/store"; import type { ItemTabs } from "@/modules/05_placement/interface/request/Main"; -import AppointPage from "@/modules/05_placement/components/probation/MainAppoint.vue"; import ProbationPage from "@/modules/05_placement/components/probation/MainProbation.vue"; +import AppointPage from "@/modules/05_placement/components/probation/MainAppoint.vue"; const store = usePlacementDataStore(); @@ -38,9 +38,12 @@ const tabsManu = ref([ + + +