From a594d4653a82a7967ce705a3880ad194a60ba25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 10 Feb 2026 17:48:48 +0800 Subject: [PATCH] =?UTF-8?q?release/2.19.1.2501.01-=E4=B8=AA=E7=A8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/interfaceFlowStatistics.js | 15 ++++++++++----- .../components/monthStaticsDetailDialog/index.js | 12 ++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/interfaceFlowStatistics.js b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/interfaceFlowStatistics.js index 864fcc2e..8db909b5 100644 --- a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/interfaceFlowStatistics.js +++ b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/interfaceFlowStatistics.js @@ -35,7 +35,7 @@ class InterfaceFlowStatistics extends Component { }, columns: [], dataSource: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, - loading: false, visible: false + loading: false, detailDialog: { visible: false, taxAgentId: "" } }; } @@ -97,7 +97,7 @@ class InterfaceFlowStatistics extends Component { }; render() { - const { statisticsInfo, pageInfo, loading, dataSource, columns, visible } = this.state; + const { statisticsInfo, pageInfo, loading, dataSource, columns, detailDialog } = this.state; const { staticData } = statisticsInfo; const pagination = { ...pageInfo, @@ -148,15 +148,20 @@ class InterfaceFlowStatistics extends Component { ...columns, { title: getLabel(30585, "操作"), dataIndex: "operate", - render: () => ( this.setState({ visible: true })}>{getLabel(111, "月统计详情")}) + render: (__, record) => ( this.setState({ + detailDialog: { + visible: true, taxAgentId: record.taxAgentId + } + })}>{getLabel(111, "月统计详情")}) } ]} scroll={{ y: `calc(100vh - 190px)` }} /> } - this.setState({ visible: false })}/> + this.setState({ detailDialog: { visible: false, taxAgentId: "" } })}/> ); } diff --git a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/monthStaticsDetailDialog/index.js b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/monthStaticsDetailDialog/index.js index be830dc4..e8b0ddef 100644 --- a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/monthStaticsDetailDialog/index.js +++ b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/monthStaticsDetailDialog/index.js @@ -18,13 +18,13 @@ class MonthStaticsDetailDialog extends Component { constructor(props) { super(props); this.state = { - dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 }, + dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false }; } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.visible !== this.props.visible && nextProps.visible) this.getStatisticsDetailList(); + if (nextProps.visible !== this.props.visible && nextProps.visible) this.getStatisticsDetailList(nextProps); if (nextProps.visible !== this.props.visible && !nextProps.visible) { this.setState({ dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 }, @@ -33,14 +33,14 @@ class MonthStaticsDetailDialog extends Component { } } - getStatisticsDetailList = () => { - const { pageInfo } = this.state; - const payload = { ...pageInfo }; + getStatisticsDetailList = (props) => { + const { pageInfo } = this.state, { taxAgentId } = props || this.props; + const payload = { ...pageInfo, taxAgentId }; this.setState({ loading: true }); getStatisticsDetailList(payload).then(({ status, data }) => { this.setState({ loading: false }); if (status) { - const { columns, pageInfo: { list: dataSource, pageNum: current, pageSize, total } } = data; + const { columns, list: dataSource, pageNum: current, pageSize, total } = data; this.setState({ pageInfo: { current, pageSize, total }, dataSource, columns });