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

Merge branch 'fenquan' into release-zhongjiang

This commit is contained in:
MustangDeng 2022-06-14 16:53:29 +08:00
parent 0ce5d93199 a39b9d606a
commit 86c56e2140
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
View File

@ -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 {
<div className="itemContent">
{
salaryItemSet.map((group, index) => (
<div className="configItemWrapper">
<div className="configItemWrapper" >
<div className="configTitle">{group.groupName}
{
index < salaryItemSet.length - 1 &&
<Icon type="caret-down" style={{marginLeft: "10px" , cursor: "pointer"}}
<Icon type="caret-down" style={{marginLeft: "10px" , cursor: "pointer", color: "#666"}}
onClick={() => {this.handleDownClick(index)}}
/>
}
{
index > 0 && <Icon type="caret-up" style={{marginLeft: "10px", cursor: 'pointer'}}
index > 0 && <Icon type="caret-up" style={{marginLeft: "10px", cursor: 'pointer', color: "#666"}}
onClick={() => {this.handleUpClick(index)}}/>
}
</div>
<i className="icon-coms-Delete" style={{cursor: "pointer", color: '#666', marginLeft: "10px"}} onClick={() => {
this.handleDeleteClick(index)
}}/>
</div>
<div className="configContent">
{group.items.map(item => (
<span className="editItem">{item.name} <Icon type="cross" style={{cursor: "pointer"}} onClick={() => {this.handleDeleteItem(group, item)}}/></span>

6
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
View File

@ -449,7 +449,10 @@ export default class StandingBook extends React.Component {
</div>
<CustomPaginationTable
loading={loading}
columns={_.filter(columns, (it) => 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 && (