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

refactor(timestamp-special): update checkIn/checkOut payload and edit conditions
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m5s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-06-23 15:27:42 +07:00
parent 13921f1a9f
commit 607457e921
2 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
View file

@ -96,8 +96,8 @@ watch(
formData.checkOut = "";
formData.note = "";
} else if (props.editCheck === "PENDING") {
if (props.detailData) {
if (props.detailData.checkInEdit) {
if (props.detailData) {
if (props.detailData.checkInEdit && props.detailData.checkOutEdit) {
formData.checkIn = props.detailData.startTimeMorning;
formData.checkOut = props.detailData.endTimeAfternoon;
} else if (

42
src/modules/09_leave/components/04_SpecialTime/DialogMultipleApprove.vue
View file

@ -106,14 +106,33 @@ function onSubmit() {
} else {
dialogConfirm($q, async () => {
showLoader();
const payload = selected.value.map((e: DataSpecialTime) => ({
recId: e.id,
checkInTime: e.checkInTime,
checkOutTime: e.checkOutTime,
checkInStatus: e.checkInEdit ? "NORMAL" : e.checkInStatusMain,
checkOutStatus: e.checkOutEdit ? "NORMAL" : e.checkOutStatusMain,
reason: reason.value,
}));
const payload = selected.value.map((e: DataSpecialTime) => {
let checkInTime: string;
let checkOutTime: string;
if (e.checkInEdit && e.checkOutEdit) {
checkInTime = e.startTimeMorning;
checkOutTime = e.endTimeAfternoon;
} else if (e.checkInEdit && !e.checkOutEdit) {
checkInTime = e.startTimeMorning;
checkOutTime = e.endTimeMorning;
} else if (!e.checkInEdit && e.checkOutEdit) {
checkInTime = e.startTimeAfternoon;
checkOutTime = e.endTimeAfternoon;
} else {
checkInTime = e.checkInTime;
checkOutTime = e.checkOutTime;
}
return {
recId: e.id,
checkInTime,
checkOutTime,
checkInStatus: e.checkInEdit ? "NORMAL" : e.checkInStatusMain,
checkOutStatus: e.checkOutEdit ? "NORMAL" : e.checkOutStatusMain,
reason: reason.value,
};
});
try {
await http.put(config.API.specialTimeApproveLists, payload);
@ -236,7 +255,9 @@ watch(modal, async (val) => {
</div>
</div>
</div>
<span class="text-red"
>*หมายเหตุเลือกทั้งหมดเฉพาะรายการที่แสดงเท่านั้น</span
>
<div class="col-12">
<p-table
:columns="columns"
@ -308,9 +329,6 @@ watch(modal, async (val) => {
rows="3"
/>
</div>
<span class="text-red"
>*หมายเหตุเลือกทั้งหมดเฉพาะรายการที่แสดงเท่านั้น</span
>
</q-card-section>
<q-separator />
<q-card-actions align="right">