diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index d9b14d66..643c37a3 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -37,8 +37,8 @@ export default class CumDeduct extends React.Component { selectedKey: [], slideSelectedKey: [], //详情表格的选中项 visiable: false, - monthValue: "", - taxAgentId: "", + monthValue: moment(new Date()).format("YYYY-MM"), + taxAgentId: "All", datetime: "", inited: false, modalParam: { @@ -54,7 +54,7 @@ export default class CumDeduct extends React.Component { cumDeductStore: { doInit }, taxAgentStore: { fetchTaxAgentOption }, } = this.props; - doInit(); + doInit({declareMonth: [this.state.monthValue], taxAgentId: ""}); fetchTaxAgentOption().then((res) => { this.setState({ inited: true, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index 6e048dd1..944f47f0 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -52,8 +52,8 @@ export default class CumSituation extends React.Component { slideSelectedKey: [], //详情表格的选中项 visiable: false, inited: false, - monthValue: "", - taxAgentId: "", + monthValue: moment(new Date()).format("YYYY-MM"), + taxAgentId: "All", modalParam: { taxYearMonth: "", }, @@ -66,7 +66,7 @@ export default class CumSituation extends React.Component { cumSituationStore: { doInit }, taxAgentStore: { fetchTaxAgentOption }, } = this.props; - doInit(); + doInit({taxYearMonth: [this.state.monthValue], taxAgentId: ""}); fetchTaxAgentOption().then(() => { this.setState({ inited: true, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index 444c9af0..756e9389 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -48,8 +48,8 @@ export default class OtherDeduct extends React.Component { selectedKey: [], slideSelectedKey: [], //详情表格的选中项 visiable: false, - monthValue: "", - taxAgentId: "", + monthValue: moment(new Date()).format("YYYY-MM"), + taxAgentId: "All", inited: false, modalParam: { declareMonth: "", @@ -63,7 +63,7 @@ export default class OtherDeduct extends React.Component { otherDeductStore: { doInit }, taxAgentStore: { fetchTaxAgentOption }, } = this.props; - doInit(); + doInit({declareMonth: [this.state.monthValue],taxAgentId:"" }); fetchTaxAgentOption().then(() => { this.setState({ inited: true, diff --git a/pc4mobx/hrmSalary/stores/cumDeduct.js b/pc4mobx/hrmSalary/stores/cumDeduct.js index 6803d625..f1e7e539 100644 --- a/pc4mobx/hrmSalary/stores/cumDeduct.js +++ b/pc4mobx/hrmSalary/stores/cumDeduct.js @@ -76,9 +76,9 @@ export class CumDeductStore { // 初始化操作 @action - doInit = () => { + doInit = (params = {}) => { this.getCondition(); - this.getTableDatas(); + this.getTableDatas(params); }; // 获得高级搜索表单数据 diff --git a/pc4mobx/hrmSalary/stores/cumSituation.js b/pc4mobx/hrmSalary/stores/cumSituation.js index 999a367a..4798c062 100644 --- a/pc4mobx/hrmSalary/stores/cumSituation.js +++ b/pc4mobx/hrmSalary/stores/cumSituation.js @@ -75,9 +75,9 @@ export class CumSituationStore { // 初始化操作 @action - doInit = () => { + doInit = (params = {}) => { this.getCondition(); - this.getTableDatas(); + this.getTableDatas(params); }; // 获得高级搜索表单数据 diff --git a/pc4mobx/hrmSalary/stores/otherDeduct.js b/pc4mobx/hrmSalary/stores/otherDeduct.js index 4555ff78..b656815b 100644 --- a/pc4mobx/hrmSalary/stores/otherDeduct.js +++ b/pc4mobx/hrmSalary/stores/otherDeduct.js @@ -77,9 +77,9 @@ export class OtherDeductStore { // 初始化操作 @action - doInit = () => { + doInit = (params = {}) => { this.getCondition(); - this.getTableDatas(); + this.getTableDatas(params); }; // 获得高级搜索表单数据