禅道bug修复回归

pc4mobx/hrmSalary/pages/payrollFiles/index.js

@@ -789,16 +789,6 @@ class Index extends Component {
                 rowSelection={rowSelection}
                 xWidth={this.getColumns().length * 120}
               />
-              {/*<WeaTable*/}
-              {/*  // loading={loading.query}*/}
-              {/*  // rowKey="id"*/}
-              {/*  // columns={this.getColumns()}*/}
-              {/*  // dataSource={dataSource}*/}
-              {/*  // pagination={pagination}*/}
-              {/*  // rowClassName={(record) => record.archiveStatus === "ARCHIVE" ? "archiveRow" : ""}*/}
-              {/*  // rowSelection={rowSelection}*/}
-              {/*  // scroll={{ x: 1200 }}*/}
-              {/*/>*/}
               {/*人员卡片*/}
               <WeaPopoverHrm/>
               <WeaTableComx
@@ -823,7 +813,7 @@ class Index extends Component {
             visible={slideParams.visible}
             top={0}
             measureT="%"
-            width={800}
+            width={980}
             measureX="px"
             height={100}
             measureY="%"
@@ -857,13 +847,6 @@ class Index extends Component {
                 slideParams: { ...slideParams, visible: false, id: "" }
               });
             }}
-            showMask={true}
-            closeMaskOnClick={() => {
-              this.setState({
-                paysetParams: { payStartDate: "", payEndDate: "" },
-                slideParams: { ...slideParams, visible: false, id: "" }
-              });
-            }}
           />
         )}
         {changeSalaryVisible && (

pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js

@@ -1,9 +1,9 @@
 import React from "react";
-import { Menu, Popover, message, Modal } from "antd";
+import { Menu, message, Modal, Popover } from "antd";
-import { WeaTable } from "ecCom";
 import { inject, observer } from "mobx-react";
 import ChangeSalaryModal from "./changeSalaryModal";
-import { deleteSalaryItem } from '../../apis/archive';
+import { deleteSalaryItem } from "../../apis/archive";
+import UnifiedTable from "../../components/UnifiedTable";
 
 @inject("salaryFileStore")
 @observer
@@ -38,13 +38,13 @@ export default class SalaryItemChangeList extends React.Component {
       content: "是否删除该调整数据",
       onOk: () => {
         const { salaryFileStore: { fetchSingleSalaryItemList } } = this.props;
-        deleteSalaryItem({ salaryArchiveItemId }).then(({status, errormsg}) => {
+        deleteSalaryItem({ salaryArchiveItemId }).then(({ status, errormsg }) => {
-          if(status){
+          if (status) {
-            message.success("删除成功")
+            message.success("删除成功");
             this.searchParams = { salaryArchiveId: this.props.id, current: 1 };
             fetchSingleSalaryItemList(this.searchParams);
-          }else{
+          } else {
-            message.error(errormsg || "删除失败")
+            message.error(errormsg || "删除失败");
           }
         });
       },
@@ -54,35 +54,33 @@ export default class SalaryItemChangeList extends React.Component {
   };
 
   // 获取Columns
-  getColumns() {
+  getColumns = () => {
     const { salaryFileStore: { singleSalaryItemList }, selectedKey } = this.props;
     let columns = [];
     if (singleSalaryItemList.columns) {
       columns = [...singleSalaryItemList.columns];
-    }
+      if (selectedKey === "fixed") {
-    if (selectedKey === "fixed") {
+        columns = [...columns, {
-      columns = [...columns, {
+          dataIndex: "operate",
-        dataIndex: "operate",
+          title: "操作",
-        title: "操作",
+          render: (text, record) => {
-        fixed: "right",
+            return <div className="optWrapper">
-        width: 100,
+              <a href="javascript:void(0);" className="mr10" onClick={() => this.handleEdit(record)}>编辑</a>
-        render: (text, record) => {
+              <Popover
-          return <div className="optWrapper">
+                overlayClassName="moreIconWrapper"
-            <a href="javascript:void(0);" className="mr10" onClick={() => this.handleEdit(record)}>编辑</a>
+                placement="bottomRight"
-            <Popover
+                content={<Menu onClick={(e) => this.deleteSalaryItem(record.id)}>
-              overlayClassName="moreIconWrapper"
+                  <Menu.Item key="delete">删除</Menu.Item>
-              placement="bottomRight"
+                </Menu>} title="">
-              content={<Menu onClick={(e) => this.deleteSalaryItem(record.id)}>
+                <i className="icon-coms-more"/>
-                <Menu.Item key="delete">删除</Menu.Item>
+              </Popover>
-              </Menu>} title="">
+            </div>;
-              <i className="icon-coms-more"/>
+          }
-            </Popover>
+        }];
-          </div>;
+      }
-        }
-      }];
     }
     return columns;
-  }
+  };
 
   // 页面跳转
   handlePageChange(value) {
@@ -94,13 +92,24 @@ export default class SalaryItemChangeList extends React.Component {
   render() {
     const { salaryFileStore } = this.props;
     const { singleSalaryItemList } = salaryFileStore;
+    console.log(this.getColumns());
     return (
       <div>
-        <WeaTable
+        <UnifiedTable
+          columns={
+            _.map(this.getColumns(), item => {
+              if (item.dataIndex !== "operate") {
+                return {
+                  ...item,
+                  render: (text) => {
+                    return <span className="ellipsis" title={text}>{text}</span>;
+                  }
+                };
+              }
+              return { ...item };
+            })
+          }
           dataSource={singleSalaryItemList.list ? singleSalaryItemList.list : []}
-          columns={this.getColumns()}
-          border
-          scroll={{ x: 500 }}
           pagination={{
             onChange: (value) => {
               this.handlePageChange(value);
@@ -109,6 +118,7 @@ export default class SalaryItemChangeList extends React.Component {
             showTotal: (total) => `共 ${total} 条`,
             current: singleSalaryItemList.pageNum
           }}
+          xWidth={this.getColumns().length * 100}
         />
         {
           this.state.changeSalaryVisible && <ChangeSalaryModal