qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

custom/西部信托0401

This commit is contained in:
lys 2025-11-13 15:09:35 +08:00
parent b88232bdda
commit 62ec9094af
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc4mobx/hrmSalary/pages/custom-pages/xbxt/personalSalaryReport.js
View File

@ -13,7 +13,7 @@ import { WeaLocaleProvider, WeaTop } from "ecCom";
import { MonthRangePicker } from "../../reportView/components/statisticalMicroSettingsSlide"; import { MonthRangePicker } from "../../reportView/components/statisticalMicroSettingsSlide";
import { postFetch } from "../../../util/request"; import { postFetch } from "../../../util/request";
import moment from "moment"; import moment from "moment";
import { Spin } from "antd"; import { message, Spin } from "antd";
import "./index.less"; import "./index.less";
const getLabel = WeaLocaleProvider.getLabel; const getLabel = WeaLocaleProvider.getLabel;
@ -67,6 +67,10 @@ class PersonalSalaryReport extends Component {
getSalaryReport = (props) => { getSalaryReport = (props) => {
const { pageInfo, dateRange: pageDateRange } = this.state, { dateRange } = props || this.props; const { pageInfo, dateRange: pageDateRange } = this.state, { dateRange } = props || this.props;
const [startDateStr, endDateStr] = dateRange || pageDateRange; const [startDateStr, endDateStr] = dateRange || pageDateRange;
if (!startDateStr || !endDateStr) {
message.warning(getLabel(111, "请选择薪资所属月!"));
return;
}
const payload = { startDateStr, endDateStr, ...pageInfo }; const payload = { startDateStr, endDateStr, ...pageInfo };
this.setState({ loading: true }); this.setState({ loading: true });
postFetch("/api/bs/hrmsalary/report/statistics/employee/salaryReport", payload).then(({ status, data }) => { postFetch("/api/bs/hrmsalary/report/statistics/employee/salaryReport", payload).then(({ status, data }) => {

6
pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
View File

@ -27,8 +27,8 @@ class Index extends Component {
selectedKey: "0", sysinfo: {}, tabs: [], store: { loading: false, hasRight: false }, selectedKey: "0", sysinfo: {}, tabs: [], store: { loading: false, hasRight: false },
logDialogVisible: false, filterConditions: "[]", captchaVisible: false, logDialogVisible: false, filterConditions: "[]", captchaVisible: false,
salaryYearMonth: [ salaryYearMonth: [
moment().subtract(1, "year").startOf("year").format("YYYY-MM"), moment(new Date()).subtract(11, "months").format("YYYY-MM"),
moment().endOf("year").format("YYYY-MM") moment(new Date()).format("YYYY-MM")
] ]
}; };
} }
@ -111,7 +111,7 @@ class Index extends Component {
const btns = [ const btns = [
<div className="flex-salary"> <div className="flex-salary">
<div className="mysalary-search-title">{getLabel(542604, "薪资所属月")}</div> <div className="mysalary-search-title">{getLabel(542604, "薪资所属月")}</div>
<MonthRangePicker dateRange={salaryYearMonth} viewAttr={2} <MonthRangePicker dateRange={salaryYearMonth} viewAttr={2} isOneYear
onChange={v => this.setState({ salaryYearMonth: v })}/> onChange={v => this.setState({ salaryYearMonth: v })}/>
</div> </div>
]; ];

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

@ -442,12 +442,15 @@ const StatisticalScopePicker = (props) => {
</div>; </div>;
}; };
export const MonthRangePicker = (props) => { export const MonthRangePicker = (props) => {
const { dateRange, onChange, viewAttr, disabled = false } = props; const { dateRange, onChange, viewAttr, disabled = false, isOneYear = false } = props;
const [startDate, endDate] = dateRange || []; const [startDate, endDate] = dateRange || [];
return <div className="rangePickerBox"> return <div className="rangePickerBox">
<WeaDatePicker <WeaDatePicker
value={startDate} disabled={disabled} value={startDate} disabled={disabled}
disabledDate={(current) => { disabledDate={(current) => {
if (isOneYear) {
return current && endDate && ((current.getTime() > new Date(endDate).getTime()) || (current.getTime() < new Date(moment(endDate).subtract(12, "months").format("YYYY-MM")).getTime()));
}
return current && endDate && current.getTime() > new Date(endDate).getTime(); return current && endDate && current.getTime() > new Date(endDate).getTime();
}} }}
format="YYYY-MM" format="YYYY-MM"
@ -458,6 +461,9 @@ export const MonthRangePicker = (props) => {
<WeaDatePicker <WeaDatePicker
value={endDate} disabled={disabled} value={endDate} disabled={disabled}
disabledDate={(current) => { disabledDate={(current) => {
if (isOneYear) {
return current && startDate && ((current.getTime() < new Date(startDate).getTime()) || (current.getTime() > new Date(moment(startDate).add(12, "months").format("YYYY-MM")).getTime()));
}
return current && startDate && current.getTime() < new Date(startDate).getTime(); return current && startDate && current.getTime() < new Date(startDate).getTime();
}} }}
format="YYYY-MM" format="YYYY-MM"