diff --git a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue index 3c20623b4..634ae51d0 100644 --- a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue +++ b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue @@ -333,7 +333,7 @@ watch( map-options hide-bottom-space use-input - :readonly="!formData.year" + readonly v-model="projectName" @update:model-value="getProjectDetail(projectName)" @filter="filterOptionFn" diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue index 2a3f5ea6e..ec3865232 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue @@ -345,6 +345,7 @@ function emitPerson(data: PersonsArray[]) { persons: dataMapId, }) .then(async(res) => { + modalPopup.value = false success($q, "ส่งไปพักราชการสำเร็จ"); // router.push(`/discipline/investigatefacts`); await fetchDetailDisciplinary(); @@ -354,7 +355,6 @@ function emitPerson(data: PersonsArray[]) { }) .finally(() => { hideLoader(); - fetchDetailDisciplinary(); }); } diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue index e3096fa15..8e0b28f57 100644 --- a/src/modules/11_discipline/components/PopupSendToNext.vue +++ b/src/modules/11_discipline/components/PopupSendToNext.vue @@ -86,7 +86,6 @@ function onclickSend() { $q, async () => { emit("returnPerson", selected.value); - modal.value = false; }, `ยืนยันการ${props.title}`, `ต้องการยืนยันการ${props.title}หรือไม่` diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue index 0d6417d45..72776d1ac 100644 --- a/src/modules/14_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue @@ -8,7 +8,7 @@ import http from "@/plugins/http"; import { useCounterMixin } from "@/stores/mixin"; import { useKpiDataStore } from "@/modules/14_KPI/store"; -import type { ListCriteria } from "@/modules/14_KPI/interface/request/index"; +import type { ListCriteria } from "@/modules/14_KPI/interface/request/Index"; import DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue"; import Work from "@/modules/14_KPI/components/Tab/Topic/01_Indicator.vue"; @@ -226,7 +226,7 @@ onMounted(async () => { class="bg-white row col-12 text-dark q-pa-md" >