From 338a4a40536525d17ea6e0ddfc3474516f94bb13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 29 Mar 2024 16:00:39 +0800
Subject: [PATCH] =?UTF-8?q?custom-=E8=89=BE=E5=BF=97=E5=B7=A5=E4=B8=9A-?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/declare/components/declareTablelist/index.js         | 3 ++-
 pc4mobx/hrmSalary/pages/declareDetail/index.js                 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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) => {