diff --git a/pc4mobx/hrmSalary/pages/custom-pages/xbxt/personalSalaryReport.js b/pc4mobx/hrmSalary/pages/custom-pages/xbxt/personalSalaryReport.js index bd77c193..49471b95 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/xbxt/personalSalaryReport.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/xbxt/personalSalaryReport.js @@ -13,7 +13,7 @@ import { WeaLocaleProvider, WeaTop } from "ecCom"; import { MonthRangePicker } from "../../reportView/components/statisticalMicroSettingsSlide"; import { postFetch } from "../../../util/request"; import moment from "moment"; -import { Spin } from "antd"; +import { message, Spin } from "antd"; import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -67,6 +67,10 @@ class PersonalSalaryReport extends Component { getSalaryReport = (props) => { const { pageInfo, dateRange: pageDateRange } = this.state, { dateRange } = props || this.props; const [startDateStr, endDateStr] = dateRange || pageDateRange; + if (!startDateStr || !endDateStr) { + message.warning(getLabel(111, "请选择薪资所属月!")); + return; + } const payload = { startDateStr, endDateStr, ...pageInfo }; this.setState({ loading: true }); postFetch("/api/bs/hrmsalary/report/statistics/employee/salaryReport", payload).then(({ status, data }) => { diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js index d4190df1..ca2cb3d9 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js @@ -27,8 +27,8 @@ class Index extends Component { selectedKey: "0", sysinfo: {}, tabs: [], store: { loading: false, hasRight: false }, logDialogVisible: false, filterConditions: "[]", captchaVisible: false, salaryYearMonth: [ - moment().subtract(1, "year").startOf("year").format("YYYY-MM"), - moment().endOf("year").format("YYYY-MM") + moment(new Date()).subtract(11, "months").format("YYYY-MM"), + moment(new Date()).format("YYYY-MM") ] }; } @@ -111,7 +111,7 @@ class Index extends Component { const btns = [