Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m7s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m7s
This commit is contained in:
commit
eeaa9bfff2
1 changed files with 10 additions and 2 deletions
|
|
@ -406,6 +406,12 @@ function calculateMinDate() {
|
||||||
return today;
|
return today;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function prefixRankRule() {
|
||||||
|
return [
|
||||||
|
() => !!formData.rank || !!formData.prefix || "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
/** ดูการเปลี่ยนแปลงของวันเกิดเมื่อมีการเปลี่ยนแปลงจะคำนวนอายูใหม่*/
|
/** ดูการเปลี่ยนแปลงของวันเกิดเมื่อมีการเปลี่ยนแปลงจะคำนวนอายูใหม่*/
|
||||||
watch(
|
watch(
|
||||||
() => formData.birthDate,
|
() => formData.birthDate,
|
||||||
|
|
@ -599,7 +605,8 @@ onMounted(() => {
|
||||||
class="inputgreen"
|
class="inputgreen"
|
||||||
:options="store.Ops.prefixOps"
|
:options="store.Ops.prefixOps"
|
||||||
:label="dataLabel.prefix"
|
:label="dataLabel.prefix"
|
||||||
:rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
|
:rules="prefixRankRule()"
|
||||||
|
reactive-rules
|
||||||
@filter="(inputValue: string,
|
@filter="(inputValue: string,
|
||||||
doneFn: Function) => filterSelector(inputValue, doneFn, 'prefixOps'
|
doneFn: Function) => filterSelector(inputValue, doneFn, 'prefixOps'
|
||||||
)"
|
)"
|
||||||
|
|
@ -620,7 +627,8 @@ onMounted(() => {
|
||||||
input-debounce="0"
|
input-debounce="0"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="name"
|
option-value="name"
|
||||||
:rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
|
:rules="prefixRankRule()"
|
||||||
|
reactive-rules
|
||||||
v-model="formData.rank"
|
v-model="formData.rank"
|
||||||
class="inputgreen"
|
class="inputgreen"
|
||||||
:options="store.Ops.rankOps"
|
:options="store.Ops.rankOps"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue