diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
index e8b7cc58..c03a5368 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
@@ -15,7 +15,7 @@ import CaptchaModal from "../../components/captchaModal";
import "./index.less";
import { getQueryString } from "../../util/url";
-const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent);
+const isPhone = /(iPhone|iPad|iPod|iOS|Android)/i.test(window.navigator.userAgent);
const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
const { getLabel } = WeaLocaleProvider;
@@ -132,8 +132,8 @@ export const ConfirmBtns = (props) => {
}
{
- ((props.showFeedback === "1" && !isIPhone) || (props.showFeedback === "1" && isIPhone && isEm)) &&
+ ((props.showFeedback === "1" && !isPhone) || (props.showFeedback === "1" && isEm)) &&
}
;
-};
+};
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 45ee98bb..f737061b 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -445,7 +445,9 @@ export const MonthRangePicker = (props) => {
{
- return current && endDate && current.getTime() > new Date(endDate).getTime();
+ // 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));
}}
format="YYYY-MM"
onChange={(val) => onChange([val, endDate])}
@@ -507,4 +509,4 @@ export const getSalaryMonthValue = (dateType) => {
break;
}
return [start, end];
-};
+};
\ No newline at end of file