pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js

@@ -15,7 +15,7 @@ import CaptchaModal from "../../components/captchaModal";
 import "./index.less";
 import { getQueryString } from "../../util/url";
 
-const isPhone = /(iPhone|iPad|iPod|iOS|Android)/i.test(window.navigator.userAgent);
+const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "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" && !isPhone) || (props.showFeedback === "1" && isEm)) &&
+      ((props.showFeedback === "1" && !isIPhone) || (props.showFeedback === "1" && isIPhone && isEm)) &&
       <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
     }
   </div>;
-};
+};

pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js

@@ -445,9 +445,7 @@ export const MonthRangePicker = (props) => {
     <WeaDatePicker
       value={startDate} disabled={disabled}
       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 && current.getTime() > new Date(endDate).getTime();
       }}
       format="YYYY-MM"
       onChange={(val) => onChange([val, endDate])}
@@ -509,4 +507,4 @@ export const getSalaryMonthValue = (dateType) => {
       break;
   }
   return [start, end];
-};
+};