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 2024-11-15 13:16:25 +07:00
commit c9d1d1e4ee
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,7 +205,10 @@ onMounted(async () => {
/> />
<q-btn <q-btn
v-else-if="dataDetail.statusMain === 'CANCEL' && dataStore.officerType == 'OFFICER'" v-else-if="
dataDetail.statusMain === 'CANCEL' &&
dataStore.officerType == 'OFFICER'
"
unelevated unelevated
color="red" color="red"
label="ติดตามสถานะยกเลิกการขอลาออก" label="ติดตามสถานะยกเลิกการขอลาออก"
@ -606,12 +609,16 @@ onMounted(async () => {
dataStore.officerType == 'OFFICER' dataStore.officerType == 'OFFICER'
" "
> >
<Workflow :id="id" sys-name="SYS_RETIREMENT" /> <Workflow :id="id" sys-name="SYS_RESIGN" />
</div> </div>
</div> </div>
</div> </div>
<Dialog v-model:modal="modal" :fectData="fectDataresign" v-model:link="link"/> <Dialog
v-model:modal="modal"
:fectData="fectDataresign"
v-model:link="link"
/>
<q-dialog v-model="modalWorkflow" persistent> <q-dialog v-model="modalWorkflow" persistent>
<q-card style="width: 700px; max-width: 80vw"> <q-card style="width: 700px; max-width: 80vw">

6
src/modules/05_leave/components/DialogDetail.vue
View file

@ -503,7 +503,11 @@ watch(
leaveStatus != 'DRAFT' && mainStore.officerType == 'OFFICER' leaveStatus != 'DRAFT' && mainStore.officerType == 'OFFICER'
" "
:id="props.leaveId" :id="props.leaveId"
sys-name="SYS_LEAVE_LIST" :sys-name="
mainStore.officerType == 'OFFICER'
? 'SYS_LEAVE_LIST'
: 'SYS_LEAVE_LIST_EMP'
"
/> />
</div> </div>