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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m10s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-02-11 11:15:18 +07:00
commit 6c8f8daeec
1 changed files with 41 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
View file

@ -146,44 +146,57 @@ function onValidate() {
formData.append("type", formDataFollowSpouse.type); // formData.append("type", formDataFollowSpouse.type); //
formData.append( formData.append(
"leaveStartDate", "leaveStartDate",
convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? "" convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? "",
); // ); //
formData.append( formData.append(
"leaveEndDate", "leaveEndDate",
convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? "" convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? "",
); // ); //
formData.append( formData.append(
"coupleDayStartDateHistory", "coupleDayStartDateHistory",
convertDateToAPI(formDataFollowSpouse.coupleDayStartDateHistory) ?? "" convertDateToAPI(formDataFollowSpouse.coupleDayStartDateHistory) ?? "",
); // ); //
formData.append( formData.append(
"coupleDayEndDateHistory", "coupleDayEndDateHistory",
convertDateToAPI(formDataFollowSpouse.coupleDayEndDateHistory) ?? "" convertDateToAPI(formDataFollowSpouse.coupleDayEndDateHistory) ?? "",
); // ); //
formData.append("leaveWrote", formDataFollowSpouse.leaveWrote); // formData.append("leaveWrote", formDataFollowSpouse.leaveWrote); //
formData.append("leaveDetail", formDataFollowSpouse.leaveDetail); // formData.append("leaveDetail", formDataFollowSpouse.leaveDetail); //
formData.append("leaveSalaryText", formDataFollowSpouse.leaveSalaryText); // formData.append("leaveSalaryText", formDataFollowSpouse.leaveSalaryText); //
formData.append("leaveSalary", formDataFollowSpouse.leaveSalary); // formData.append("leaveSalary", formDataFollowSpouse.leaveSalary); //
formData.append(
"coupleDayTotalHistory", if (formDataFollowSpouse.coupleDayTotalHistory) {
formDataFollowSpouse.coupleDayTotalHistory formData.append(
); // "coupleDayTotalHistory",
formData.append( formDataFollowSpouse.coupleDayTotalHistory,
"coupleDaySumTotalHistory", ); //
formDataFollowSpouse.coupleDaySumTotalHistory }
); //
formData.append( if (formDataFollowSpouse.coupleDaySumTotalHistory) {
"coupleDayCountryHistory", formData.append(
formDataFollowSpouse.coupleDayCountryHistory "coupleDaySumTotalHistory",
); // formDataFollowSpouse.coupleDaySumTotalHistory,
formData.append( ); //
"coupleDayLevelCountry", }
formDataFollowSpouse.coupleDayLevelCountry
); // if (formDataFollowSpouse.coupleDayCountryHistory) {
formData.append(
"coupleDayCountryHistory",
formDataFollowSpouse.coupleDayCountryHistory,
); //
}
if (formDataFollowSpouse.coupleDayLevelCountry) {
formData.append(
"coupleDayLevelCountry",
formDataFollowSpouse.coupleDayLevelCountry,
); //
}
formData.append("coupleDayLevel", formDataFollowSpouse.coupleDayLevel); // formData.append("coupleDayLevel", formDataFollowSpouse.coupleDayLevel); //
formData.append( formData.append(
"coupleDayPosition", "coupleDayPosition",
formDataFollowSpouse.coupleDayPosition formDataFollowSpouse.coupleDayPosition,
); // ); //
formData.append("coupleDayName", formDataFollowSpouse.coupleDayName); // formData.append("coupleDayName", formDataFollowSpouse.coupleDayName); //
formData.append("leaveTotal", formDataFollowSpouse.leaveTotal); // formData.append("leaveTotal", formDataFollowSpouse.leaveTotal); //
@ -227,7 +240,7 @@ async function fetchCheck() {
// totalCheck.value = data.totalDate; // totalCheck.value = data.totalDate;
leaveText.value = calculateDurationYmd( leaveText.value = calculateDurationYmd(
convertDateToAPI(formDataFollowSpouse.leaveStartDate), convertDateToAPI(formDataFollowSpouse.leaveStartDate),
convertDateToAPI(formDataFollowSpouse.leaveEndDate) convertDateToAPI(formDataFollowSpouse.leaveEndDate),
); );
reasonLeave.value = data.message reasonLeave.value = data.message
? data.message ? data.message
@ -249,7 +262,7 @@ async function fetchCheck() {
function updateLeaveHistoryTotal() { function updateLeaveHistoryTotal() {
const newLeaveTotal = calculateDurationYmd( const newLeaveTotal = calculateDurationYmd(
formDataFollowSpouse.coupleDayStartDateHistory, formDataFollowSpouse.coupleDayStartDateHistory,
formDataFollowSpouse.coupleDayEndDateHistory formDataFollowSpouse.coupleDayEndDateHistory,
); );
formDataFollowSpouse.coupleDayTotalHistory = newLeaveTotal; formDataFollowSpouse.coupleDayTotalHistory = newLeaveTotal;
checkTotalHistory(); checkTotalHistory();
@ -310,20 +323,20 @@ watch(
checkTotalHistory(); checkTotalHistory();
const leaveTotal = calculateDurationYmd( const leaveTotal = calculateDurationYmd(
props.data.leaveStartDate, props.data.leaveStartDate,
props.data.leaveEndDate props.data.leaveEndDate,
); );
leaveText.value = leaveTotal; leaveText.value = leaveTotal;
const coupleDayTotalHistory = calculateDurationYmd( const coupleDayTotalHistory = calculateDurationYmd(
props.data.coupleDayStartDateHistory, props.data.coupleDayStartDateHistory,
props.data.coupleDayEndDateHistory props.data.coupleDayEndDateHistory,
); );
formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory; formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory;
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
formDataFollowSpouse.leaveDocument = []; formDataFollowSpouse.leaveDocument = [];
} }
}, },
{ deep: true } { deep: true },
); );
/**Hook */ /**Hook */
@ -359,13 +372,13 @@ onMounted(async () => {
checkTotalHistory(); checkTotalHistory();
const leaveTotal = calculateDurationYmd( const leaveTotal = calculateDurationYmd(
props.data.leaveStartDate, props.data.leaveStartDate,
props.data.leaveEndDate props.data.leaveEndDate,
); );
leaveText.value = leaveTotal; leaveText.value = leaveTotal;
const coupleDayTotalHistory = calculateDurationYmd( const coupleDayTotalHistory = calculateDurationYmd(
props.data.coupleDayStartDateHistory, props.data.coupleDayStartDateHistory,
props.data.coupleDayEndDateHistory props.data.coupleDayEndDateHistory,
); );
formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory; formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory;
statusCheck.value = props.data.status; statusCheck.value = props.data.status;