dev #130

Merged
joseph merged 52 commits from dev into master 2025-06-30 18:37:39 +10:00
1 changed files with 28 additions and 28 deletions
Showing only changes of commit d5936087ff - Show all commits

View File

@ -69,17 +69,17 @@ interface UserData {
monthlyLeaveDays: MonthlyLeaveDays[] monthlyLeaveDays: MonthlyLeaveDays[]
} }
interface DataReason { // interface DataReason {
id: number // id: number
c_code: string // c_code: string
c_name: string // c_name: string
} // }
interface DataTimeType { // interface DataTimeType {
id: number // id: number
c_code: string // c_code: string
c_name: string // c_name: string
} // }
const LeaveManagement = () => { const LeaveManagement = () => {
const [opened1, { open: open1, close: close1 }] = useDisclosure(false) const [opened1, { open: open1, close: close1 }] = useDisclosure(false)
@ -118,24 +118,24 @@ const LeaveManagement = () => {
const currentMonth = now.getMonth() + 1 // getMonth() trả về 0-11 const currentMonth = now.getMonth() + 1 // getMonth() trả về 0-11
const currentYear = now.getFullYear() const currentYear = now.getFullYear()
const getListMasterByType = async (type: string) => { // const getListMasterByType = async (type: string) => {
try { // try {
const params = { // const params = {
type: type, // type: type,
} // }
const res = await get(getListMaster, params) // const res = await get(getListMaster, params)
if (res.status) { // if (res.status) {
return res.data // return res.data
} // }
} catch (error: any) { // } catch (error: any) {
notifications.show({ // notifications.show({
title: 'Error', // title: 'Error',
message: error.message ?? error, // message: error.message ?? error,
color: 'red', // color: 'red',
}) // })
} // }
return [] // return []
} // }
// useEffect(() => { // useEffect(() => {
// const fetchData = async () => { // const fetchData = async () => {