Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税

Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
# Conflicts: # pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
2026-03-23 16:27:50 +08:00 · 2026-03-11 15:34:04 +08:00 · 2026-03-11 15:30:53 +08:00
1 changed files with 1 additions and 1 deletions
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@ -450,7 +450,7 @@ export const MonthRangePicker = (props) => {
      disabledDate={(current) => {
        // 20251212前版本(问题时不能选到当月)
        // 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"
      onChange={(val) => onChange([val, endDate])}
Author	SHA1	Message	Date
黎永顺	421ea79038	Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税	2026-03-23 16:27:50 +08:00
黎永顺	f202c8d4cb	Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线 # Conflicts: # pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js	2026-03-11 15:34:04 +08:00
黎永顺	65659c5990	release/2.19.1.2501.01	2026-03-11 15:30:53 +08:00