Merge branch 'develop' into develop-tee

This commit is contained in:
setthawutttty 2023-06-14 16:55:24 +07:00
commit 5f1dea146e
13 changed files with 1157 additions and 271 deletions

View file

@ -165,7 +165,8 @@ onMounted(async () => {
fiscalYearFilter()
examTimeFilter()
examTypeFilter()
expiredAccountFilter()
await expiredAccountFilter()
searchFilterTable()
})
//
@ -276,7 +277,7 @@ const expiredAccountFilter = async () => {
const currentDate = new Date();
const updatedRows = OriginalData.value.map((data) => {
let expirationDate = new Date(data.accountExpirationDate);
let isExpired = expirationDate < currentDate;
let isExpired = expirationDate < currentDate
return { ...data, isExpired };
});

View file

@ -165,7 +165,8 @@ onMounted(async () => {
fiscalYearFilter()
examTimeFilter()
examTypeFilter()
expiredAccountFilter()
await expiredAccountFilter()
searchFilterTable()
})
//
@ -276,7 +277,7 @@ const expiredAccountFilter = async () => {
const currentDate = new Date();
const updatedRows = OriginalData.value.map((data) => {
let expirationDate = new Date(data.accountExpirationDate);
let isExpired = expirationDate < currentDate;
let isExpired = expirationDate < currentDate
return { ...data, isExpired };
});