产品-薪资档案列表改造完成

pc4mobx/hrmSalary/pages/payrollFiles/index.js

@@ -22,7 +22,7 @@ import {
   WeaTop
 } from "ecCom";
 import { WeaTableNew } from "comsMobx";
-import { Button, Dropdown, Menu, message, Modal, Popover, Spin } from "antd";
+import { Button, Dropdown, Menu, message, Modal, Spin } from "antd";
 import ImportMenu from "./components/importMenu";
 import ExportMenu from "./components/exportMenu";
 import AllWithoutPay from "./components/allWithoutPay";
@@ -167,25 +167,36 @@ class Index extends Component {
       ellipsis: true
     }));
     const { type, payload: { id, params } = {} } = data;
-    const { dataSource, pageInfo } = this.state;
+    const { dataSource, pageInfo, selectedKey, selectedRowKeys } = this.state;
     if (type === "init") {
       this.postMessageToChild({
-        columns, dataSource, showOperateBtn,
-        showSum: false, pageInfo, pointerXY: window.pointerXY
+        columns, dataSource, showOperateBtn, selectedKey,
+        showSum: false, pageInfo, selectedRowKeys
       });
     } else if (type === "turn") {
       if (id === "PAGEINFO") {
         const { pageNum: current, size: pageSize } = params;
-        console.log(current, pageSize);
-      } else if (id === "USERCARD") {
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.query());
+      } else if (id === "EDIT") {
+        const { record } = params;
+        this.handleEdit(record);
+      } else if (id === "MOREOPT") {
+        const { id, event: e } = params;
+        this.handleMenuClick(e, id);
+      } else if (id === "CANCELSTOP") {
+        const { id } = params;
+        this.cancelStop(id);
+      } else if (id === "ROWSELECTION") {
+        const { selectedRowKeys } = params;
+        this.setState({ selectedRowKeys });
       }
     }
   };
   postMessageToChild = (payload) => {
     const childFrameObj = document.getElementById("atdTable");
-    const { dataSource, columns, showSum, pageInfo } = payload;
+    const { dataSource, columns, showSum, pageInfo, showOperateBtn, selectedKey, selectedRowKeys } = payload;
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
-      dataSource, columns, showSum, pageInfo
+      dataSource, columns, showSum, pageInfo, showOperateBtn, selectedKey, selectedRowKeys
     }), "*");
   };
 
@@ -227,7 +238,7 @@ class Index extends Component {
   };
   queryList = (url) => {
     const { loading, pageInfo, searchItemsValue } = this.state;
-    const { payrollFilesStore: { tableStore, queryList } } = this.props;
+    const { payrollFilesStore: { tableStore, queryList }, taxAgentStore: { showOperateBtn } } = this.props;
     const payload = { ...pageInfo };
     this.setState({
       loading: { ...loading, query: true }
@@ -481,85 +492,18 @@ class Index extends Component {
     return [];
   };
   getColumns = () => {
-    const { selectedKey } = this.state;
     const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props;
-    let columns = _.filter(toJS(tableStore.columns), (item) => item.display === "true");
-    return _.map([
-      ...columns], item => {
-      if (item.dataIndex === "username") {
-        return {
-          ...item,
-          render: (text, record) => {
-            return <a
-              href={`javaScript:openhrm(${record.employeeId});`}
-              onClick={e => window.pointerXY(e)}
-              className="ellipsis"
-              title={text}
-            >
-              {text}
-            </a>;
-          }
-        };
-      } else if (item.dataIndex === "operate") {
-        return {
-          ...item,
-          render: (text, record) => {
-            if (!showOperateBtn) {
-              return <div className="optWrapper">
-                <a href="javascript:void(0);" onClick={() => this.handleEdit(record)}>查看</a>
-              </div>;
-            } else {
-              if (selectedKey === "pending") {
-                return <div className="optWrapper">
-                  <a href="javascript:void(0);" className="mr10" onClick={() => this.handleEdit(record)}>编辑</a>
-                  <Popover
-                    overlayClassName="moreIconWrapper"
-                    placement="bottomRight"
-                    content={<Menu onClick={(e) => this.handleMenuClick(e, record.id)}>
-                      <Menu.Item key="payroll">设为发薪人员</Menu.Item>
-                      <Menu.Item key="deletePendingTodo">删除待办</Menu.Item>
-                    </Menu>} title="">
-                    <i className="icon-coms-more"/>
-                  </Popover>
-                </div>;
-              } else if (selectedKey === "fixed") {
-                return <a onClick={() => this.handleEdit(record)}>调薪</a>;
-              } else if (selectedKey === "suspend") {
-                return <div className="optWrapper">
-                  <a href="javascript:void(0);" className="mr10" onClick={() => this.handleEdit(record)}>编辑</a>
-                  <Popover
-                    overlayClassName="moreIconWrapper"
-                    placement="bottomRight"
-                    content={<Menu onClick={(e) => this.handleMenuClick(e, record.id)}>
-                      <Menu.Item key="stopSalary">停薪</Menu.Item>
-                      <Menu.Item key="deleteSuspendTodo">删除待办</Menu.Item>
-                    </Menu>} title="">
-                    <i className="icon-coms-more"/>
-                  </Popover>
-                </div>;
-              } else {
-                return <div className="optWrapper">
-                  <a href="javascript:void(0);" className="mr10" onClick={() => this.cancelStop(record.id)}>取消停薪</a>
-                  <Popover
-                    overlayClassName="moreIconWrapper"
-                    placement="bottomRight"
-                    content={<Menu onClick={(e) => this.handleMenuClick(e, record)}>
-                      <Menu.Item key="view">查看</Menu.Item>
-                    </Menu>} title="">
-                    <i className="icon-coms-more"/>
-                  </Popover>
-                </div>;
-              }
-            }
-          }
-        };
-      }
-      return {
-        ...item,
-        render: (text) => {
-          return <span className="ellipsis" title={text}>{text}</span>;
-        }
-      };
+    const columns = _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true"), (it, idx) => ({
+      dataIndex: it.dataIndex,
+      width: (it.dataIndex === "username" || it.dataIndex === "operate") ? 120 : it.dataIndex === "taxAgentName" ? 176 : 150,
+      title: it.title, align: "left",
+      fixed: (idx === 0 || idx === 1 || idx === 2) ? "left" : it.dataIndex === "operate" ? "right" : "",
+      ellipsis: true
+    }));
+    this.postMessageToChild({
+      columns, showOperateBtn, selectedKey: this.state.selectedKey,
+      dataSource: this.state.dataSource, selectedRowKeys: this.state.selectedRowKeys,
+      showSum: false, pageInfo: this.state.pageInfo
     });
   };
   handleEdit = (record) => {
@@ -635,13 +579,14 @@ class Index extends Component {
         current: 1,
         pageSize: 10
       }
+    }, () => {
+      if (!this.handleChangeDebounce) {
+        this.handleChangeDebounce = _.debounce(() => {
+          this.query();
+        }, 500);
+      }
+      this.handleChangeDebounce();
     });
-    if (!this.handleChangeDebounce) {
-      this.handleChangeDebounce = _.debounce(() => {
-        this.query();
-      }, 500);
-    }
-    this.handleChangeDebounce();
   };
   //编辑保存
   handleSave = () => {
@@ -851,6 +796,7 @@ class Index extends Component {
               style={{ display: "none" }}
               comsWeaTableStore={tableStore}
               needScroll={true}
+              columns={this.getColumns()}
             />
           </div>
         </WeaTop>

pc4mobx/hrmSalary/pages/payrollFiles/index.less

@@ -7,6 +7,7 @@
     .tableWrapper {
       flex: 1;
       overflow: hidden;
+      padding: 16px 16px 0 16px;
 
       .ant-spin-nested-loading, .ant-spin-container {
         height: 100%;