diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index deb70763..e5f8e66f 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -115,7 +115,8 @@ class EditCalcTable extends Component { "锁定的项目值": getLabel(543647, "锁定的项目值"), "当前状态锁定,点击解锁": getLabel(111, "当前状态锁定,点击解锁"), "当前状态未锁定,点击锁定": getLabel(111, "当前状态未锁定,点击锁定"), - "共": getLabel(18609, "共"), "条": getLabel(18256, "条") + "共": getLabel(18609, "共"), "条": getLabel(18256, "条"), + "总计": getLabel(523, "总计") }; const childFrameObj = document.getElementById("atdTable"); childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*"); @@ -139,8 +140,9 @@ class EditCalcTable extends Component { const { list: dataSource, pageNum: current, pageSize, total } = list; this.setState({ pageInfo: { ...pageInfo, current, pageSize, total } }, () => { const { pageInfo, selectedRowKeys } = this.state; + const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : ""; this.postMessageToChild({ - dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, + dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload, columns: _.map(traverse(columns), (it, idx) => ({ ...it, fixed: idx < 2 ? "left" : false })) }); });