diff --git a/pc4mobx/hrmSalary/components/customTable/index.js b/pc4mobx/hrmSalary/components/customTable/index.js new file mode 100644 index 00000000..cef3295f --- /dev/null +++ b/pc4mobx/hrmSalary/components/customTable/index.js @@ -0,0 +1,20 @@ +import React from 'react' +import { WeaTable } from 'ecCom' +import { Spin } from 'antd' + +export default class CustomTable extends React.Component { + render() { + return ( +
+ { + this.props.loading ? +
+ +
+ : + + } +
+ ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js index db62ffbd..39eab4e9 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/index.js @@ -13,6 +13,7 @@ import ContentWrapper from '../../components/contentWrapper'; import { columns, dataSource } from './columns'; import moment from 'moment'; import BaseFormModal from './baseFormModal' +import CustomTable from '../../components/customTable' const { RangePicker } = DatePicker; @@ -226,7 +227,7 @@ export default class Calculate extends React.Component { onChange={(v) => { }} /> - + { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index 4b543262..ac07039b 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -23,6 +23,7 @@ import EditSlideContent from './editSlideContent'; import TwoColContent from '../../../components/twoColContent' import TipLabel from '../../../components/TipLabel' import ItemMangeFormModal from './itemMangeFormModal' +import CustomTable from '../../../components/customTable'; const { RangePicker } = DatePicker; const { Option } = Select @@ -495,7 +496,8 @@ export default class Attendance extends React.Component { // onOperatesClick={this.onOperatesClick.bind(this)} /> */} - - { @@ -41,7 +42,13 @@ export default class Declare extends React.Component { } componentWillMount() { - this.handleSearch() + const { declareStore : {getDeclareList} } = this.props; + this.searchParams = { + fromSalaryMonthStr: this.state.startDate, + endSalaryMonthStr: this.state.endDate, + current: 1 + } + getDeclareList(this.searchParams) } // 日期区间改变事件 @@ -130,6 +137,7 @@ export default class Declare extends React.Component { return
this.handleRangePickerChange(value)} />