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

fix status รายละเอียดการลาออก

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-11-15 15:15:12 +07:00
parent 171a438974
commit 4d66ed89d6
3 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/06_retirement/components/resign/ResignByid.vue
View file

@ -761,7 +761,7 @@ onMounted(async () => {
v-if=" v-if="
!checkRoutePermisson && !checkRoutePermisson &&
workflowRef?.permission.isUpdate && workflowRef?.permission.isUpdate &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
> >
<div v-if="!conditions"> <div v-if="!conditions">
@ -839,7 +839,7 @@ onMounted(async () => {
v-if=" v-if="
!checkRoutePermisson && !checkRoutePermisson &&
workflowRef?.permission.isUpdate && workflowRef?.permission.isUpdate &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
class="col-12" class="col-12"
for="#evidenceFiles" for="#evidenceFiles"
@ -895,9 +895,8 @@ onMounted(async () => {
<div> <div>
<q-btn <q-btn
v-if=" v-if="
dataDetail.status == 'WAITTING' &&
!checkRoutePermisson && !checkRoutePermisson &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
dense dense
flat flat
@ -981,7 +980,7 @@ onMounted(async () => {
v-if=" v-if="
workflowRef?.permission.isUpdate && workflowRef?.permission.isUpdate &&
dataDetail.commanderReject === null && dataDetail.commanderReject === null &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
> >
<q-btn <q-btn
@ -1054,7 +1053,7 @@ onMounted(async () => {
v-if=" v-if="
workflowRef?.permission.isUpdate && workflowRef?.permission.isUpdate &&
dataDetail.oligarchReject === null && dataDetail.oligarchReject === null &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
> >
<q-btn <q-btn
@ -1133,7 +1132,7 @@ onMounted(async () => {
v-if=" v-if="
!checkRoutePermisson && !checkRoutePermisson &&
workflowRef?.permission.isUpdate && workflowRef?.permission.isUpdate &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
> >
<div class="q-gutter-sm" v-if="!edit"> <div class="q-gutter-sm" v-if="!edit">

2
src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
View file

@ -282,7 +282,7 @@ watchEffect(() => {
<DialogCreateCommand <DialogCreateCommand
v-model:modal="modalCommand" v-model:modal="modalCommand"
:command-type-code="props.mainTabs === '1' ? 'C-PM-17' : 'C-PM-41'" :command-type-code="props.mainTabs === '1' ? 'C-PM-23' : 'C-PM-42'"
:persons="dataMapToSend" :persons="dataMapToSend"
/> />
</template> </template>

27
src/modules/06_retirement/components/resignEMP/ResignByid.vue
View file

@ -780,7 +780,7 @@ onMounted(async () => {
v-if=" v-if="
!checkRoutePermisson && !checkRoutePermisson &&
isStaff && isStaff &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
> >
<div v-if="!conditions"> <div v-if="!conditions">
@ -858,7 +858,7 @@ onMounted(async () => {
v-if=" v-if="
!checkRoutePermisson && !checkRoutePermisson &&
isStaff && isStaff &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
class="col-12" class="col-12"
for="#evidenceFiles" for="#evidenceFiles"
@ -914,10 +914,9 @@ onMounted(async () => {
<div> <div>
<q-btn <q-btn
v-if=" v-if="
dataDetail.status == 'WAITTING' &&
!checkRoutePermisson && !checkRoutePermisson &&
isStaff && isStaff &&
dataDetail.statusMain !== 'CANCEL' dataDetail.statusMain === 'WAITTING'
" "
dense dense
flat flat
@ -998,7 +997,11 @@ onMounted(async () => {
<q-space /> <q-space />
<div <div
class="q-gutter-x-sm" class="q-gutter-x-sm"
v-if="isDirector && dataDetail.commanderReject === null && dataDetail.statusMain !== 'CANCEL'" v-if="
isDirector &&
dataDetail.commanderReject === null &&
dataDetail.statusMain === 'WAITTING'
"
> >
<q-btn <q-btn
outline outline
@ -1067,7 +1070,11 @@ onMounted(async () => {
<q-space /> <q-space />
<div <div
class="q-gutter-x-sm" class="q-gutter-x-sm"
v-if="isDirector && dataDetail.oligarchReject === null && dataDetail.statusMain !== 'CANCEL'" v-if="
isDirector &&
dataDetail.oligarchReject === null &&
dataDetail.statusMain === 'WAITTING'
"
> >
<q-btn <q-btn
outline outline
@ -1140,7 +1147,13 @@ onMounted(async () => {
แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
</div> </div>
<q-space /> <q-space />
<div v-if="!checkRoutePermisson && isStaff && dataDetail.statusMain !== 'CANCEL'"> <div
v-if="
!checkRoutePermisson &&
isStaff &&
dataDetail.statusMain === 'WAITTING'
"
>
<div class="q-gutter-sm" v-if="!edit"> <div class="q-gutter-sm" v-if="!edit">
<q-btn <q-btn
outline outline