|
|
@@ -155,7 +155,7 @@
|
|
|
item.userId === userInfos.id &&
|
|
|
item.outStatus !== 20 &&
|
|
|
item.outStatus !== 30 &&
|
|
|
- isEndTimeInFirstTenDays(item.endTime)
|
|
|
+ isEndTimeInFirstTenDays(item.startTime,item.endTime)
|
|
|
"
|
|
|
style="text-align: right; width: 100%"
|
|
|
>
|
|
|
@@ -478,20 +478,13 @@
|
|
|
}
|
|
|
|
|
|
// 判断endtime是否在当前月份的前10天内
|
|
|
- const isEndTimeInFirstTenDays = (endTime: string) => {
|
|
|
- if (!endTime) return false
|
|
|
-
|
|
|
- const endDate = dayjs(endTime)
|
|
|
- const today = dayjs()
|
|
|
-
|
|
|
- // 检查endtime是否在当前月份
|
|
|
- if (endDate.year() !== today.year() || endDate.month() !== today.month()) {
|
|
|
- return false
|
|
|
- }
|
|
|
-
|
|
|
- // 检查endtime是否在当前月份的前10天
|
|
|
- const dayOfMonth = endDate.date()
|
|
|
- return dayOfMonth <= 10
|
|
|
+ const isEndTimeInFirstTenDays = (startTime: string,endTime: string) => {
|
|
|
+ if (!startTime || !endTime) return false;
|
|
|
+ const startDate = dayjs(startTime).startOf('day');
|
|
|
+ const endDate10 = dayjs(endTime).date(10).endOf('day');
|
|
|
+ const today = dayjs();
|
|
|
+ const todayStart = today.startOf('day');
|
|
|
+ return todayStart.valueOf() >= startDate.valueOf() && todayStart.valueOf() <= endDate10.valueOf();
|
|
|
}
|
|
|
|
|
|
onMounted(() => {
|