From 5df78a31d8c64ad1978acf45713ba5e70525936c Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Thu, 26 May 2022 14:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/dataAcquisition/cumDeduct/index.js  |  2 +-
 .../dataAcquisition/cumSituation/index.js     |  2 +-
 .../dataAcquisition/otherDeduct/index.js      |  2 +-
 .../standingBook/components/abnormalDrawer.js |  7 ++--
 .../standingBook/index.js                     | 34 +++++++++++++++++--
 .../standingBookDetail/components/normal.js   |  4 +--
 .../standingBookDetail/index.js               |  6 ++--
 7 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 1a48fe18..f88551b2 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -344,7 +344,7 @@ export default class CumDeduct extends React.Component {
         {
           slideVisiable && <WeaSlideModal visible={slideVisiable}
           top={0}
-          width={40}
+          width={60}
           height={100}
           direction={'right'}
           measure={'%'}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index f4335cba..80fda3d4 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -339,7 +339,7 @@ export default class CumSituation extends React.Component {
         {
           slideVisiable && <WeaSlideModal visible={slideVisiable}
           top={0}
-          width={40}
+          width={60}
           height={100}
           direction={'right'}
           measure={'%'}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
index e604e73f..e1958e8c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
@@ -335,7 +335,7 @@ export default class OtherDeduct extends React.Component {
         {
           slideVisiable && <WeaSlideModal visible={slideVisiable}
           top={0}
-          width={40}
+          width={60}
           height={100}
           direction={'right'}
           measure={'%'}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/abnormalDrawer.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/abnormalDrawer.js
index c5dd5109..75c4fe50 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/abnormalDrawer.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/abnormalDrawer.js
@@ -58,9 +58,12 @@ export default class AbnormalDrawer extends Component {
             <WeaTable
               rowKey="id"
               columns={this.props.columns}
-              dataSource={[]}
+              dataSource={this.props.dataSource}
               loading={loading}
-              // pagination={{ total }}
+              pagination={{
+                onChange: (value) => {this.props.onPageChange(value)},
+                total: this.props.total
+              }}
               rowSelection={rowSelection}
               scroll={{ x: 1200 }}
             />
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index c859393c..0d539cf9 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -43,7 +43,12 @@ export default class StandingBook extends React.Component {
         columns: [],
         total: 0,
       },
+      dbnormalTableData: {
+        list: [],
+        total: 0,
+      },
     };
+    this.payload = {}
   }
 
   componentDidMount() {
@@ -103,7 +108,7 @@ export default class StandingBook extends React.Component {
                               this.handleOperate({ key, billMonth })
                             }>
                             <Menu.Item key="archive">归档</Menu.Item>
-                            <Menu.Item key="detail">异常详情</Menu.Item>
+                            {/* <Menu.Item key="detail">异常详情</Menu.Item> */}
                             <Menu.Item key="delete">删除</Menu.Item>
                             {/* <Menu.Item key="operate">操作日志</Menu.Item> */}
                           </Menu>
@@ -137,13 +142,33 @@ export default class StandingBook extends React.Component {
     });
   };
 
+  // 异常详情列表
   inspectList = (payload) => {
     const { inspectList } = this.props.standingBookStore;
-    inspectList({ ...payload }).then((res) => {
-      console.log("liyongshun", res);
+    this.payload = payload;
+    inspectList({ ...payload }).then(({list, total}) => {
+      this.setState({
+        dbnormalTableData: {
+          list,
+          total
+        }
+      })
     });
   };
 
+  // 异常详情分页回调
+  handlePageChange(value) {
+    const { inspectList} = this.props.standingBookStore;
+    inspectList({ ...this.payload, current: value }).then(({list, total}) => {
+      this.setState({
+        dbnormalTableData: {
+          list,
+          total
+        }
+      })
+    });
+  }
+
   handleGoDetail = (billMonth) => {
     window.open(
       `/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBookDetail?billMonth=${billMonth}`
@@ -398,6 +423,9 @@ export default class StandingBook extends React.Component {
                   });
                 }}
                 columns={abnormalColumns}
+                dataSource={this.state.dbnormalTableData.list}
+                total={this.state.dbnormalTableData.total}
+                onPageChange={(value) => {this.handlePageChange(value)}}
                 // onOk={this.handleOk}
                 loading={inspectLoading}
               />
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index 2ac11564..251e02bf 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -354,14 +354,14 @@ export default class NormalIndex extends Component {
               {getSearchs(form, toJS(condition), 1)}
             </WeaDialog>
           )}
-          {selectedKey === "3" && (
+          {/* {selectedKey === "3" && (
             <Tooltip title="导入">
               <i className="icon-coms02-Import" />
             </Tooltip>
           )}
           <Tooltip title="导出全部">
             <i className="icon-coms02-coms2-export" />
-          </Tooltip>
+          </Tooltip> */}
           {selectedKey === "1" && <Button type="primary" onClick={() => {this.handleCommonAccountClick()}}>核算</Button>}
           
           <WeaInputSearch value={this.state.searchValue} onChange={(value) => {this.setState({searchValue: value})}} onSearch={(value) => {this.handleSearch(value)}}/>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
index c9b5ca08..af73da19 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
@@ -33,10 +33,10 @@ class StandingBookDetail extends Component {
     const billMonth = this.props.location.query.billMonth;
     getTabList({ billMonth }).then(({ data }) => {
       const { tabList, remarks, billMonth } = data;
-      // let newTabList = tabList.filter(item => item.id != "2" && item.id != "3")
+      let newTabList = tabList.filter(item => item.id != "2")
       this.setState({
-        selectedKey: tabList[0].id,
-        tabList: _.map(tabList, it => ({ title: it.content, viewcondition: it.id })),
+        selectedKey: newTabList[0].id,
+        tabList: _.map(newTabList, it => ({ title: it.content, viewcondition: it.id })),
         remarks, billMonth
       });
     })