Merge branch 'develop' into hotfix/V2-20230505

2023-05-31 09:13:53 +08:00 · 2023-05-31 09:13:53 +08:00 · 10864d9a92
parent 22ccbc5755 6e9806ed82
commit 10864d9a92
14 changed files with 501 additions and 168 deletions
--- a/pc4mobx/hrmSalary/apis/statistics.js
+++ b/pc4mobx/hrmSalary/apis/statistics.js
@ -66,3 +66,11 @@ export const deleteRangeSetting = (params) => {
 export const saveRangeSetting = (params) => {
  return postFetch("/api/bs/hrmsalary/report/statistics/echarts/saveRangeSetting", params);
 };
+//员工列表
+export const statisticsEmployeeList = (params) => {
+  return postFetch("/api/bs/hrmsalary/report/statistics/employee/list", params);
+};
+//员工详情列表
+export const statisticsEmployeeDetailList = (params) => {
+  return postFetch("/api/bs/hrmsalary/report/statistics/employee/detailList", params);
+};
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@ -33,6 +33,7 @@ import RuleConfig from "./pages/ruleConfig";
 import Appconfig from "./pages/appConfig";
 import FieldManagement from "./pages/fieldManagement";
 import AnalysisOfSalaryStatistics from "./pages/analysisOfSalaryStatistics";
+import EmployeeList from "./pages/employeeView";
 import ReportView from "./pages/reportView";

 import stores from "./stores";
@ -155,6 +156,7 @@ const Routes = (
    <Route key="appconfig" path="appconfig" component={Appconfig}/>
    <Route key="fieldManagement" path="fieldManagement" component={FieldManagement}/>
    <Route key="analysisOfSalaryStatistics" path="analysisOfSalaryStatistics" component={AnalysisOfSalaryStatistics}/>
+    <Route key="analysisOfSalaryStatisticsId" path="analysisOfSalaryStatistics/:employeeId" component={EmployeeList}/>
    <Route key="reportView" path="reportView" component={ReportView}/>
  </Route>
 );
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionTable.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionTable.js
@ -91,9 +91,15 @@ class DimensionTable extends Component {
        render: (_, record) => {
          return (
            <span className="space10">
-              <a href="javascript: void(0);" onClick={() => onEdit(record.id)}>{getLabel(111, "编辑")}</a>
-              <a href="javascript: void(0);"
-                 onClick={() => this.dimensionDelete([record.id])}>{getLabel(111, "删除")}</a>
+              {
+                record.canEdit &&
+                <a href="javascript: void(0);" onClick={() => onEdit(record.id)}>{getLabel(111, "编辑")}</a>
+              }
+              {
+                record.canDelete &&
+                <a href="javascript: void(0);"
+                   onClick={() => this.dimensionDelete([record.id])}>{getLabel(111, "删除")}</a>
+              }
            </span>
          );
        }
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
@ -0,0 +1,103 @@
+/*
+ * Author: 黎永顺
+ * name: 员工明细列表
+ * Description:
+ * Date: 2023/5/24
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+import { statisticsEmployeeList } from "../../../apis/statistics";
+import "../index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+class EmployeeDetails extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false,
+      dataSource: [],
+      columns: [],
+      pageInfo: {
+        current: 1,
+        pageSize: 10,
+        total: 0
+      }
+    };
+  }
+
+  componentDidMount() {
+    this.statisticsEmployeeList();
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.year !== this.props.year) this.statisticsEmployeeList(nextProps);
+  }
+
+  statisticsEmployeeList = (props) => {
+    const { pageInfo } = this.state;
+    const payload = {
+      year: props ? props.year : this.props.year,
+      keyword: props ? props.keyword : this.props.keyword,
+      ...pageInfo
+    };
+    this.setState({ loading: true });
+    statisticsEmployeeList(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, total, pageSize } = data;
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize, total },
+          dataSource,
+          columns: [...columns, {
+            title: "操作",
+            dataIndex: "operate",
+            width: 80,
+            render: (_, record) => {
+              return <a target="_blank"
+                        href={`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/analysisOfSalaryStatistics/${record.id}?name=${record.name}&dept=${record.department || ""}`}>{getLabel(111, "查看")}</a>;
+            }
+          }]
+        });
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+
+  render() {
+    const { dataSource, loading, columns, pageInfo } = this.state;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(111, "共")} ${total} ${getLabel(111, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize }
+        }, () => {
+          this.statisticsEmployeeList();
+        });
+      },
+      onChange: current => {
+        this.setState({
+          pageInfo: { ...pageInfo, current }
+        }, () => {
+          this.statisticsEmployeeList();
+        });
+      }
+    };
+    return (
+      <WeaTable
+        rowKey="id"
+        className="employeeTableWrapper"
+        dataSource={dataSource}
+        pagination={pagination}
+        loading={loading}
+        columns={columns}
+        scroll={{ y: `calc(100vh - 174px)` }}
+      />
+    );
+  }
+}
+
+export default EmployeeDetails;
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@ -6,16 +6,18 @@
 */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaInputSearch, WeaLocaleProvider, WeaReqTop } from "ecCom";
+import { WeaDatePicker, WeaInputSearch, WeaLocaleProvider, WeaReqTop } from "ecCom";
 import { Button } from "antd";
 import { condition, reportCondition } from "./components/conditions";
 import { commonEnumList, reportGetForm } from "../../apis/ruleconfig";
 import { dimensionGetForm } from "../../apis/statistics";
+import EmployeeDetails from "./components/employeeDetails";
 import StatisticsModal from "./components/statisticsModal";
 import DimensionSlide from "./components/dimensionSlide";
 import DimensionTable from "./components/dimensionTable";
 import ReportList from "./components/reportList";
 import ReportForm from "./components/reportForm";
+import moment from "moment";
 import "./index.less";

 const { getLabel } = WeaLocaleProvider;
@ -31,6 +33,8 @@ class Index extends Component {
      reportConditions: [],
      selectedKey: "statistics",
      reportName: "",
+      keyword: "",
+      year: moment().format("YYYY"),
      slideReq: {
        visible: false, formId: ""
      },
@ -242,8 +246,8 @@ class Index extends Component {

  render() {
    const { taxAgentStore: { statisticsReportBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props;
-    const { selectedKey, modalReq, slideReq, conditions, reportConditions, reportName } = this.state;
-    const buttons = [
+    const { selectedKey, modalReq, slideReq, conditions, reportConditions, reportName, keyword, year } = this.state;
+    const buttons = selectedKey === "statistics" ? [
      <Button type="primary" onClick={() => this.handleReqBtnsClick("addReport")}>{getLabel(111, "新建报表")}</Button>,
      <Button type="ghost"
              onClick={() => this.handleReqBtnsClick("dimension")}>{getLabel(111, "维度统计管理")}</Button>,
@ -251,26 +255,37 @@ class Index extends Component {
                      value={reportName}
                      onChange={reportName => this.setState({ reportName })}
                      onSearch={() => this.handleReqBtnsClick("search")}/>
+    ] : [
+      <span className="employeeYearWrapper">
+        <span>{getLabel(111, "年薪资核算人员明细：")}</span>
+        <WeaDatePicker value={year} format="YYYY" onChange={year => this.setState({ year })}/>
+      </span>,
+      <WeaInputSearch placeholder={getLabel(111, "请输入姓名、工号、身份证号")} className="search"
+                      value={keyword}
+                      onChange={keyword => this.setState({ keyword })}
+                      onSearch={() => this.employeeListRef.statisticsEmployeeList()}/>
    ];
    const tabs = [
-      { key: "statistics", title: getLabel(111, "统计表") }
-      // { key: "detail", title: getLabel(111, "员工明细") }
+      { key: "statistics", title: getLabel(111, "统计表") },
+      { key: "detail", title: getLabel(111, "员工明细") }
    ];
    return (
      <WeaReqTop
-        title={getLabel(111, "薪酬统计报表")} icon={<i className="icon-coms-fa"/>}
-        iconBgcolor="#F14A2D" buttons={!statisticsReportBtn ? buttons.slice(-1) : buttons} buttonSpace={10}
-        showDropIcon={false} tabDatas={tabs} className="xc_tj_fx_wrapper"
-        selectedKey={selectedKey}
+        title={getLabel(111, "薪酬统计报表")} icon={<i className="icon-coms-fa"/>} selectedKey={selectedKey}
+        iconBgcolor="#F14A2D" tabDatas={tabs} className="xc_tj_fx_wrapper" showDropIcon={false}
+        buttons={(!statisticsReportBtn && selectedKey === "statistics") ? buttons.slice(-1) : buttons} buttonSpace={10}
        onChange={selectedKey => this.setState({ selectedKey }, () => this.state.selectedKey === "statistics" && this.initReportFormCondition())}
      >
        {
-          this.state.selectedKey === "statistics" &&
-          <ReportList
-            ref={dom => this.reportListRef = dom}
-            reportName={reportName}
-            onEdit={this.handleReqBtnsClick}
-          />
+          selectedKey === "statistics" ?
+            <ReportList
+              ref={dom => this.reportListRef = dom}
+              reportName={reportName}
+              onEdit={this.handleReqBtnsClick}
+            /> : <EmployeeDetails
+              ref={dom => this.employeeListRef = dom}
+              keyword={keyword} year={year}
+            />
        }
        <StatisticsModal {...modalReq} onCancel={this.handleCancel} form={reportForm}>
          {
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
@ -5,6 +5,15 @@
    width: 220px;
  }

+  .employeeYearWrapper {
+    display: flex;
+    align-items: center;
+
+    & > span:first-child {
+      margin-right: 4px;
+    }
+  }
+
  .wea-new-top-req-content {
    background: #FFF;

@ -139,3 +148,31 @@
    }
  }
 }
+
+//员工明细
+.employeeTableWrapper {
+
+  .operates i.icon-coms-more {
+    padding: 5px 0;
+    display: inline-block;
+    width: 40px;
+    font-size: 20px;
+    color: #333;
+    cursor: pointer;
+    font-weight: 400;
+  }
+}
+
+.operatePopover {
+  .ant-popover-inner {
+    min-width: 100px !important;
+  }
+
+  .ant-popover-inner-content {
+    padding: 0;
+
+    .ant-menu {
+      border-right: none;
+    }
+  }
+}
--- a/pc4mobx/hrmSalary/pages/employeeView/index.js
+++ b/pc4mobx/hrmSalary/pages/employeeView/index.js
@ -0,0 +1,175 @@
+/*
+ * Author: 黎永顺
+ * name: 员工明细查看
+ * Description:
+ * Date: 2023/5/24
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaSelect, WeaTop } from "ecCom";
+import { WeaTableNew } from "comsMobx";
+import { toJS } from "mobx";
+import { Spin } from "antd";
+import { inject, observer } from "mobx-react";
+import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide";
+import { optionAddWhole } from "../../util/options";
+import moment from "moment";
+import "./index.less";
+
+const WeaTableComx = WeaTableNew.WeaTable;
+const { getLabel } = WeaLocaleProvider;
+
+@inject("taxAgentStore", "payrollFilesStore")
+@observer
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false,
+      taxAgentId: "",
+      countResult: {},
+      salaryMonth: [moment().startOf("year").format("YYYY-MM"), moment().format("YYYY-MM")],
+      dataSource: [],
+      pageInfo: {
+        current: 1,
+        pageSize: 10,
+        total: 0
+      }
+    };
+  }
+
+  componentWillMount() {
+    const { taxAgentStore: { fetchTaxAgentOption } } = this.props;
+    fetchTaxAgentOption();
+  }
+
+  componentDidMount() {
+    this.statisticsEmployeeDetailList();
+    window.addEventListener("message", this.handleReceive, false);
+  }
+
+  handleReceive = ({ data }) => {
+    const { type, payload: { id, params } = {} } = data;
+    const { dataSource, pageInfo, countResult } = this.state;
+    const { payrollFilesStore: { employeeTableStore } } = this.props;
+    const columns = _.filter(toJS(employeeTableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
+    if (type === "init") {
+      this.postMessageToChild({
+        columns: _.map(columns, (it, idx) => ({
+          ...it,
+          width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : it.oldWidth,
+          fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
+          ellipsis: true
+        })), dataSource, countResult,
+        showSum: true, pageInfo
+      });
+    } else if (type === "turn") {
+      if (id === "PAGEINFO") {
+        const { pageNum: current, size: pageSize } = params;
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.statisticsEmployeeDetailList());
+      }
+    }
+  };
+  postMessageToChild = (payload) => {
+    const childFrameObj = document.getElementById("atdTable");
+    const { dataSource, columns, showSum, pageInfo, countResult } = payload;
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
+      dataSource, columns, showSum, pageInfo, countResult
+    }), "*");
+  };
+
+  statisticsEmployeeDetailList = () => {
+    const { params: { employeeId }, payrollFilesStore: { statisticsEmployeeDetailList } } = this.props;
+    const { taxAgentId, salaryMonth, pageInfo } = this.state;
+    const payload = {
+      employeeId, taxAgentId,
+      salaryMonth: salaryMonth.map(item => moment(item).format("YYYY-MM-DD")),
+      ...pageInfo
+    };
+    this.setState({ loading: true });
+    statisticsEmployeeDetailList(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { countResult, pageInfo: { list, pageNum: current, pageSize, total } } = data;
+        this.setState({
+          countResult,
+          dataSource: list || [],
+          pageInfo: { ...pageInfo, current, pageSize, total }
+        }, () => {
+          // this.postMessageToChild({
+          //   columns: this.state.columns,
+          //   dataSource: this.state.dataSource,
+          //   showSum: false, pageInfo: this.state.pageInfo
+          // });
+        });
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+
+  getColumns = () => {
+    const { dataSource, pageInfo, countResult } = this.state;
+    const { payrollFilesStore: { employeeTableStore } } = this.props;
+    const columns = _.filter(toJS(employeeTableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
+    this.postMessageToChild({
+      columns: _.map(columns, (it, idx) => ({
+        ...it,
+        width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : it.oldWidth,
+        fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
+        ellipsis: true
+      })), dataSource, countResult,
+      showSum: true, pageInfo
+    });
+  };
+
+  render() {
+    const {
+      location,
+      taxAgentStore: { showOperateBtn, taxAgentOption },
+      payrollFilesStore: { employeeTableStore }
+    } = this.props;
+    const { salaryMonth, taxAgentId, loading } = this.state;
+    const { query: { dept, name } } = location;
+    const btns = [
+      <MonthRangePicker viewAttr={2} dateRange={salaryMonth}
+                        onChange={v => this.setState({ salaryMonth: v }, () => this.statisticsEmployeeDetailList())}/>,
+      <WeaSelect options={optionAddWhole(taxAgentOption)} value={taxAgentId} style={{ width: 200 }}
+                 onChange={v => this.setState({ taxAgentId: v }, () => this.statisticsEmployeeDetailList())}/>
+    ];
+    const dropMenuDatas = [
+      {
+        key: "BTN_COLUMN",
+        icon: <i className="icon-coms-Custom"/>,
+        content: "显示列定制",
+        onClick: () => {
+          employeeTableStore.setColSetVisible(true);
+          employeeTableStore.tableColSet(true);
+        }
+      }
+    ];
+    return (
+      <WeaTop
+        title={<span><span style={{ marginRight: 8 }}>{name}</span><span>{dept}</span></span>}
+        icon={<i className="icon-coms-fa"/>} buttons={showOperateBtn ? btns : []}
+        iconBgcolor="#F14A2D" showDropIcon={true} dropMenuDatas={dropMenuDatas}
+      >
+        <div className="employeeDetailWrapper">
+          <Spin spinning={loading}>
+            <iframe
+              style={{ border: 0, width: "100%", height: "100%" }}
+              // src="http://localhost:7607/#/commonTable"
+              src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/commonTable"
+              id="atdTable"
+            />
+          </Spin>
+        </div>
+        <WeaTableComx
+          style={{ display: "none" }}
+          comsWeaTableStore={employeeTableStore}
+          needScroll={true}
+          columns={this.getColumns()}
+        />
+      </WeaTop>
+    );
+  }
+}
+
+export default Index;
--- a/pc4mobx/hrmSalary/pages/employeeView/index.less
+++ b/pc4mobx/hrmSalary/pages/employeeView/index.less
@ -0,0 +1,9 @@
+.employeeDetailWrapper {
+  height: 100%;
+  padding: 10px 10px 0 10px;
+
+  .ant-spin-nested-loading,
+  .ant-spin-container {
+    height: 99%;
+  }
+}
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/exportMenu.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/exportMenu.js
@ -17,11 +17,11 @@ class ExportMenu extends Component {
      case "fixed":
        runStatusList = "FIXED,SUSPEND";
        break;
-      case "SUSPEND":
+      case "suspend":
        runStatusList = _.upperCase(selectedKey);
        break;
      case "stop":
-        runStatusList = 'STOP_FROM_PENDING,STOP_FROM_SUSPEND';
+        runStatusList = "STOP_FROM_PENDING,STOP_FROM_SUSPEND";
        break;
      default:
        break;
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@ -14,7 +14,6 @@ import {
  WeaFormItem,
  WeaHelpfulTip,
  WeaInput,
-  WeaNewScroll,
  WeaPopoverHrm,
  WeaSearchGroup,
  WeaSelect,
@ -23,7 +22,7 @@ import {
  WeaTop
 } from "ecCom";
 import { WeaTableNew } from "comsMobx";
-import { Button, Dropdown, Menu, message, Modal, Popover } 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";
@ -32,7 +31,6 @@ import SlideModalTitle from "../../components/slideModalTitle";
 import SalaryFileViewSlide from "../salaryFile/saralyFileViewSlide";
 import ChangeSalaryModal from "../salaryFile/changeSalaryModal";
 import "./index.less";
-import UnifiedTable from "../../components/UnifiedTable";

 const WeaTableComx = WeaTableNew.WeaTable;

@ -152,8 +150,56 @@ class Index extends Component {
    this.queryTabTotal();
    this.queryList("/api/bs/hrmsalary/salaryArchive/pendingList");
    const init = this.init();
+    window.addEventListener("message", this.handleReceive, false);
  }

+  componentWillUnmount() {
+    window.removeEventListener("message", this.handleReceive, false);
+  }
+
+  handleReceive = ({ data }) => {
+    const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props;
+    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
+    }));
+    const { type, payload: { id, params } = {} } = data;
+    const { dataSource, pageInfo, selectedKey, selectedRowKeys } = this.state;
+    if (type === "init") {
+      this.postMessageToChild({
+        columns, dataSource, showOperateBtn, selectedKey,
+        showSum: false, pageInfo, selectedRowKeys
+      });
+    } else if (type === "turn") {
+      if (id === "PAGEINFO") {
+        const { pageNum: current, size: pageSize } = params;
+        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, showOperateBtn, selectedKey, selectedRowKeys } = payload;
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
+      dataSource, columns, showSum, pageInfo, showOperateBtn, selectedKey, selectedRowKeys
+    }), "*");
+  };
+
  init = async () => {
    const { data: archiveStatusList } = await this.commonEnumList({ enumClass: "com.engine.salary.enums.salaryarchive.ArchiveStatusEnum" });
    const { data: userStatusList } = await this.commonEnumList({ enumClass: "com.engine.salary.enums.UserStatusEnum" });
@ -192,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 }
@ -446,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) => {
@ -600,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 = () => {
@ -670,34 +650,13 @@ class Index extends Component {
      tabCount,
      selectedKey,
      loading,
-      dataSource,
      pageInfo,
      showSearchAd,
-      selectedRowKeys,
      slideParams,
      changeSalaryVisible,
      paysetParams
    } = this.state;
    const { payrollFilesStore: { tableStore } } = this.props;
-    const pagination = {
-      current: pageInfo.current,
-      pageSize: pageInfo.pageSize,
-      total: pageInfo.total,
-      showTotal: total => `共 ${total} 条`,
-      showQuickJumper: true,
-      showSizeChanger: true,
-      pageSizeOptions: ["10", "20", "50", "100"],
-      onShowSizeChange: (current, pageSize) => {
-        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => {
-          this.query();
-        });
-      },
-      onChange: current => {
-        this.setState({ pageInfo: { ...pageInfo, current } }, () => {
-          this.query();
-        });
-      }
-    };
    const renderSearch = () => {
      const searchItems = [
        { com: this.Input("姓名", "username") },
@ -733,10 +692,6 @@ class Index extends Component {
      })}> 重置 </Button>,
      <Button type="ghost" onClick={() => this.setState({ showSearchAd: false })}> 取消 </Button>
    ];
-    const rowSelection = {
-      selectedRowKeys,
-      onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
-    };
    const rightMenu = [
      {
        key: "BTN_COLUMN",
@ -791,24 +746,22 @@ class Index extends Component {
            searchsBaseValue={this.state.searchItemsValue.username}
          />
          <div className="tableWrapper">
-            <WeaNewScroll height="100%">
-              <UnifiedTable
-                rowKey="id"
-                loading={loading.query}
-                columns={this.getColumns()}
-                dataSource={dataSource}
-                pagination={pagination}
-                rowSelection={rowSelection}
-                xWidth={this.getColumns().length * 120}
+            <Spin spinning={loading.query}>
+              <iframe
+                style={{ border: 0, width: "100%", height: "100%" }}
+                // src="http://localhost:7607/#/payrollFilesTable"
+                src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/payrollFilesTable"
+                id="atdTable"
              />
-              {/*人员卡片*/}
-              <WeaPopoverHrm/>
-              <WeaTableComx
-                style={{ display: "none" }}
-                comsWeaTableStore={tableStore}
-                needScroll={true}
-              />
-            </WeaNewScroll>
+            </Spin>
+            {/*人员卡片*/}
+            <WeaPopoverHrm/>
+            <WeaTableComx
+              style={{ display: "none" }}
+              comsWeaTableStore={tableStore}
+              needScroll={true}
+              columns={this.getColumns()}
+            />
          </div>
        </WeaTop>
        <div style={{ display: "none" }}>
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.less
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.less
@ -7,6 +7,11 @@
    .tableWrapper {
      flex: 1;
      overflow: hidden;
+      padding: 16px 16px 0 16px;
+
+      .ant-spin-nested-loading, .ant-spin-container {
+        height: 100%;
+      }
    }
  }

--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@ -323,7 +323,7 @@ const TitleDialog = (props) => {
    </div>
  </div>;
 };
-const MonthRangePicker = (props) => {
+export const MonthRangePicker = (props) => {
  const { dateRange, onChange, viewAttr } = props;
  const [startDate, endDate] = dateRange || [];
  return <div className="rangePickerBox">
--- a/pc4mobx/hrmSalary/stores/payrollFiles.js
+++ b/pc4mobx/hrmSalary/stores/payrollFiles.js
@ -1,12 +1,15 @@
 import { action, observable } from "mobx";
 import { WeaTableNew } from "comsMobx";
 import * as API from "../apis/payrollFiles";
+import { statisticsEmployeeDetailList } from "../apis/statistics";

 const { TableStore } = WeaTableNew;

 export class PayrollFilesStore {
  @observable tableStore = new TableStore();
-  @action("列表查询")
+  @observable employeeTableStore = new TableStore();
+
+  @action("薪资档案-列表查询")
  queryList = (payload = {}, searchItemsValue = {}, url = "") => {
    return new Promise((resolve, reject) => {
      const { departmentIds, positionIds, subcompanyIds, ...extra } = searchItemsValue;
@ -28,4 +31,21 @@ export class PayrollFilesStore {
      });
    });
  };
+
+  @action("薪酬统计列表员工详情-列表查询")
+  statisticsEmployeeDetailList = (payload) => {
+    return new Promise((resolve, reject) => {
+      statisticsEmployeeDetailList(payload).then(res => {
+        const { data, status } = res;
+        if (status) {
+          const { dataKey } = data;
+          const { datas } = dataKey;
+          this.employeeTableStore.getDatas(datas); // table 请求数据
+        }
+        resolve(res);
+      }).catch(() => {
+        reject();
+      });
+    });
+  };
 }
--- a/pc4mobx/hrmSalary/util/options.js
+++ b/pc4mobx/hrmSalary/util/options.js
@ -1,19 +1,19 @@
 // 添加全部选项
 export const optionAddAll = (options) => {
-    let results = [...options];
-    results.unshift({
-        key: "All",
-        showname: "全部",
-        selected: false
-    })
-    return results;
-}
+  let results = [...options];
+  results.unshift({
+    key: "All",
+    showname: "全部",
+    selected: false
+  });
+  return results;
+};
 export const optionAddWhole = (options) => {
-    let results = [...options];
-    results.unshift({
-        key: "",
-        showname: "全部",
-        selected: false
-    })
-    return results;
-}
+  let results = [...options];
+  results.unshift({
+    key: "",
+    showname: "全部个税扣缴义务人",
+    selected: false
+  });
+  return results;
+};