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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2023-12-26 18:24:38 +07:00
commit 3d519802ef
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/09_leave/components/1_Work/DialogEdit.vue
View file

@ -87,7 +87,7 @@ watch(
<q-separator />
<q-card-section class="q-pt-none">
<q-card flat bordered class="col-12 q-mt-sm">
<div class="q-pa-sm text-green">
<div class="q-pa-sm text-green-8">
สถานะช่วงเช้า
<q-select
ref="morningStatusRef"
@ -116,7 +116,7 @@ watch(
</div>
</q-card>
<q-card flat bordered class="col-12 q-mt-sm">
<div class="q-pa-sm text-green">
<div class="q-pa-sm text-green-8">
สถานะช่วงบ่าย
<q-select
ref="afternoonStatusRef"

2
src/modules/09_leave/components/3_Report/DetailReport.vue
View file

@ -278,7 +278,7 @@ async function updateLeaveday() {
dateStart.value = new Date(year.value, 9, 1);
dateEnd.value = new Date(year.value + 1, 2, 31);
} else if (yearType.value === "SECONDHAFT") {
dateStart.value = new Date(year.value + 1, 2, 31);
dateStart.value = new Date(year.value + 1, 3, 1);
dateEnd.value = new Date(year.value + 1, 8, 30);
}