แก้ ไฟล์ merge
This commit is contained in:
parent
8bcc243cb4
commit
1ec5d4ec73
2 changed files with 2 additions and 10 deletions
|
|
@ -89,7 +89,7 @@
|
||||||
:class="getClass(edit)"
|
:class="getClass(edit)"
|
||||||
:readonly="!edit"
|
:readonly="!edit"
|
||||||
:borderless="!edit"
|
:borderless="!edit"
|
||||||
:rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
|
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
|
||||||
:outlined="edit"
|
:outlined="edit"
|
||||||
dense
|
dense
|
||||||
lazy-rules
|
lazy-rules
|
||||||
|
|
@ -221,7 +221,7 @@
|
||||||
:class="getClass(edit)"
|
:class="getClass(edit)"
|
||||||
:readonly="!edit"
|
:readonly="!edit"
|
||||||
:borderless="!edit"
|
:borderless="!edit"
|
||||||
:rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
|
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
|
||||||
:outlined="edit"
|
:outlined="edit"
|
||||||
dense
|
dense
|
||||||
lazy-rules
|
lazy-rules
|
||||||
|
|
|
||||||
|
|
@ -258,11 +258,7 @@ const getClass = (val: boolean) => {
|
||||||
:class="getClass(status == 'checkRegister' || status == 'payment')"
|
:class="getClass(status == 'checkRegister' || status == 'payment')"
|
||||||
:readonly="!(status == 'checkRegister' || status == 'payment')"
|
:readonly="!(status == 'checkRegister' || status == 'payment')"
|
||||||
:borderless="!(status == 'checkRegister' || status == 'payment')"
|
:borderless="!(status == 'checkRegister' || status == 'payment')"
|
||||||
<<<<<<< HEAD
|
|
||||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
|
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
|
||||||
=======
|
|
||||||
:rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
|
|
||||||
>>>>>>> 62f1c818415d928fd00ea2ddbde5ab6143efa1a1
|
|
||||||
:outlined="status == 'checkRegister' || status == 'payment'"
|
:outlined="status == 'checkRegister' || status == 'payment'"
|
||||||
dense
|
dense
|
||||||
lazy-rules
|
lazy-rules
|
||||||
|
|
@ -386,11 +382,7 @@ const getClass = (val: boolean) => {
|
||||||
:class="getClass(status == 'checkRegister' || status == 'payment')"
|
:class="getClass(status == 'checkRegister' || status == 'payment')"
|
||||||
:readonly="!(status == 'checkRegister' || status == 'payment')"
|
:readonly="!(status == 'checkRegister' || status == 'payment')"
|
||||||
:borderless="!(status == 'checkRegister' || status == 'payment')"
|
:borderless="!(status == 'checkRegister' || status == 'payment')"
|
||||||
<<<<<<< HEAD
|
|
||||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
|
:rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
|
||||||
=======
|
|
||||||
:rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
|
|
||||||
>>>>>>> 62f1c818415d928fd00ea2ddbde5ab6143efa1a1
|
|
||||||
:outlined="status == 'checkRegister' || status == 'payment'"
|
:outlined="status == 'checkRegister' || status == 'payment'"
|
||||||
dense
|
dense
|
||||||
lazy-rules
|
lazy-rules
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue