diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index 49b2c419..f094e5b0 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -247,7 +247,7 @@ class Index extends Component { }); queryList(payload, searchItemsValue, url).then(({ data, status }) => { this.setState({ loading: { ...loading, query: false } }); - if (status) { + if (status && selectedKey === _.lowerCase(data.listType)) { const { pageInfo: paganition } = data; const { list: dataSource, total, pageNum: current, pageSize } = paganition; this.setState({ diff --git a/pc4mobx/hrmSalary/pages/reportView/index.js b/pc4mobx/hrmSalary/pages/reportView/index.js index 2031c1c5..c315ae53 100644 --- a/pc4mobx/hrmSalary/pages/reportView/index.js +++ b/pc4mobx/hrmSalary/pages/reportView/index.js @@ -31,9 +31,9 @@ class Index extends Component { } componentDidMount() { - const { taxAgentStore: { getTaxAgentSelectListAsAdmin } } = this.props; + const { taxAgentStore: { fetchTaxAgentOption } } = this.props; this.reportGetForm(); - getTaxAgentSelectListAsAdmin(); + fetchTaxAgentOption(); } reportGetForm = () => { @@ -98,7 +98,7 @@ class Index extends Component { render() { const { report, dimensionList, statisticalPayload } = this.state; - const { attendanceStore: { settingForm }, taxAgentStore: { taxAgentAdminOption } } = this.props; + const { attendanceStore: { settingForm }, taxAgentStore: { taxAgentOption } } = this.props; return ( { if (this.reportRef.state.loading) { - message.info(getLabel(111, "列表正在加载中,请稍后")) + message.info(getLabel(111, "列表正在加载中,请稍后")); } else { this.setState({ statisticalPayload: { visible: true, id: report.id, dimension: report.dimensionId } @@ -150,7 +150,7 @@ class Index extends Component { {/*统计数据范围及规则设置弹框*/} this.setState({ statisticalPayload: { visible: false, id: "", dimension: "" } }, () => isRefresh && this.reportRef.reportStatisticsReportGetData(report.id, report.dimensionId))}