diff --git a/src/components/information/Information.vue b/src/components/information/Information.vue index 8446b07d1..b7fc1e159 100644 --- a/src/components/information/Information.vue +++ b/src/components/information/Information.vue @@ -73,7 +73,7 @@ :borderless="!edit" v-model="informaData.firstname" :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]" - :label="`${'ชื่อ'}`" + :label="`${'ชื่อ(ภาษาไทย)'}`" />
@@ -87,7 +87,7 @@ :borderless="!edit" v-model="informaData.lastname" :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]" - :label="`${'นามสกุล'}`" + :label="`${'นามสกุล(ภาษาไทย)'}`" />
@@ -116,7 +116,11 @@ lazy-rules :readonly="!edit" :borderless="!edit" - :model-value="informaData.birthDate ? date2Thai(informaData.birthDate) : null" + :model-value=" + informaData.birthDate + ? date2Thai(informaData.birthDate) + : null + " :rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`]" :label="`${'วัน/เดือน/ปี เกิด'}`" > @@ -1054,7 +1058,9 @@ const editData = async () => { nationality: informaData.value.nationality, race: informaData.value.ethnicity, religionId: informaData.value.religionId, - birthDate: informaData.value.birthDate ? dateToISO(informaData.value.birthDate) : dateToISO(new Date()), + birthDate: informaData.value.birthDate + ? dateToISO(informaData.value.birthDate) + : dateToISO(new Date()), bloodGroupId: informaData.value.bloodId, relationshipId: informaData.value.statusId, telephoneNumber: informaData.value.tel, diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue index 9a9b1d17c..a36900989 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue @@ -1,12 +1,15 @@