diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js index d71b2ca2..dccabcf8 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js @@ -32,7 +32,7 @@ class FieldMangComp extends Component { this.getAttendanceFieldList(); } - getAttendanceFieldList = (extraPayload) => { + getAttendanceFieldList = (extraPayload = {}) => { const { fieldTableStore } = this.props; const { loading, pageInfo } = this.state; const module = { ...pageInfo, ...extraPayload }; @@ -40,9 +40,9 @@ class FieldMangComp extends Component { getAttendanceFieldList(module).then(({ status, data }) => { this.setState({ loading: { ...loading, query: false } }); if (status) { - const { dataKey, pageInfo } = data; + const { dataKey, pageInfo: pageInfoData } = data; const { datas } = dataKey; - const { list: dataSource, pageNum: current, pageSize, total } = pageInfo; + const { list: dataSource, pageNum: current, pageSize, total } = pageInfoData; fieldTableStore.getDatas(datas); this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, @@ -53,8 +53,7 @@ class FieldMangComp extends Component { }; getColumns = () => { const { showOperateBtn } = this.props; - console.log(this.props.fieldTableStore, toJS(this.props.fieldTableStore.columns)); - return _.map(_.filter([], item => !!item.hide), child => ({ + return _.map(_.filter(toJS(this.props.fieldTableStore.columns), item => !!item.hide), child => ({ ...child, render: (text, record) => { switch (child.dataIndex) { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index 34ad7276..03df6384 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -66,7 +66,7 @@ class Index extends Component { const buttons = selectedKey === "DATA" ? [ , - ] : []; + ] : []; return (