diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js index 142b53a7..f80b51a5 100644 --- a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js +++ b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js @@ -47,7 +47,8 @@ class Index extends Component { getDeclareList(payload).then(({ status, data }) => { this.setState({ loading: false }); if (status) { - const { columns, list: dataSource, pageNum, pageSize, total } = data; + const { canOperate, pageInfo: result } = data; + const { columns, list: dataSource, pageNum, pageSize, total } = result; this.setState({ dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total }, columns: _.map(columns, o => { diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js index 9eeeba8c..ed72236d 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js @@ -164,7 +164,8 @@ class Index extends Component { getDetailList(payload).then(({ status, data }) => { this.setState({ loading: { ...loading, query: false } }); if (status) { - const { columns, list: dataSource, pageNum: current, pageSize, total } = data; + const { canOperate, pageInfo: result } = data; + const { columns, list: dataSource, pageNum: current, pageSize, total } = result; this.setState({ dataSource, pageInfo: { ...pageInfo, current, pageSize, total }, columns: _.map(columns, (it, idx) => {