diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue index 18e2243b1..57d01b9ed 100644 --- a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue +++ b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue @@ -35,6 +35,8 @@ const formData = reactive({ note: "", checkInStatus: "", checkOutStatus: "", + checkInEdit:false, + checkOutEdit:false }); const objectRound: MyObjectRoundRef = { @@ -58,7 +60,7 @@ function validateForm() { } if (hasError.every((result) => result === true)) { onSubmit(); - console.log(hasError) + console.log(hasError); } else { console.log(hasError); } @@ -129,6 +131,8 @@ watch( formData.checkIn = props.detailData.checkIn; formData.checkOut = props.detailData.checkOut; formData.note = props.detailData.note; + formData.checkInEdit = props.detailData.checkInEdit; + formData.checkOutEdit = props.detailData.checkOutEdit; } } } @@ -197,76 +201,21 @@ watch( -
-

เวลาเข้างาน

- -
- -
-

เวลาออกงาน

- +
+ +
-

สถานะเข้างาน

+

สถานะช่วงเช้า

-

สถานะออกงาน

+

สถานะช่วงบ่าย

{ timeMorning: e.startTimeMorning == null ? "-" - : e.startTimeMorning + " - " + e.endTimeMorning, + : e.checkInEdit == true ? e.startTimeMorning + " - " + e.endTimeMorning:'-', timeAfternoon: e.startTimeAfternoon == null ? "-" - : e.startTimeAfternoon + " - " + e.endTimeAfternoon, + : e.checkOutEdit == true ? e.startTimeAfternoon + " - " + e.endTimeAfternoon:'-', startTimeMorning: e.startTimeMorning, endTimeMorning: e.endTimeMorning, startTimeAfternoon: e.startTimeAfternoon,