Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m43s

* develop:
  fix:checkPermission.attrIsUpdate
  fix:display_datepicker_dateMonth
This commit is contained in:
Warunee Tamkoo 2026-01-09 11:03:17 +07:00
commit 7c7c653681
2 changed files with 3 additions and 2 deletions

View file

@ -847,7 +847,7 @@ onMounted(() => {
</template>
</datepicker>
</div>
<div class="col-12" v-if="yearType == 'MONTH'">
<div class="col-12" v-if="yearType == 'MONTH' || leaveType == 'MONTH'">
<datepicker
v-model="dateMonth"
:locale="'th'"

View file

@ -644,7 +644,7 @@ onMounted(async () => {
</div>
<div class="col-12"><q-separator /></div>
<div class="row">
<div class="col-12 q-pa-sm">
<div class="col-12 q-pa-sm" v-if="checkPermission($route)?.attrIsUpdate">
<div class="row q-col-gutter-md col-12">
<q-file
ref="fileEvaluatioRef"
@ -691,6 +691,7 @@ onMounted(async () => {
<div>ประกาศผลการคดเลอกบคคล (เอกสารหมายเลข 10)</div>
<q-btn
v-if="checkPermission($route)?.attrIsUpdate"
flat
dense
round