From a35fbbc7d1d0d21e304c6aa9dc84e94392f13920 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 11 Feb 2026 11:15:03 +0700 Subject: [PATCH 1/2] fix:formData.append null --- .../FormLeave/12_FollowSpouseForm.vue | 69 +++++++++++-------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue index b0b699e..4c8aac5 100644 --- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue @@ -146,44 +146,57 @@ function onValidate() { formData.append("type", formDataFollowSpouse.type); // formData.append( "leaveStartDate", - convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? "" + convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? "", ); // formData.append( "leaveEndDate", - convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? "" + convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? "", ); // formData.append( "coupleDayStartDateHistory", - convertDateToAPI(formDataFollowSpouse.coupleDayStartDateHistory) ?? "" + convertDateToAPI(formDataFollowSpouse.coupleDayStartDateHistory) ?? "", ); // formData.append( "coupleDayEndDateHistory", - convertDateToAPI(formDataFollowSpouse.coupleDayEndDateHistory) ?? "" + convertDateToAPI(formDataFollowSpouse.coupleDayEndDateHistory) ?? "", ); // formData.append("leaveWrote", formDataFollowSpouse.leaveWrote); // formData.append("leaveDetail", formDataFollowSpouse.leaveDetail); // formData.append("leaveSalaryText", formDataFollowSpouse.leaveSalaryText); // formData.append("leaveSalary", formDataFollowSpouse.leaveSalary); // - formData.append( - "coupleDayTotalHistory", - formDataFollowSpouse.coupleDayTotalHistory - ); // - formData.append( - "coupleDaySumTotalHistory", - formDataFollowSpouse.coupleDaySumTotalHistory - ); // - formData.append( - "coupleDayCountryHistory", - formDataFollowSpouse.coupleDayCountryHistory - ); // - formData.append( - "coupleDayLevelCountry", - formDataFollowSpouse.coupleDayLevelCountry - ); // + + if (formDataFollowSpouse.coupleDayTotalHistory) { + formData.append( + "coupleDayTotalHistory", + formDataFollowSpouse.coupleDayTotalHistory, + ); // + } + + if (formDataFollowSpouse.coupleDaySumTotalHistory) { + formData.append( + "coupleDaySumTotalHistory", + formDataFollowSpouse.coupleDaySumTotalHistory, + ); // + } + + if (formDataFollowSpouse.coupleDayCountryHistory) { + formData.append( + "coupleDayCountryHistory", + formDataFollowSpouse.coupleDayCountryHistory, + ); // + } + + if (formDataFollowSpouse.coupleDayLevelCountry) { + formData.append( + "coupleDayLevelCountry", + formDataFollowSpouse.coupleDayLevelCountry, + ); // + } + formData.append("coupleDayLevel", formDataFollowSpouse.coupleDayLevel); // formData.append( "coupleDayPosition", - formDataFollowSpouse.coupleDayPosition + formDataFollowSpouse.coupleDayPosition, ); // formData.append("coupleDayName", formDataFollowSpouse.coupleDayName); // formData.append("leaveTotal", formDataFollowSpouse.leaveTotal); // @@ -227,7 +240,7 @@ async function fetchCheck() { // totalCheck.value = data.totalDate; leaveText.value = calculateDurationYmd( convertDateToAPI(formDataFollowSpouse.leaveStartDate), - convertDateToAPI(formDataFollowSpouse.leaveEndDate) + convertDateToAPI(formDataFollowSpouse.leaveEndDate), ); reasonLeave.value = data.message ? data.message @@ -249,7 +262,7 @@ async function fetchCheck() { function updateLeaveHistoryTotal() { const newLeaveTotal = calculateDurationYmd( formDataFollowSpouse.coupleDayStartDateHistory, - formDataFollowSpouse.coupleDayEndDateHistory + formDataFollowSpouse.coupleDayEndDateHistory, ); formDataFollowSpouse.coupleDayTotalHistory = newLeaveTotal; checkTotalHistory(); @@ -310,20 +323,20 @@ watch( checkTotalHistory(); const leaveTotal = calculateDurationYmd( props.data.leaveStartDate, - props.data.leaveEndDate + props.data.leaveEndDate, ); leaveText.value = leaveTotal; const coupleDayTotalHistory = calculateDurationYmd( props.data.coupleDayStartDateHistory, - props.data.coupleDayEndDateHistory + props.data.coupleDayEndDateHistory, ); formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory; statusCheck.value = props.data.status; formDataFollowSpouse.leaveDocument = []; } }, - { deep: true } + { deep: true }, ); /**Hook */ @@ -359,13 +372,13 @@ onMounted(async () => { checkTotalHistory(); const leaveTotal = calculateDurationYmd( props.data.leaveStartDate, - props.data.leaveEndDate + props.data.leaveEndDate, ); leaveText.value = leaveTotal; const coupleDayTotalHistory = calculateDurationYmd( props.data.coupleDayStartDateHistory, - props.data.coupleDayEndDateHistory + props.data.coupleDayEndDateHistory, ); formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory; statusCheck.value = props.data.status; From 87257cd1bf809392166fbacbbe65094ab2d19e81 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 19 Feb 2026 16:02:55 +0700 Subject: [PATCH 2/2] fix(organization-chart):Open Menu Structure --- src/modules/01_dashboard/views/Dashboard.vue | 13 ++----------- src/stores/data.ts | 3 +-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index cfb19c2..90d63b2 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -187,14 +187,8 @@ onMounted(async () => {
{ > {{ item.sub }}
- - อยู่ระหว่างปรับปรุง diff --git a/src/stores/data.ts b/src/stores/data.ts index fbd4e61..83b3acd 100644 --- a/src/stores/data.ts +++ b/src/stores/data.ts @@ -161,8 +161,7 @@ export const useDataStore = defineStore("dataMain", () => { icon: "mdi-account-group-outline", title: "แผนผังองค์กร", sub: "ดูแผนผังองค์กร", - // color: "blue-3", - color: "grey-3", + color: "blue-3", path: "/organization-chart", active: false, },