@@ -140,6 +147,7 @@ export default class Declare extends React.Component {
defaultValue={[this.state.startDate, this.state.endDate]}
onChange={(value) => this.handleRangePickerChange(value)}
/>
+
diff --git a/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js b/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
index 0b583f47..6ab00d6e 100644
--- a/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
@@ -92,9 +92,9 @@ export default class SalaryItemForm extends React.Component {
-
diff --git a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
index 8513fb91..a2939e2c 100644
--- a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
+++ b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
@@ -164,7 +164,7 @@ export default class CanMoveItem extends React.Component {
dataSource={this.props.dataSource}
columns={this.state.columns}
pagination={false}
- onDrop={this.handleTableDrop}
+ onDrop={(datas) => this.handleTableDrop(datas)}
draggable={true}/>
}
{
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
index 7548f5e5..49bc837c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
@@ -15,7 +15,8 @@ export default class PayrollDetail extends React.Component {
constructor(props) {
super(props);
this.state = {
- currentId: ""
+ currentId: "",
+ current: 1
}
}
@@ -111,11 +112,25 @@ export default class PayrollDetail extends React.Component {
return (
{this.handleExportAll()}}>导出全部
)
+ // return (
)
}
+
+ // 分页
+ handleDataPageChange(value) {
+ this.setState({current: value})
+ const { payrollStore: {getPayrollInfo, getPayrollDetailList, getPayrollDetailSa} } = this.props;
+ getPayrollDetailList({salarySendId: this.state.currentId, current: value})
+ }
+
+
+ handleSearch() {
+ const { payrollStore: {getPayrollDetailList}} = this.props;
+ getPayrollDetailList({salarySendId: this.state.currentId, current: this.state.current})
+ }
render() {
const {payrollStore} = this.props;
- const { setDetailListShowSearchAd, detailListShowSearchAd, getPayrollDetailList, detailListCondition, detailListConditionForm, salarySendDetailBaseInfo, salarySendDetailTableStore, salarySendDetailDataSource } = payrollStore;
+ const { setDetailListShowSearchAd, detailListShowSearchAd, getPayrollDetailList, detailListCondition, detailListConditionForm, salarySendDetailBaseInfo, salarySendDetailTableStore, salarySendDetailDataSource, salarySendDetailPageInfo } = payrollStore;
return (
setDetailListShowSearchAd(bool)} //高级搜索面板受控
searchsAd={getSearchs(detailListConditionForm, toJS(detailListCondition), 2)} // 高级搜索内部数据
// buttonsAd={adBtn} // 高级搜索内部按钮
- onSearch={getPayrollDetailList} // 点搜索按钮时的回调
+ onSearch={() => {this.handleSearch()}} // 点搜索按钮时的回调
// searchsAdQuick={this.getSearchsAdQuick()}
onSearchChange={v => detailListConditionForm.updateFields({ username: v })} // 在搜索框中输入的文字改变时的回调: 这里需要同步高级搜索和外部搜索框的值
searchsBaseValue={detailListConditionForm.getFormParams().username} // 外部input搜索值受控: 这里和高级搜索的requestname同步
@@ -161,7 +176,18 @@ export default class PayrollDetail extends React.Component {
-
+ {
+ this.handleDataPageChange(value)},
+ total: salarySendDetailPageInfo.total,
+ current: salarySendDetailPageInfo.pageNum,
+ showTotal: (total) => `共 ${total} 条`,
+ }}
+ />