แก้ส่ง totalLeave จาก Frontend แทน

src/modules/05_leave/components/FormLeave/01_SickForm.vue

@@ -135,6 +135,7 @@ function onValidate() {
 		formData.append("leaveAddress", formDataSick.leaveAddress);
 		formData.append("leaveNumber", formDataSick.leaveNumber);
 		formData.append("leaveDetail", formDataSick.leaveDetail);
+		formData.append("leaveTotal", formDataSick.leaveTotal);
 		props.onSubmit(formData, isLeave.value);
 	}
 }

src/modules/05_leave/components/FormLeave/03_Birth.vue

@@ -116,6 +116,7 @@ function onValidate() {
 		formData.append("leaveAddress", formDataBirth.leaveAddress);
 		formData.append("leaveNumber", formDataBirth.leaveNumber);
 		formData.append("leaveDetail", formDataBirth.leaveDetail);
+		formData.append("leaveTotal", formDataBirth.leaveTotal);
 
 		props.onSubmit(formData, isLeave.value);
 	}

src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue

@@ -135,6 +135,8 @@ function onValidate() {
 			"wifeDayDateBorn",
 			dateToISO(new Date(formDataHelpWife.wifeDayDateBorn))
 		);
+		formData.append("leaveTotal", formDataHelpWife.leaveTotal);
+
 		props.onSubmit(formData, isLeave.value);
 	}
 }

src/modules/05_leave/components/FormLeave/05_VacationForm.vue

@@ -128,6 +128,7 @@ function onValidate() {
 		formData.append("leaveAddress", formDataVacation.leaveAddress);
 		formData.append("leaveNumber", formDataVacation.leaveNumber);
 		formData.append("leaveDetail", formDataVacation.leaveDetail);
+		formData.append("leaveTotal", formDataVacation.leaveTotal);
 		props.onSubmit(formData, isLeave.value);
 	}
 }

src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue

@@ -165,6 +165,7 @@ function onValidate() {
 		formData.append("ordainDayStatus", formDataOrdination.ordainDayStatus);
 		formData.append("leaveWrote", formDataOrdination.leaveWrote);
 		formData.append("leaveDetail", formDataOrdination.leaveDetail);
+		formData.append("leaveTotal", formDataOrdination.leaveTotal);
 		props.onSubmit(formData, isLeave.value);
 	}
 }

src/modules/05_leave/components/FormLeave/07_HajjForm.vue

@@ -116,6 +116,7 @@ function onValidate() {
 		formData.append("hajjDayStatus", formDataHaji.hajjDayStatus);
 		formData.append("leaveWrote", formDataHaji.leaveWrote);
 		formData.append("leaveDetail", formDataHaji.leaveDetail);
+		formData.append("leaveTotal", formDataHaji.leaveTotal);
 		props.onSubmit(formData, isLeave.value);
 	}
 }

src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue

@@ -134,6 +134,7 @@ function onValidate() {
 		formData.append("absentDayAt", formDataMilitary.absentDayAt);
 		formData.append("leaveWrote", formDataMilitary.leaveWrote);
 		formData.append("leaveDetail", formDataMilitary.leaveDetail);
+		formData.append("leaveTotal", formDataMilitary.leaveTotal);
 		props.onSubmit(formData, isLeave.value);
 	}
 }

src/modules/05_leave/components/FormLeave/09_StudyForm.vue

@@ -82,6 +82,7 @@ const formDataStudy = reactive<any>({
   leaveDocument: [], //
   leaveDetail: "",
   leaveTotal: "",
+  leaveTotalDay: "", //จำนวนวันลา
 });
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
@@ -155,6 +156,7 @@ function onValidate() {
     formData.append("studyDayScholarship", formDataStudy.studyDayScholarship);
     formData.append("leaveAddress", formDataStudy.leaveAddress); //
     formData.append("leaveNumber", formDataStudy.leaveNumber); //
+	formData.append("leaveTotal", formDataStudy.leaveTotalDay); //
     props.onSubmit(formData, isLeave.value);
   }
 }
@@ -179,7 +181,7 @@ async function fetchCheck() {
     .then((res: any) => {
       const data = res.data.result;
       isLeave.value = data.isLeave;
-			//   formDataStudy.leaveTotal = formDataStudy.leaveStartDatee;
+      formDataStudy.leaveTotalDay = data.totalDate;
     })
     .catch((e: any) => {
       messageError($q, e);

src/modules/05_leave/components/FormLeave/10_TrainForm.vue

@@ -65,6 +65,8 @@ const formDataTrain = reactive<any>({
 	studyDayTrainingName: "",
 	leaveDocument: [],
 	leaveDetail: "",
+	leaveTotal: "", //จำนวนวันลา
+	leaveTotalDay: "", //จำนวนวันลา
 });
 
 /** ตัวแปร ref สำหรับแสดง validate */
@@ -152,7 +154,7 @@ function onValidate() {
 		formData.append("leaveNumber", formDataTrain.leaveNumber); //
 		formData.append("leaveSalaryText", formDataTrain.leaveSalaryText); //
 		formData.append("leaveSalary", formDataTrain.leaveSalary); //
-		formData.append("leaveTotal", formDataTrain.leaveTotal); //
+		formData.append("leaveTotal", formDataTrain.leaveTotalDay); //
 		props.onSubmit(formData, isLeave.value);
 	}
 }
@@ -173,7 +175,7 @@ async function fetchCheck() {
 		.then((res: any) => {
 			const data = res.data.result;
 			isLeave.value = data.isLeave;
-			//   formDataTrain.leaveTotal = data.totalDate;
+			formDataTrain.leaveTotalDay = data.totalDate;
 		})
 		.catch((e: any) => {
 			messageError($q, e);

src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue

@@ -125,7 +125,8 @@ async function onValidate() {
 			dateToISO(formDataWorkInternational.leaveEndDate)
 		); //
 		formData.append("leaveWrote", formDataWorkInternational.leaveWrote); //
-		formData.append("leaveDetail", formDataWorkInternational.leaveDetail); //
+		formData.append("leaveDetail", formDataWorkInternational.leaveDetail);
+		formData.append("leaveTotal", formDataWorkInternational.leaveTotal); //
 		await props.onSubmit(formData, isLeave.value);
 	}
 }

src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue

@@ -56,6 +56,7 @@ const formDataFollowSpouse = reactive<any>({
 	leaveStartDate: null,
 	leaveEndDate: null,
 	leaveTotal: "", //จำนวนวันลา
+	leaveTotalDay: "", //จำนวนวันลา
 	leaveSalaryText: "",
 	leaveSalary: 0, //เงินเดือนปัจจุบัน
 	coupleDayName: "", //ชื่อคู่สมรส
@@ -177,7 +178,7 @@ function onValidate() {
 			formDataFollowSpouse.coupleDayPosition
 		); //
 		formData.append("coupleDayName", formDataFollowSpouse.coupleDayName); //
-		formData.append("leaveTotal", formDataFollowSpouse.leaveTotal); //
+		formData.append("leaveTotal", formDataFollowSpouse.leaveTotalDay); //
 		props.onSubmit(formData, isLeave.value);
 	}
 }
@@ -197,6 +198,7 @@ async function fetchCheck() {
 		.then((res: any) => {
 			const data = res.data.result;
 			isLeave.value = data.isLeave;
+			formDataFollowSpouse.leaveTotalDay = data.totalDate;
 		})
 		.catch((e: any) => {
 			messageError($q, e);

src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue

@@ -112,6 +112,7 @@ function onValidate() {
 		);
 		formData.append("leaveWrote", formDataRehabilitation.leaveWrote); //
 		formData.append("leaveDetail", formDataRehabilitation.leaveDetail); //
+		formData.append("leaveTotal", formDataRehabilitation.leaveTotal); //
 		props.onSubmit(formData, isLeave.value);
 	}
 }
@@ -141,6 +142,7 @@ async function FetchCheck() {
 		.then((res: any) => {
 			const data = res.data.result;
 			isLeave.value = data.isLeave;
+			formDataRehabilitation.leaveTotal = data.totalDate;
 		})
 		.catch((e: any) => {
 			messageError($q, e);