diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 8efddabf..e10d3591 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -115,12 +115,14 @@ export default class NormalIndex extends Component { return sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" }); }; siaccountDetailCommonListSum = () => { + const { searchValue: userName } = this.state; const { billMonth, paymentOrganization } = this.props; - return siaccountDetailCommonListSum({ billMonth, paymentOrganization }); + return siaccountDetailCommonListSum({ billMonth, paymentOrganization, userName }); }; siaccountDetailSupplementaryListSum = () => { + const { searchValue: userName } = this.state; const { billMonth, paymentOrganization } = this.props; - return siaccountDetailSupplementaryListSum({ billMonth, paymentOrganization }); + return siaccountDetailSupplementaryListSum({ billMonth, paymentOrganization, userName }); }; componentWillUnmount() { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js index 3c24e94e..477de105 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js @@ -79,15 +79,19 @@ class RegList extends Component { sysConfCodeRule = () => { return sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" }); }; - siaccountDetailRecessionListSum = () => { + siaccountDetailRecessionListSum = (module = {}) => { + const paymentStatus = "3"; + const creator = Number(getQueryString("creator")); const billMonth = getQueryString("billMonth"); const paymentOrganization = getQueryString("paymentOrganization"); - return siaccountDetailRecessionListSum({ billMonth, paymentOrganization }); + return siaccountDetailRecessionListSum({ creator, paymentStatus, billMonth, paymentOrganization, ...module }); }; - siaccountDetailBalanceListSum = () => { + siaccountDetailBalanceListSum = (module = {}) => { + const paymentStatus = "3"; + const creator = Number(getQueryString("creator")); const billMonth = getQueryString("billMonth"); const paymentOrganization = getQueryString("paymentOrganization"); - return siaccountDetailBalanceListSum({ billMonth, paymentOrganization }); + return siaccountDetailBalanceListSum({ creator, paymentStatus, billMonth, paymentOrganization, ...module }); }; componentWillReceiveProps(nextProps, nextContext) { @@ -103,8 +107,12 @@ class RegList extends Component { handleResetSelectRowKeys = (selectedRowKeys) => { this.setState({ selectedRowKeys }); }; - recessionList = (module) => { + recessionList = async (module) => { const { type } = this.props; + const { status: sysStatus, data: sysData } = await this.sysConfCodeRule(); + const { data: { sumRow: siaccountSum } } = type === "regression" ? + await this.siaccountDetailRecessionListSum({ ...module }) : + await this.siaccountDetailBalanceListSum({ ...module }); const { loading, pageInfo } = this.state; const billMonth = getQueryString("billMonth"); const paymentOrganization = getQueryString("paymentOrganization"); @@ -125,7 +133,9 @@ class RegList extends Component { this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, - columns + columns, + showSum: sysStatus && sysData === "1", + siaccountSum }, () => this.postMessageToChild()); } }).catch(() => {