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

Merge branch 'develop' into dev-tee

Browse source
This commit is contained in:
setthawutttty 2023-09-13 17:40:47 +07:00
commit 5c7853e821
14 changed files with 273 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/04_registry/components/Leave.vue
View file

@ -67,9 +67,8 @@
icon="mdi-history"
@click="clickHistory(props.row)"
>
<q-tooltip>ประวัติแก้ไขการลา
</q-tooltip>
</q-btn>
<q-tooltip>ประวัติแก้ไขการลา </q-tooltip>
</q-btn>
</q-td>
</q-tr>
</template>
@ -739,7 +738,10 @@ const fetchData = async () => {
totalLeave: e.totalLeave,
status: e.status,
reason: e.reason,
typeLeaveId: e.typeLeaveId,
typeLeaveId:
e.typeLeaveId !== "00000000-0000-0000-0000-000000000000"
? e.typeLeaveId
: "",
});
});
})
@ -794,7 +796,10 @@ const clickHistory = async (row: RequestItemsObject) => {
totalLeave: e.totalLeave,
status: e.status,
reason: e.reason,
typeLeaveId: e.typeLeaveId,
typeLeaveId:
e.typeLeaveId !== "00000000-0000-0000-0000-000000000000"
? e.typeLeaveId
: "",
});
});
})