Merge branch 'develop' of github.com:Frappet/BMA-EHR-RECRUIT-EXAM-VUE3 into develop

This commit is contained in:
Kittapath 2023-10-13 14:36:18 +07:00
commit c16c062bcb

View file

@ -80,7 +80,7 @@
v-model="position"
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/ลักษณะงาน'}`]"
:label="`${'ตำแหน่ง/ลักษณะงาน'}`"
@update:modelValue="clickEditRow"
@update:modelValue="clickEditRowPosition"
hide-bottom-space
/>
</div>
@ -96,7 +96,7 @@
:options="opType"
:rules="[(val) => !!val || `${'กรุณาเลือกประเภท'}`]"
:label="`${'ประเภท'}`"
@update:modelValue="clickEditRow"
@update:modelValue="clickEditRowPosition"
hide-bottom-space
/>
</div>
@ -593,7 +593,7 @@ const checkRowPage = () => {
//validate
const endDateValidation = (value: Date) => {
if (startDate.value < endDate.value) {
if (startDate.value <= endDate.value) {
return true
}
return false
@ -774,6 +774,10 @@ const clickEditRow = () => {
editRow.value = true
}
const clickEditRowPosition = () => {
editRow.value = true
}
/**
* validate input ใน dialog
*/