diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js index 550f4b27..b49608a5 100644 --- a/pc4mobx/hrmSalary/pages/payroll/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/index.js @@ -398,9 +398,20 @@ export default class Payroll extends React.Component { {this.handleUpdateSave()}} + editable={false} selectedTab={selectedTab} + customOperate={ + { + selectedTab == 0 && + } + { + selectedTab == 1 && + + + + + } + } subItemChange={ (item) => {this.setState({selectedTab: item.key})} } diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js index 1413baf7..89629c82 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js @@ -44,7 +44,7 @@ export default class ComputerTemplate extends React.Component {
{ this.salaryItemSet.length > 0 && - this.salaryItemSet.map(group => ( + this.salaryItemSet.map((group,index) => (
{group.groupName} @@ -56,7 +56,7 @@ export default class ComputerTemplate extends React.Component { {item.name} - {item.salaryItemValue} + {index == 0 ? item.salaryItemValue : 10000} )) @@ -64,9 +64,7 @@ export default class ComputerTemplate extends React.Component {
)) - } -
{ diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js index 1ea6dce8..a087f32e 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js @@ -16,8 +16,6 @@ export default class TemplatePreview extends React.Component { } } - - handleSelectClick(selectKey) { this.setState({selectKey}) } diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js index 571d607d..61971ebb 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js @@ -3,41 +3,78 @@ import { Row, Col} from 'antd' import background from '../computerTemplate/background.png' import "../index.less" import { inject, observer } from 'mobx-react'; +import moment from 'moment' @inject('payrollStore') @observer export default class PhoneTemplate extends React.Component { + constructor(props) { + super(props); + this.templateBaseData = {} + this.salaryItemSetStr = {} + this.salaryTemplateShowSet = [] + } + + + componentWillMount() { + let templateBaseDataStr = window.localStorage.getItem("templateBaseData"); + this.templateBaseData = JSON.parse(templateBaseDataStr) + let salaryTemplateShowSetStr = window.localStorage.getItem("salaryTemplateShowSet"); + let salaryItemSetStr = window.localStorage.getItem("salaryItemSet"); + this.salaryItemSet = JSON.parse(salaryItemSetStr) + this.salaryTemplateShowSet = JSON.parse(salaryTemplateShowSetStr) + } + render() { return (
薪酬预览
- 测试标题 + {this.salaryTemplateShowSet.theme.replace("${companyName}", "上海泛微").replace("${salaryMonth}", moment(new Date()).format("YYYY-MM"))}
- + +
+ + +
+ { + this.salaryTemplateShowSet.textContentPosition == 1 && this.salaryTemplateShowSet.textContent + }
-
- - 员工信息 - - - - 个税扣缴义务人 - 上海泛微 - 姓名 - 张三 - + { + this.salaryItemSet.length > 0 && + this.salaryItemSet.map((group,index) => ( +
+ + {group.groupName} + + + + { + group.items && group.items.map(item => ( + + + {item.name} + {index == 0 ? item.salaryItemValue : 10000} + + + )) + } + +
+ )) + } +
- - 部门 - 研发部 - -
+
+ { + this.salaryTemplateShowSet.textContentPosition == 2 && this.salaryTemplateShowSet.textContent + }
)