qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发 

1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
This commit is contained in:
黎永顺 2024-03-27 10:11:30 +08:00
parent 7fcc3594e5
commit e5078dc37b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
View File

@ -36,7 +36,9 @@ class SalaryDetails extends Component {
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.isQuery !== this.props.isQuery) this.getSalaryList(nextProps);
if (nextProps.isQuery !== this.props.isQuery) this.setState({
pageInfo: { ...this.state.pageInfo, current: 1 }
}, () => this.getSalaryList(nextProps));
}
componentWillUnmount() {

2
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
View File

@ -331,7 +331,7 @@ class Index extends Component {
const tabs = [
{ key: "statistics", title: getLabel(111, "统计表") },
{ key: "detail", title: getLabel(111, "员工明细") },
// { key: "salaryDetail", title: getLabel(111, "薪资明细") }
{ key: "salaryDetail", title: getLabel(111, "薪资明细") }
];
return (
<WeaReqTop

2
pc4mobx/hrmSalary/util/index.js
View File

@ -138,7 +138,7 @@ export const getIframeParentHeight = (selector, total, extraHeight) => {
const dom = document.querySelector(selector);
let height = 280;
if (dom && total > 0) {
height = (parseFloat(dom.style.height) > 620 && total === 10) ? total * 48 + 108: total < 10 ? total * 48 + 108 : parseFloat(dom.style.height) - extraHeight;
height = (parseFloat(dom.style.height) > 620 && total === 10) ? total * 48 + 108 : total < 10 ? (total + 1) * 48 + 108 : parseFloat(dom.style.height) - extraHeight;
}
return height;
};