hrms-bangkok/hrms-mgt
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 16:53:43 +07:00
commit 98e5eaad27
13 changed files with 234 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/09_leave/components/2_Leave/DetailLeave.vue
View file

@ -121,13 +121,17 @@ const formData = reactive<FremData>({
approveStep: "",
dear: "",
leaveRange: "",
profileType: "",
});
const isLoadData = ref<boolean>(false);
/**
* Function fetch รายละเอียดของข้อมูล
* @param paramsId รับ ID จาก paramID
*/
async function fetchDetailLeave(paramsId: string) {
isLoadData.value = false;
showLoader();
await http
.get(config.API.leaveListById(paramsId))
@ -264,6 +268,9 @@ async function fetchDetailLeave(paramsId: string) {
: "-";
formData.approveStep = data.approveStep ? data.approveStep : "-";
formData.dear = data.dear ? data.dear : "-";
formData.profileType = data.profileType;
isLoadData.value = true;
/** ส่งประเภทของการลาไป Function เช็คประเภทการลา*/
await fectOptionType();
@ -802,12 +809,16 @@ onMounted(async () => {
</div>
<!-- Workflow -->
<div class="col-xs-12 col-sm-12">
<div class="col-xs-12 col-sm-12" v-if="isLoadData">
<WorkFlow
ref="workflowRef"
:id="paramsId"
v-model:is-check-data="isCheckData"
sys-name="SYS_LEAVE_LIST"
:sys-name="
formData.profileType === 'OFFICER'
? 'SYS_LEAVE_LIST'
: 'SYS_LEAVE_LIST_EMP'
"
/>
</div>
</div>

14
src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
View file

@ -147,8 +147,11 @@ const formData = reactive<FremData>({
coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
approveStep: "",
dear: "",
profileType: "",
});
const isLoadData = ref<boolean>(false);
onMounted(async () => {
if (paramsId) {
showLoader();
@ -192,6 +195,7 @@ async function fetchDetailDeleteLeave(paramsId: string) {
}
async function fetchDetailLeave(paramsId: string) {
isLoadData.value = false;
await http
.get(config.API.leaveListById(paramsId))
.then(async (res) => {
@ -275,6 +279,8 @@ async function fetchDetailLeave(paramsId: string) {
formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory;
formData.approveStep = data.approveStep;
formData.dear = data.dear ? data.dear : "-";
formData.profileType = data.profileType;
isLoadData.value = true;
await fectOptionType();
})
.catch((err) => {
@ -708,11 +714,15 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
<!-- Workflow -->
<div class="col-xs-12 col-sm-12">
<div class="col-xs-12 col-sm-12" v-if="isLoadData">
<WorkFlow
ref="workflowRef"
:id="paramsId"
sys-name="SYS_LEAVE_LIST"
:sys-name="
formData.profileType === 'OFFICER'
? 'SYS_LEAVE_LIST'
: 'SYS_LEAVE_LIST_EMP'
"
/>
</div>
</div>