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

Merge branch 'develop' into warunee-dev

Browse source 
# Conflicts:
#	src/modules/09_leave/components/4_specialTime/Table.vue
#	src/modules/09_leave/stores/SpecialTimeStore.ts
#	src/modules/09_leave/views/SpecialTimeMain.vue
This commit is contained in:
Warunee Tamkoo 2023-11-03 15:29:11 +07:00
commit 36539b2274
6 changed files with 314 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/09_leave/views/SpecialTimeMain.vue
View file

@ -47,6 +47,7 @@ const resetFilter = () => {
onMounted(async () => {
fecthList([
{
id: "00000000-0000-0000-0000-000000000000",
fullname: "นางสาวณัฐกา ชมสิน",
date: "2023-11-01 08:54",
dateFix: "2023-10-30",
@ -57,6 +58,7 @@ onMounted(async () => {
status: "PENDING",
},
{
id: "00000000-0000-0000-0000-000000000000",
fullname: "นางสาวรัชภรณ์ ภักดี",
date: "2023-10-30 08:55",
dateFix: "2023-10-29",
@ -67,6 +69,7 @@ onMounted(async () => {
status: "APPROVE",
},
{
id: "00000000-0000-0000-0000-000000000000",
fullname: "นางสาวภาพรรณ ลออ",
date: "2023-10-31 18:54",
dateFix: "2023-10-30",
@ -220,6 +223,9 @@ const monthYearThai = (val: any) => {
unelevated
>อนุมัติ</q-btn
>
<q-badge v-if="props.row.status == 'APPROVE'" rounded outline color="green" label="อนุมัติ" />
<q-badge v-if="props.row.status == 'REJECT'" rounded outline color="red" label="ไม่อนุมัติ" />
</q-td>
</q-tr>
</template>