qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线 

# Conflicts:
#	pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
This commit is contained in:
黎永顺 2026-03-11 15:34:04 +08:00
parent 11ac14d440 65659c5990
commit f202c8d4cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
View File

@ -450,7 +450,7 @@ export const MonthRangePicker = (props) => {
disabledDate={(current) => { disabledDate={(current) => {
// 20251212前版本(问题时不能选到当月) // 20251212前版本(问题时不能选到当月)
// return current && endDate && current.getTime() > new Date(endDate).getTime(); // return current && endDate && current.getTime() > new Date(endDate).getTime();
return current && endDate && moment(`${new Date(current.getTime()).getFullYear()}-${new Date(current.getTime()).getMonth() + 1}`).isAfter(moment(endDate)); return current && endDate && moment(`${new Date(current.getTime()).getFullYear()}-${String(new Date(current.getTime()).getMonth() + 1).padStart(2, '0')}`).isAfter(moment(endDate));
}} }}
format="YYYY-MM" format="YYYY-MM"
onChange={(val) => onChange([val, endDate])} onChange={(val) => onChange([val, endDate])}