Compare commits

..

No commits in common. "6c8f8daeec8300f182a89efedd41db44684d7662" and "9b897999037510df6bbc4e953fcc98044d46ac64" have entirely different histories.

View file

@ -146,57 +146,44 @@ 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); //
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(
"coupleDayTotalHistory",
formDataFollowSpouse.coupleDayTotalHistory
); //
formData.append(
"coupleDaySumTotalHistory",
formDataFollowSpouse.coupleDaySumTotalHistory
); //
formData.append(
"coupleDayCountryHistory",
formDataFollowSpouse.coupleDayCountryHistory
); //
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); //
@ -240,7 +227,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
@ -262,7 +249,7 @@ async function fetchCheck() {
function updateLeaveHistoryTotal() {
const newLeaveTotal = calculateDurationYmd(
formDataFollowSpouse.coupleDayStartDateHistory,
formDataFollowSpouse.coupleDayEndDateHistory,
formDataFollowSpouse.coupleDayEndDateHistory
);
formDataFollowSpouse.coupleDayTotalHistory = newLeaveTotal;
checkTotalHistory();
@ -323,20 +310,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 */
@ -372,13 +359,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;