diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js index 10f914c5..60e774fe 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js @@ -1,6 +1,6 @@ import React from 'react' -import { Row, Col, Upload, Icon, Radio, Switch } from 'antd' -import { WeaInput } from 'ecCom' +import { Row, Col, Upload, Icon, Radio, Switch, Modal } from 'antd' +import { WeaInput, WeaDraggable } from 'ecCom' import { inject, observer } from 'mobx-react'; import BackgroundUpload from '../components/backgroundUpload' import RequiredLabelTip from '../../../components/requiredLabelTip'; @@ -68,6 +68,26 @@ export default class ShowSettingForm extends React.Component { setSalaryItemSet(resultSalaryItemSet) } + handleDrag(data1, data2) { + console.log("data1:", data1); + console.log("data2:", data2); + } + + handleDeleteClick(index) { + Modal.confirm({ + title: '信息确认', + content: '确认删除', + onOk:() => { + const {payrollStore: {salaryItemSet, setSalaryItemSet}} = this.props; + let resultSalaryItemSet = [...salaryItemSet] + resultSalaryItemSet.splice(index, 1) + setSalaryItemSet(resultSalaryItemSet) + }, + onCancel: () => { + }, + }); + } + render() { const { payrollStore } = this.props; const { salaryTemplateShowSet } = payrollStore; @@ -169,20 +189,24 @@ export default class ShowSettingForm extends React.Component {
{ salaryItemSet.map((group, index) => ( -
+
{group.groupName} { index < salaryItemSet.length - 1 && - {this.handleDownClick(index)}} /> } { - index > 0 && 0 && {this.handleUpClick(index)}}/> } -
+ + { + this.handleDeleteClick(index) + }}/> +
{group.items.map(item => ( {item.name} {this.handleDeleteItem(group, item)}}/> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index 4bed2c92..f8580d31 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -449,7 +449,10 @@ export default class StandingBook extends React.Component {
it.dataIndex !== "id")} + columns={_.filter(columns, (it) => it.dataIndex !== "id").map(item => { + item.width = "150px" + return item + })} dataSource={list} total={total} current={this.state.current} @@ -461,6 +464,7 @@ export default class StandingBook extends React.Component { this.pageInfo = {current, pageSize} this.handleShowSizeChange(this.pageInfo) }} + scroll={{x: 2300}} /> {dialogProps.visible && (