diff --git a/src/modules/04_registry/components/Assessment.vue b/src/modules/04_registry/components/Assessment.vue index dbf833fff..37902f56a 100644 --- a/src/modules/04_registry/components/Assessment.vue +++ b/src/modules/04_registry/components/Assessment.vue @@ -626,7 +626,7 @@ const fetchData = async () => { messageError($q, e); }) .finally(() => { - hideLoader(); + store.isLoad++ }); } }; diff --git a/src/modules/04_registry/components/Coin.vue b/src/modules/04_registry/components/Coin.vue index 7d024d234..0d995b9de 100644 --- a/src/modules/04_registry/components/Coin.vue +++ b/src/modules/04_registry/components/Coin.vue @@ -45,8 +45,8 @@ icon="mdi-history" @click="clickHistory(props.row)" > - ประวัติแก้ไขประกาศเกียรติคุณ - + ประวัติแก้ไขประกาศเกียรติคุณ + @@ -67,9 +67,7 @@ /> -
+
{ messageError($q, e); }) .finally(() => { - hideLoader(); + store.isLoad++; }); } }; diff --git a/src/modules/04_registry/components/Discipline.vue b/src/modules/04_registry/components/Discipline.vue index f84e43479..b6611bebe 100644 --- a/src/modules/04_registry/components/Discipline.vue +++ b/src/modules/04_registry/components/Discipline.vue @@ -617,7 +617,7 @@ const fetchData = async () => { messageError($q, e); }) .finally(() => { - hideLoader(); + store.isLoad++ }); } }; diff --git a/src/modules/04_registry/components/Document.vue b/src/modules/04_registry/components/Document.vue index 3b6c40856..8c8d17f16 100644 --- a/src/modules/04_registry/components/Document.vue +++ b/src/modules/04_registry/components/Document.vue @@ -31,9 +31,9 @@ color="blue" icon="mdi-download-outline" @click="downloadData(file.file)" - > - ดาวน์โหลดเอกสารหลักฐาน - + > + ดาวน์โหลดเอกสารหลักฐาน + - ลบเอกสารหลักฐาน - + ลบเอกสารหลักฐาน +
@@ -145,6 +145,9 @@ import { useRoute } from "vue-router"; import HeaderTop from "@/modules/04_registry/components/Information/top.vue"; import http from "@/plugins/http"; import config from "@/app.config"; +import { useProfileDataStore } from "@/modules/04_registry/store"; + +const profileStore = useProfileDataStore(); const props = defineProps({ statusEdit: { @@ -189,7 +192,7 @@ const getData = async () => { messageError($q, e); }) .finally(() => { - hideLoader(); + profileStore.isLoad++; }); } }; diff --git a/src/modules/04_registry/components/Education.vue b/src/modules/04_registry/components/Education.vue index f9cd9f921..44d19632c 100644 --- a/src/modules/04_registry/components/Education.vue +++ b/src/modules/04_registry/components/Education.vue @@ -57,8 +57,8 @@ icon="mdi-history" @click="clickHistory(props.row)" > - ประวัติแก้ไขประวัติการศึกษา - + ประวัติแก้ไขประวัติการศึกษา + @@ -72,9 +72,7 @@ -
+
{ messageError($q, e); }) .finally(() => { - hideLoader(); + store.isLoad++; }); }; @@ -1087,7 +1085,8 @@ const fetchPositionPath = async () => { messageError($q, e); }) .finally(() => { - hideLoader(); + store.isLoad++; + // hideLoader(); }); }; @@ -1152,7 +1151,8 @@ const fetchData = async () => { messageError($q, e); }) .finally(() => { - hideLoader(); + // hideLoader(); + store.isLoad++; }); } }; diff --git a/src/modules/04_registry/components/Information/Address.vue b/src/modules/04_registry/components/Information/Address.vue index 52e5bd0db..4ac6c6611 100644 --- a/src/modules/04_registry/components/Information/Address.vue +++ b/src/modules/04_registry/components/Information/Address.vue @@ -306,6 +306,9 @@ import HistoryTable from "@/components/TableHistory.vue"; import { useRoute } from "vue-router"; import type { AddressOps } from "@/modules/04_registry/interface/index/Main"; import type { QTableProps } from "quasar"; +import { useProfileDataStore } from "@/modules/04_registry/store"; + +const profileStore = useProfileDataStore(); const props = defineProps({ statusEdit: { @@ -631,7 +634,7 @@ const getNewData = async () => { const fetchData = async () => { if (route.params.id) { - showLoader(); + // showLoader(); await http .get(config.API.profileAdrsId(route.params.id.toString())) .then((res) => { @@ -671,7 +674,8 @@ const fetchData = async () => { messageError($q, e); }) .finally(() => { - hideLoader(); + // hideLoader(); + profileStore.isLoad++; }); } }; @@ -835,7 +839,7 @@ const fetchProvince = async () => { messageError($q, e); }) .finally(() => { - hideLoader(); + profileStore.isLoad++; }); }; @@ -888,9 +892,9 @@ const fetchDistrict = async (id: string | null, position: string) => { messageError($q, e); }) .finally(() => { - hideLoader(); + profileStore.isLoad++; }); - } + } else profileStore.isLoad++; }; const fetchSubDistrict = async (id: string | null, position: string) => { @@ -942,9 +946,9 @@ const fetchSubDistrict = async (id: string | null, position: string) => { messageError($q, e); }) .finally(() => { - hideLoader(); + profileStore.isLoad++; }); - } + } else profileStore.isLoad++; }; const changeBtn = async () => { diff --git a/src/modules/04_registry/components/Information/Certicate.vue b/src/modules/04_registry/components/Information/Certicate.vue index 74ac8f943..e935500f4 100644 --- a/src/modules/04_registry/components/Information/Certicate.vue +++ b/src/modules/04_registry/components/Information/Certicate.vue @@ -69,9 +69,7 @@ /> -
+
{ messageError($q, e); }) .finally(() => { - hideLoader(); + // hideLoader(); + store.isLoad++; }); } }; diff --git a/src/modules/04_registry/components/Information/Family.vue b/src/modules/04_registry/components/Information/Family.vue index 0eb990250..2caf2f64a 100644 --- a/src/modules/04_registry/components/Information/Family.vue +++ b/src/modules/04_registry/components/Information/Family.vue @@ -1284,17 +1284,17 @@
+ :class="getClass(false)" + hide-bottom-space + :outlined="false" + dense + lazy-rules + :readonly="true" + :borderless="true" + v-model="items.childrenFirstName" + :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]" + :label="`${'ชื่อ'}`" + />
{ messageError($q, e); }) .finally(() => { - hideLoader(); + // hideLoader(); + profileStore.isLoad++; }); }; @@ -1747,7 +1751,8 @@ const fetchData = async () => { messageError($q, e); }) .finally(async () => { - hideLoader(); + // hideLoader(); + profileStore.isLoad++ }); } }; diff --git a/src/modules/04_registry/components/Information/Government.vue b/src/modules/04_registry/components/Information/Government.vue index ee97886aa..3d9b7f808 100644 --- a/src/modules/04_registry/components/Information/Government.vue +++ b/src/modules/04_registry/components/Information/Government.vue @@ -619,7 +619,7 @@ watch(retireText, async () => { }); const fetchData = async () => { - showLoader(); + // showLoader(); await http .get(config.API.profileGovId(route.params.id.toString())) .then((res) => { @@ -645,7 +645,8 @@ const fetchData = async () => { messageError($q, e); }) .finally(async () => { - hideLoader(); + // hideLoader(); + profileStore.isLoad++; }); }; diff --git a/src/modules/04_registry/components/Information/Information.vue b/src/modules/04_registry/components/Information/Information.vue index 631f7c885..a0390c5c1 100644 --- a/src/modules/04_registry/components/Information/Information.vue +++ b/src/modules/04_registry/components/Information/Information.vue @@ -1,41 +1,106 @@