From 5e5e109b7e283d5669949303f572ad57ee5d5856 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 13 Nov 2025 16:42:10 +0800
Subject: [PATCH 1/2] release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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) => {
       <Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button>
     }
     {
-      ((props.showFeedback === "1" && !isIPhone) || (props.showFeedback === "1" && isIPhone && isEm)) &&
+      ((props.showFeedback === "1" && !isPhone) || (props.showFeedback === "1" && isEm)) &&
       <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
     }
   </div>;
-};
+};
\ No newline at end of file

From 680c4a0506a29b4402091a6ad24083dd833d33e0 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 22 Dec 2025 10:51:10 +0800
Subject: [PATCH 2/2] release/2.19.1.2501.01

---
 .../reportView/components/statisticalMicroSettingsSlide.js  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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) => {
     <WeaDatePicker
       value={startDate} disabled={disabled}
       disabledDate={(current) => {
-        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