diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue index 19c0109..a41e91f 100644 --- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue @@ -233,6 +233,7 @@ async function fetchCheck() { reasonLeave.value = data.message ? data.message : "จำนวนวันลาเกินที่กำหนด"; + checkTotalHistory(); hideLoader(); }) .catch((e: any) => { @@ -315,7 +316,7 @@ watch(props.data, async () => { formDataFollowSpouse.coupleDayEndDateHistory = props.data.coupleDayEndDateHistory; leaveDocumentList.value = props.data.leaveDocument; - + checkTotalHistory(); const leaveTotal = await calculateDurationYmd( props.data.leaveStartDate, props.data.leaveEndDate @@ -361,7 +362,7 @@ onMounted(async () => { formDataFollowSpouse.coupleDayEndDateHistory = props.data.coupleDayEndDateHistory; leaveDocumentList.value = props.data.leaveDocument; - + checkTotalHistory(); const leaveTotal = await calculateDurationYmd( props.data.leaveStartDate, props.data.leaveEndDate diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue index ce4c666..9c0df62 100644 --- a/src/modules/05_leave/components/ListView.vue +++ b/src/modules/05_leave/components/ListView.vue @@ -41,8 +41,8 @@ async function fetchDataTable() { showLoader(); const body = { year: year.value, //*ปีในการยื่นขอใบลา(ใช้เป็น คศ.) - type: type.value, //*Id ประเภทการลา - status: status.value, //*สถานะการของลา + type: LeaveData.type, //*Id ประเภทการลา + status: LeaveData.status, //*สถานะการของลา page: page.value.toString(), //*หน้า pageSize: pageSize.value.toString(), //*จำนวนแถวต่อหน้า keyword: filter.value, //keyword ค้นหา