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

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-06-04 15:09:39 +07:00
commit 6b2d1781b0
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -771,10 +771,13 @@ onMounted(async () => {
<q-space /> <q-space />
<div <div
v-if=" v-if="
!checkRoutePermisson && (!checkRoutePermisson &&
isStaff && isStaff &&
status === 'WAITTING' && status === 'WAITTING' &&
checkPermission($route)?.attrIsUpdate checkPermission($route)?.attrIsUpdate) ||
(!checkRoutePermisson &&
((isStaff && group === '1.1' && approveStep === 'st1') ||
(isOfficer && group !== '1.1' && approveStep === 'st3')))
" "
> >
<q-btn <q-btn

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

@ -801,10 +801,11 @@ onMounted(async () => {
<q-space /> <q-space />
<div <div
v-if=" v-if="
!checkRoutePermisson && (!checkRoutePermisson &&
isStaff && isStaff &&
status === 'WAITTING' && status === 'WAITTING' &&
checkPermission($route)?.attrIsUpdate checkPermission($route)?.attrIsUpdate) ||
(!checkRoutePermisson && isStaff && approveStep === 'st1')
" "
> >
<q-btn <q-btn