diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js index 0f449c15..aecdd764 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js @@ -45,6 +45,8 @@ export default class CompareDetail extends React.Component {
+ + ) } diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index 3d54261c..f8f8d639 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -6,6 +6,9 @@ import WarningModal from './warningModal' import "./index.less" import EditSalaryDetail from './editSalaryDetail' import SlideModalTitle from "../../components/slideModalTitle" +import ImportModal from '../../components/importModal' +import { columns } from '../salaryItem/columns' + export default class SalaryDetail extends React.Component { constructor(props) { @@ -24,8 +27,35 @@ export default class SalaryDetail extends React.Component { }) } } + + renderFormComponent() { + return ( +
+ 项目1 + 项目2 + 项目3 + +
+ ) + } + + headerSetCompoent() { + return ( +
+ + +
+ ) + } + render() { const { slideVisiable } = this.state; + return (
@@ -67,6 +97,7 @@ export default class SalaryDetail extends React.Component { showMask={true} closeMaskOnClick={() => this.setState({slideVisiable: false})} /> } +
) }