Merge branch 'dev' of https://gitee.com/MustangDeng/salary-management-front-end into dev

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js

@@ -2,7 +2,7 @@ import React from "react";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 
-import { Button, Table, Dropdown, Menu, Modal, message } from "antd";
+import { Button, Table, Dropdown, Menu, Modal, message, Spin } from "antd";
 
 import { WeaTop, WeaTab, WeaRightMenu, WeaDatePicker, WeaTable } from "ecCom";
 
@@ -192,6 +192,7 @@ export default class StandingBook extends React.Component {
           },
           onCancel: () => {},
         });
+        break;
       case "view":
         this.handleGoDetail(billMonth);
         break;
@@ -371,12 +372,15 @@ export default class StandingBook extends React.Component {
                 onChange={(val) => this.handleChangeMonth("endTime", val)}
               />
             </div>
-            <WeaTable
-              columns={_.filter(columns, (it) => it.dataIndex !== "id")}
-              dataSource={list}
-              loading={loading}
-              pagination={pagination}
-            />
+
+            <Spin spinning={loading}>
+              <WeaTable
+                columns={_.filter(columns, (it) => it.dataIndex !== "id")}
+                dataSource={list}
+                loading={loading}
+                pagination={pagination}
+              />
+            </Spin>
             {dialogProps.visible && (
               <Accountdialog
                 {...dialogProps}

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/abnormalList.js

@@ -2,10 +2,10 @@
  * Author: 黎永顺
  * Description: 异常列表
  * Date: 2022-04-20 21:00:54
- * LastEditTime: 2022-04-22 19:07:51
+ * LastEditTime: 2022-05-09 15:07:19
  */
 import React, { Component } from "react";
-import { Icon, Tooltip, Button } from "antd";
+import { Icon, Tooltip, Button, Spin } from "antd";
 import { inject, observer } from "mobx-react";
 import { WeaBrowser, WeaTable } from "ecCom";
 import "./index.less";
@@ -90,14 +90,16 @@ export default class AbnormalListIndex extends Component {
         </div>
         {/* table */}
         <div style={{ padding: "0 16px" }}>
-          <WeaTable
-            rowKey="id"
-            columns={columns}
-            dataSource={list}
-            loading={loading}
-            pagination={pagination}
-            scroll={{ x: 1200 }}
-          />
+          <Spin spinning={loading}>
+            <WeaTable
+              rowKey="id"
+              columns={columns}
+              dataSource={list}
+              loading={loading}
+              pagination={pagination}
+              scroll={{ x: 1200 }}
+            />
+          </Spin>
         </div>
       </div>
     );

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js

@@ -2,10 +2,10 @@
  * Author: 黎永顺
  * Description: 正常缴纳月份
  * Date: 2022-04-20 08:56:08
- * LastEditTime: 2022-04-22 19:06:46
+ * LastEditTime: 2022-05-09 15:05:57
  */
 import React, { Component } from "react";
-import { Icon, Tooltip, Button, message, Modal } from "antd";
+import { Icon, Tooltip, Button, message, Modal, Spin } from "antd";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 import { WeaBrowser, WeaTable, WeaPopoverHrm, WeaDialog } from "ecCom";
@@ -351,15 +351,17 @@ export default class NormalIndex extends Component {
         </div>
         {/* table */}
         <div style={{ padding: "0 16px" }}>
-          <WeaTable
-            rowKey="id"
-            columns={columns}
-            dataSource={list}
-            loading={loading}
-            pagination={pagination}
-            rowSelection={rowSelection}
-            scroll={{ x: 1200 }}
-          />
+          <Spin spinning={loading}>
+            <WeaTable
+              rowKey="id"
+              columns={columns}
+              dataSource={list}
+              loading={loading}
+              pagination={pagination}
+              rowSelection={rowSelection}
+              scroll={{ x: 1200 }}
+            />
+          </Spin>
         </div>
       </div>
     );

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js

@@ -2,10 +2,10 @@
  * Author: 黎永顺
  * Description: 总览
  * Date: 2022-04-20 20:49:23
- * LastEditTime: 2022-04-22 18:35:12
+ * LastEditTime: 2022-05-09 15:07:56
  */
 import React, { Component } from "react";
-import { Icon, Tooltip, Button } from "antd";
+import { Icon, Tooltip, Button, Spin } from "antd";
 import { inject, observer } from "mobx-react";
 import { WeaInputSearch, WeaTable } from "ecCom";
 import "./index.less";
@@ -97,14 +97,16 @@ export default class OverViewIndex extends Component {
         </div>
         {/* table */}
         <div style={{ padding: "0 16px" }}>
-          <WeaTable
-            rowKey="id"
-            columns={columns}
-            dataSource={list}
-            loading={loading}
-            pagination={pagination}
-            scroll={{ x: 1200 }}
-          />
+          <Spin spinning={loading}>
+            <WeaTable
+              rowKey="id"
+              columns={columns}
+              dataSource={list}
+              loading={loading}
+              pagination={pagination}
+              scroll={{ x: 1200 }}
+            />
+          </Spin>
         </div>
       </div>
     );