hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-01-23 11:12:49 +07:00
commit 38f3a7f8dc
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/03_retire/views/addRetire.vue
View file

@ -219,13 +219,17 @@ onMounted(async () => {
style="padding-bottom: 0px"
>
<div class="q-pl-sm text-grey-7" v-if="dataDetail.cancelReason">
เหตุผลการขอยกเลิก:
เหตุผลการขอยกเลิก :
<spen class="text-red">{{ dataDetail.cancelReason }}</spen>
</div>
<q-space />
<q-btn
v-if="dataDetail.statusMain !== 'CANCEL' && checkCancleLeave"
v-if="
dataDetail.statusMain !== 'CANCEL' &&
dataDetail.statusMain !== 'DONECANCEL' &&
checkCancleLeave
"
unelevated
color="orange"
label="ยกเลิกการลาออก"
@ -235,7 +239,8 @@ onMounted(async () => {
<q-btn
v-else-if="
dataDetail.statusMain === 'CANCEL' &&
(dataDetail.statusMain === 'CANCEL' ||
dataDetail.statusMain === 'DONECANCEL') &&
dataStore.officerType == 'OFFICER'
"
unelevated