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/2.19.1.2501.01-个税

This commit is contained in:
黎永顺 2026-01-22 14:50:50 +08:00
parent a5afaefad5 680c4a0506
commit b097bb292d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
View File

@ -15,7 +15,7 @@ import CaptchaModal from "../../components/captchaModal";
import "./index.less"; import "./index.less";
import { getQueryString } from "../../util/url"; 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 isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
const { getLabel } = WeaLocaleProvider; const { getLabel } = WeaLocaleProvider;
@ -132,8 +132,8 @@ export const ConfirmBtns = (props) => {
<Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button> <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> <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
} }
</div>; </div>;
}; };

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

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