diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue index f1e754e..9b6df27 100644 --- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue +++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue @@ -131,11 +131,11 @@ function onValidate() { formData.append("leaveRangeEnd", formDataSick.leaveRangeEnd); formData.append( "leaveStartDate", - convertDateToAPI(formDataSick.leaveStartDate) ?? "" + convertDateToAPI(formDataSick.leaveStartDate) ?? "", ); formData.append( "leaveEndDate", - convertDateToAPI(formDataSick.leaveEndDate) ?? "" + convertDateToAPI(formDataSick.leaveEndDate) ?? "", ); formData.append("leaveWrote", formDataSick.leaveWrote); formData.append("leaveAddress", dataStore.currentAddress); @@ -202,7 +202,6 @@ function mapPropsToFormData() { statusCheck.value = props.data.status; leaveId.value = props.data.id; formDataSick.leaveDocument = []; - console.log(props.data.leaveDocument); } } @@ -211,7 +210,7 @@ watch( () => { mapPropsToFormData(); }, - { deep: true } + { deep: true }, ); /** Hook */ diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue index d80b64b..d5fd5fe 100644 --- a/src/modules/05_leave/components/FormLeave/Form.vue +++ b/src/modules/05_leave/components/FormLeave/Form.vue @@ -293,7 +293,7 @@ function getSearch() { /> + diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts index 169abcc..cb84459 100644 --- a/src/modules/05_leave/store.ts +++ b/src/modules/05_leave/store.ts @@ -33,7 +33,7 @@ export const useLeaveStore = defineStore("Leave", () => { /** * function เรียกข้อมูลรายการลา Table - * @param data ข้อมูลรายการลา Table + * @param data ข้อมูลรายการลา TableleaveWaitingSummary */ async function fetchListLeave(data: ListLeave[]) { let datalist: ListLeaveTable[] = data.map((e: ListLeave) => ({ @@ -66,7 +66,6 @@ export const useLeaveStore = defineStore("Leave", () => { isDelete: e.isDelete, })); rows.value = datalist; - console.log(datalist); } //ฟังก์ชั่นแปลง Status @@ -309,6 +308,7 @@ export const useLeaveStore = defineStore("Leave", () => { const telephoneNumber = ref(""); const currentAddress = ref(""); + const leaveWaitingSummary = ref(0); //ดึงข้อมูล profile จาก API async function fetchProfile() { @@ -347,6 +347,7 @@ export const useLeaveStore = defineStore("Leave", () => { : "-"; restDayCurrentTotal.value = Number(data.leaveLimit) - Number(data.restDayTotalOld); + leaveWaitingSummary.value = data.leaveWaitingSummary || 0; }) .catch((e: any) => { console.log(e); @@ -409,6 +410,7 @@ export const useLeaveStore = defineStore("Leave", () => { salaryText.value = ""; leaveLast.value = undefined; restDayCurrentTotal.value = 0; + leaveWaitingSummary.value = 0; } /** ฟังก์ชันเรียกข้อมูลประเภทการลา */ @@ -480,6 +482,7 @@ export const useLeaveStore = defineStore("Leave", () => { currentAddress, rangeOptions, converstType, + leaveWaitingSummary, fetchLeaveTypeData, isLoadingProfile,