hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1536 from Frappet/fix/calculateAge
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m41s
Details

Browse source 
fix:function_calculateAge
This commit is contained in:
Warunee Tamkoo 2026-01-22 10:38:24 +07:00 • committed by GitHub
commit b7c33cf25c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 41 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/04_registryPerson/components/Dialog/01_Information.vue
View file

@ -5,7 +5,7 @@ import { useQuasar } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
import { useCounterMixin } from "@/stores/mixin";
import { useProfileDataStore } from "@/modules/04_registryPerson/stores/profile";
import { calculateAge } from "@/utils/function";
import type { RequestObject } from "@/modules/04_registryPerson/interface/request/Profile";
@ -17,8 +17,6 @@ const age = defineModel<string | null>("age", {
});
const $q = useQuasar();
const storeProfile = useProfileDataStore();
const { filterSelector, calculateAge } = storeProfile;
const { date2Thai, messageError, dialogMessageNotify } = useCounterMixin();
const props = defineProps({

7
src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue
View file

@ -9,14 +9,11 @@ import { useCounterMixin } from "@/stores/mixin";
import { useLinkageStore } from "@/stores/linkage";
import { useDataLinkCenter } from "@/modules/04_registryPerson/stores/LinkCenter";
import { useRequestEditStore } from "@/modules/04_registryPerson/stores/RequestEdit";
import { calculateAge } from "@/utils/function";
import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
import type { RequestregistrationAddressObject } from "@/modules/04_registryPerson/interface/request/Address";
import type { RequestObject } from "@/modules/04_registryPerson/interface/request/Profile";
import type {
FormPerson,
FormChildren,
} from "@/modules/04_registryPerson/interface/index/family";
import Header from "@/components/DialogHeader.vue"; //ส่วนหัว popup
import InformationPage from "@/modules/04_registryPerson/components/Dialog/01_Information.vue"; //form ข้อมูลส่วนตัว
@ -268,7 +265,7 @@ async function amiRequest() {
formInformations.birthDate = data.value.dateOfBirth
? conventDateOfBirth(`${data.value.dateOfBirth}`)
: null;
age.value = storeLinkCenter.calculateAge(data.value.age);
age.value = calculateAge(data.value.dateOfBirth);
formInformations.gender = data.value.genderDesc;
let registrationAddress = data.value.houseNo ? data.value.houseNo : "";

3
src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
View file

@ -6,6 +6,7 @@ import { checkPermission } from "@/utils/permissions";
import { useRoute } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import { useProfileDataStore } from "@/modules/04_registryPerson/stores/profile";
import { calculateAge } from "@/utils/function";
import http from "@/plugins/http";
import config from "@/app.config";
@ -22,7 +23,7 @@ import DialogHistory from "@/modules/04_registryPerson/components/detail/DialogH
const $q = useQuasar();
const route = useRoute();
const store = useProfileDataStore();
const { calculateAge, fetchPerson, filterSelector } = store;
const { fetchPerson, filterSelector } = store;
const {
success,
showLoader,