แก้ ไฟล์ merge

This commit is contained in:
kittapath 2024-11-28 10:06:40 +07:00
parent 8bcc243cb4
commit 1ec5d4ec73
2 changed files with 2 additions and 10 deletions

View file

@ -258,11 +258,7 @@ 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
@ -386,11 +382,7 @@ 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