diff --git a/pc4mobx/hrmSalary/components/customTab/index.js b/pc4mobx/hrmSalary/components/customTab/index.js index 79b89389..a55d410a 100644 --- a/pc4mobx/hrmSalary/components/customTab/index.js +++ b/pc4mobx/hrmSalary/components/customTab/index.js @@ -12,15 +12,21 @@ export default class CustomTab extends React.Component { render() { return (
- { - this.setState({selectedKey: v}) - this.props.onChange(v); - }} - /> + { + this.props.topTab && { + this.setState({selectedKey: v}) + this.props.onChange(v); + }} + /> + } + { + this.props.leftOperation && this.props.leftOperation + } +
{ diff --git a/pc4mobx/hrmSalary/components/monthRange/index.js b/pc4mobx/hrmSalary/components/monthRange/index.js new file mode 100644 index 00000000..daeaf98d --- /dev/null +++ b/pc4mobx/hrmSalary/components/monthRange/index.js @@ -0,0 +1,22 @@ +import React from 'react'; +import { WeaDatePicker } from "ecCom"; +import "./index.less" + +export default class MonthRange extends React.Component { + render() { + return
+ {this.props.label}: + this.props.onStartDateChange(value)} + /> + + this.props.onEndDateChange(value)} + /> +
+ } +} diff --git a/pc4mobx/hrmSalary/components/monthRange/index.less b/pc4mobx/hrmSalary/components/monthRange/index.less new file mode 100644 index 00000000..c4dfea3c --- /dev/null +++ b/pc4mobx/hrmSalary/components/monthRange/index.less @@ -0,0 +1,11 @@ +.monthRange { + line-height: 47px; + .labelName { + margin-left: 10px; + margin-right: 10px; + } + .between { + margin-left: 10px; + margin-right: 10px; + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index a4cab7ed..d367a49a 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -4,13 +4,14 @@ import { toJS } from 'mobx'; import { Button, Table, DatePicker } from 'antd'; -import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable } from 'ecCom'; +import { WeaDatePicker, WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable } from 'ecCom'; import { renderNoright, getSearchs } from '../../../util'; // 渲染form数据的方法:因为多个页面都会使用,所以抽的公共方法在util中 import CustomTab from '../../../components/customTab'; import ContentWrapper from '../../../components/contentWrapper'; import { columns, dataSource } from './columns'; +import MonthRange from '../../../components/monthRange' const { MonthPicker } = DatePicker; @@ -21,7 +22,9 @@ export default class Attendance extends React.Component { super(props); this.state = { value: "", - selectedKey: "0" + selectedKey: "0", + startDate: "", + endDate: "" } } render() { @@ -57,10 +60,19 @@ export default class Attendance extends React.Component { ]; const renderSearchOperationItem = () => { - return
+ return
+ + +
} + const renderLeftOperation = () => { + return + } + return (
+ { + + }} + /> diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index adaa79fb..765c6fbf 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -300,6 +300,7 @@ export default class CumDeduct extends React.Component { comsWeaTableStore={tableStore} // table store hasOrder={true} // 是否启用排序 needScroll={true} // 是否启用table内部列表滚动,将自适应到父级高度 + getColumns={this.getColumns} onOperatesClick={this.onOperatesClick.bind(this)} />