diff --git a/src/modules/10_registry/01_Information/01_Information.vue b/src/modules/10_registry/01_Information/01_Information.vue index b4063f7..83a33f9 100644 --- a/src/modules/10_registry/01_Information/01_Information.vue +++ b/src/modules/10_registry/01_Information/01_Information.vue @@ -4,19 +4,19 @@ import { useQuasar, type QTableColumn, type QTableProps } from "quasar"; import { ref, reactive, onMounted } from "vue"; import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry"; -//history dialog -import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue"; - import http from "@/plugins/http"; import config from "@/app.config"; -const store = useRegistryInFormationStore(); -const rowsHistory = ref([]); +import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue"; + const $q = useQuasar(); +const store = useRegistryInFormationStore(); const mixin = useCounterMixin(); const { showLoader, hideLoader, messageError, date2Thai } = mixin; +const rowsHistory = ref([]); const modalHistory = ref(false); + /** ตัวแปรข้อมูล */ const formDataInformation = reactive({ citizenId: "", //เลขประจำตัวประชาชน @@ -26,7 +26,6 @@ const formDataInformation = reactive({ birthDate: "", //วันเกิด gender: "", //เพศ relationship: "", //สถานภาพ - nationality: "", //สัญชาติ ethnicity: "", //เชื้อชาติ religion: "", //ศาสนา @@ -34,6 +33,24 @@ const formDataInformation = reactive({ phone: "", //เบอร์โทร }); +const visibleColumnsHistory = ref([ + "citizenId", + "prefix", + "rank", + "firstName", + "lastName", + "birthDate", + "gender", + "relationship", + "bloodGroup", + "nationality", + "ethnicity", + "religion", + "phone", + "createdFullName", + "createdAt", +]); + const columnsHistory = ref([ { name: "citizenId", @@ -204,24 +221,6 @@ const columnsHistory = ref([ }, ]); -const visibleColumnsHistory = ref([ - "citizenId", - "prefix", - "rank", - "firstName", - "lastName", - "birthDate", - "gender", - "relationship", - "bloodGroup", - "nationality", - "ethnicity", - "religion", - "phone", - "createdFullName", - "createdAt", -]); - function onHistory() { modalHistory.value = true; } diff --git a/src/modules/10_registry/01_Information/02_ChangeName.vue b/src/modules/10_registry/01_Information/02_ChangeName.vue index 71fe2b1..024d280 100644 --- a/src/modules/10_registry/01_Information/02_ChangeName.vue +++ b/src/modules/10_registry/01_Information/02_ChangeName.vue @@ -1,23 +1,24 @@