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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

Browse source 
# Conflicts:
#	src/modules/03_recruiting/components/Address.vue
#	src/modules/03_recruiting/views/03_editor/index.vue
#	src/modules/04_registryPerson/components/Dialog/02_Address.vue
#	src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
#	src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
#	src/modules/05_placement/components/PersonalDetail/Information/Address.vue
This commit is contained in:
Warunee Tamkoo 2024-11-27 18:18:21 +07:00
commit 563f3e1b16
95 changed files with 580 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/03_recruiting/components/Address.vue
View file

@ -258,7 +258,11 @@ const getClass = (val: boolean) => {
:class="getClass(status == 'checkRegister' || status == 'payment')"
:readonly="!(status == 'checkRegister' || status == 'payment')"
:borderless="!(status == 'checkRegister' || status == 'payment')"
<<<<<<< HEAD
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
=======
:rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
>>>>>>> 62f1c818415d928fd00ea2ddbde5ab6143efa1a1
:outlined="status == 'checkRegister' || status == 'payment'"
dense
lazy-rules
@ -382,7 +386,11 @@ const getClass = (val: boolean) => {
:class="getClass(status == 'checkRegister' || status == 'payment')"
:readonly="!(status == 'checkRegister' || status == 'payment')"
:borderless="!(status == 'checkRegister' || status == 'payment')"
<<<<<<< HEAD
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
=======
:rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
>>>>>>> 62f1c818415d928fd00ea2ddbde5ab6143efa1a1
:outlined="status == 'checkRegister' || status == 'payment'"
dense
lazy-rules