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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m31s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-29 10:55:56 +07:00
commit 423b9f5fe3
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/05_leave/interface/index/main.ts
View file

@ -43,6 +43,7 @@ interface LeaveItem {
all: number;
use: number;
remain: number;
leaveCountApproveCount: number;
}
interface MainList {

26
src/modules/05_leave/views/Main.vue
View file

@ -141,12 +141,14 @@ async function fetchStatsTable() {
value:
el.leaveLimit > 0
? Math.round(
(Number(el.leaveCountApprove) / Number(el.leaveLimit)) * 100
(Number(el.leaveCountApprove) / Number(el.leaveLimit)) *
100,
)
: 0,
all: Number(el.leaveLimit),
use: el.leaveCountApprove,
remain: Number(el.leaveLimit) - Number(el.leaveCountApprove),
leaveCountApproveCount: el.leaveCountApproveCount,
}));
});
stat.forEach((item) => itemPie.value.push(...item));
@ -254,7 +256,7 @@ onMounted(async () => {
</q-knob>
</div>
<div class="col-12 text-center text-weight-medium">
ลาพักผ่อน
{{ item.text }}
</div>
</div>
<div class="row gt-xs"><q-separator vertical /></div>
@ -262,17 +264,19 @@ onMounted(async () => {
<div class="col-12 row text-dark text-body2 items-center">
<div class="col-12 row q-pa-xs q-px-md row">
<span class="text-grey-7 col-6">ได้รับ</span>
<span class="text-weight-bold">{{ item.all }}</span>
<span class="text-weight-bold">{{ item.all }} วัน</span>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 row q-pa-xs q-px-md">
<span class="text-grey-7 col-6">ใช้ไป</span>
<span class="text-weight-bold">{{ item.use }}</span>
<span class="text-weight-bold">{{ item.use }} วัน </span>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 row q-pa-xs q-px-md">
<span class="text-grey-7 col-6">คงเหลือ</span>
<span class="text-weight-bold">{{ item.remain }}</span>
<span class="text-weight-bold"
>{{ item.remain }} วัน</span
>
</div>
</div>
</div>
@ -294,11 +298,11 @@ onMounted(async () => {
flat
class="shadow-0 col-12 fit row items-center q-px-lg"
>
<div class="text-subtitle2 col-4">ลาป่วย</div>
<div class="text-subtitle2 col-4">{{ item.text }}</div>
<div class="text-subtitle2 col-8">
<span class="text-grey-7 q-pr-md">ใช้ไป</span>
<span class="text-weight-bold">{{ item.use }}</span>
<!-- <span class="text-grey-7 q-pl-md">ลา</span> -->
<span class="text-weight-bold">{{ item.use }} วัน </span>
({{ item.leaveCountApproveCount }} ครั้ง)
</div>
</q-card>
</div>
@ -317,11 +321,11 @@ onMounted(async () => {
flat
class="shadow-0 col-12 fit row items-center q-px-lg"
>
<div class="text-subtitle2 col-4">ลากิจส่วนตัว</div>
<div class="text-subtitle2 col-4">{{ item.text }}</div>
<div class="text-subtitle2 col-8">
<span class="text-grey-7 q-pr-md">ใช้ไป</span>
<span class="text-weight-bold">{{ item.use }}</span>
<!-- <span class="text-grey-7 q-pl-md">ลา</span> -->
<span class="text-weight-bold">{{ item.use }} วัน </span>
({{ item.leaveCountApproveCount }} ครั้ง)
</div>
</q-card>
</div>