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

fix bug retirement detail add check statusMain for approve / reject case cancel

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-10 13:01:44 +07:00
parent 1732209a2f
commit 892093c432
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/06_retirement/components/02_resign/ResignByid.vue
View file

@ -751,6 +751,9 @@ onMounted(async () => {
{{
dataDetail.prefix + dataDetail.firstName + " " + dataDetail.lastName
}}
<span v-if="dataDetail.statusMain === 'CANCELING'" class="text-red">
&nbsp;(อยู่ระหว่างการขอยกเลิกลาออก)
</span>
</div>
<CardProfile :data="dataProfile as DataProfile" />
@ -1167,6 +1170,7 @@ onMounted(async () => {
<div v-else-if="col.name == 'comment'">
<div
v-if="
dataDetail.statusMain === 'PENDING' &&
props.row.approveStatus == 'PENDING' &&
props.row.comment == '' &&
approveStep === 'st2'
@ -1258,6 +1262,7 @@ onMounted(async () => {
<div
class="q-gutter-x-sm"
v-if="
dataDetail.statusMain === 'PENDING' &&
rowsApprover &&
rowsApprover.approvers &&
rowsApprover.approvers[0]?.profileId == myProfileId &&

2
src/modules/06_retirement/components/02_resign/ResignReject.vue
View file

@ -566,6 +566,7 @@ onMounted(async () => {
<div
class="q-gutter-x-xs"
v-if="
dataDetail.statusMain === 'CANCELING' &&
props.row.approveStatus == 'PENDING' &&
props.row.comment == '' &&
approveStep === 'st2'
@ -645,6 +646,7 @@ onMounted(async () => {
<div
v-if="
dataDetail.statusMain === 'CANCELING' &&
rowsApprover &&
rowsApprover.approvers &&
rowsApprover.approvers[0]?.profileId == keycloakId &&

5
src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
View file

@ -779,6 +779,9 @@ onMounted(async () => {
{{
dataDetail.prefix + dataDetail.firstName + " " + dataDetail.lastName
}}
<span v-if="dataDetail.statusMain === 'CANCELING'" class="text-red">
&nbsp;(อยู่ระหว่างการขอยกเลิกลาออก)
</span>
</div>
<CardProfile :type="'employee'" :data="dataProfile as DataProfile" />
@ -1182,6 +1185,7 @@ onMounted(async () => {
<div
class="q-gutter-x-xs"
v-if="
dataDetail.statusMain === 'PENDING' &&
props.row.approveStatus == 'PENDING' &&
props.row.comment == '' &&
approveStep === 'st2'
@ -1260,6 +1264,7 @@ onMounted(async () => {
<div
class="q-gutter-x-sm"
v-if="
dataDetail.statusMain === 'PENDING' &&
rowsApprover &&
rowsApprover.approvers &&
rowsApprover.approvers[0]?.profileId == keycloakId &&

2
src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
View file

@ -551,6 +551,7 @@ onMounted(async () => {
<div
class="q-gutter-x-xs"
v-if="
dataDetail.statusMain === 'CANCELING' &&
props.row.approveStatus == 'PENDING' &&
props.row.comment == '' &&
approveStep === 'st2'
@ -628,6 +629,7 @@ onMounted(async () => {
<div
class="q-gutter-x-sm"
v-if="
dataDetail.statusMain === 'CANCELING' &&
rowsApprover &&
rowsApprover.approvers &&
rowsApprover.approvers[0]?.profileId == keycloakId &&