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

12
src/modules/09_leave/interface/request/specialTime.ts Normal file
View file

@ -0,0 +1,12 @@
interface ListData {
id: string;
fullname: string | null;
date: string | null;
dateFix: string | null;
startTimeMorning: string | null;
endTimeMorning: string | null;
startTimeAfternoon: string | null;
endTimeAfternoon: string | null;
status: string;
}
export type { ListData };

9
src/modules/09_leave/interface/response/specialTime.ts
View file

@ -1,11 +1,10 @@
interface DataRows {
id: string;
fullname: string | null;
date: string | null;
dateFix: string | null;
type: string;
reason: string;
timeStamp: string;
unapprove?: string; // Make these properties optional
approve?: string;
timeMorning: string;
timeAfternoon: string;
status: string;
}
export type { DataRows };