From c5a62b3c26a2af0d71cfeae7827c04f3197560a8 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 30 Oct 2024 10:20:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?custom/=E4=BA=AC=E8=B4=B5=E6=8A=95=E8=B5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/dataAcquisition/addItems.js         |  4 +-
 .../dataAcquisition/cumDeduct/columns.js      |  6 +-
 .../pages/dataAcquisition/cumDeduct/index.js  | 10 +-
 .../pages/dataAcquisition/dataTables.js       | 94 ++++++++++++++-----
 .../pages/dataAcquisition/index.less          | 15 ++-
 .../hrmSalary/pages/dataAcquisition/layout.js |  7 +-
 6 files changed, 97 insertions(+), 39 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
index 5b05c2d6..a3a98e5e 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
@@ -61,8 +61,8 @@ class AddItems extends Component {
   render() {
     const { form, condition = [] } = this.props;
     return (
-      <div className="addItemsWrapper">
-        {getSearchs(form, condition)}
+      <div className="addItemsWrapper form-dialog-layout">
+        {getSearchs(form, condition, 2, false)}
         <Tips><span>若此员工数据已存在在同期列表中，则当前数据保存后会覆盖列表数据</span></Tips>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
index 742d1573..8945d37b 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
@@ -404,7 +404,7 @@ export const dataCollectCondition = [
         fieldcol: 12,
         label: "税款所属期",
         lanId: 542240,
-        labelcol: 4,
+        labelcol: 8,
         value: "",
         rules: "required|string",
         viewAttr: 3
@@ -414,7 +414,7 @@ export const dataCollectCondition = [
         domkey: ["taxAgentId"],
         fieldcol: 12,
         label: "个税扣缴义务人",
-        labelcol: 4,
+        labelcol: 8,
         lanId: 537996,
         value: "",
         options: [],
@@ -448,7 +448,7 @@ export const dataCollectCondition = [
         isQuickSearch: false,
         label: "人员",
         lanId: 30042,
-        labelcol: 4,
+        labelcol: 8,
         rules: "required",
         viewAttr: 3
       }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 9f1e481f..2d7d12f6 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -244,10 +244,12 @@ class Index extends Component {
         };
         this.handleSaveDeduction(payload);
       } else {
-        Modal.warning({
-          title: "信息确认",
-          content: "必要信息不完整，红色*为必填项！"
-        });
+        f.showErrors();
+        this.forceUpdate();
+        // Modal.warning({
+        //   title: "信息确认",
+        //   content: "必要信息不完整，红色*为必填项！"
+        // });
       }
     });
   };
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index e677d531..58acfc56 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -5,9 +5,9 @@
  * Date: 2023/2/17
  */
 import React, { Component } from "react";
-import UnifiedTable from "../../components/UnifiedTable";
+// import UnifiedTable from "../../components/UnifiedTable";
 import { getTableDate } from "../../apis/cumDeduct";
-import { Menu, Popover } from "antd";
+import { Menu, Popover, Spin } from "antd";
 import { WeaLocaleProvider } from "ecCom";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -16,24 +16,44 @@ class DataTables extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      loading: {
-        query: false
-      },
-      dataSource: [],
-      columns: [],
-      selectedRowKeys: [],
-      pageInfo: {
-        current: 1, pageSize: 10, total: 0
-      }
+      loading: { query: false }, dataSource: [], columns: [], selectedRowKeys: [],
+      pageInfo: { current: 1, pageSize: 10, total: 0 }
     };
   }
 
   componentDidMount() {
-    this.getTableDate();
+    window.addEventListener("message", this.handleReceive, false);
   }
 
+  componentWillUnmount() {
+    window.removeEventListener("message", this.handleReceive, false);
+  }
+
+  handleReceive = async ({ data }) => {
+    const { type, payload: { id, params } = {} } = data;
+    if (type === "init") {
+      this.getTableDate();
+    } else if (type === "turn") {
+      switch (id) {
+        case "PAGEINFO":
+          this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.getTableDate());
+          break;
+        case "CHECKBOX":
+          const { selectedRowKeys } = params;
+          this.setState({ selectedRowKeys });
+          break;
+        case "DEL":
+          break;
+        case "EDIT":
+          break;
+        default:
+          break;
+      }
+    }
+  };
+
   getTableDate = (extraPayload = {}) => {
-    const { loading, pageInfo } = this.state;
+    const { loading, pageInfo, selectedRowKeys } = this.state;
     const { url, payload } = this.props;
     const module = {
       ...pageInfo, url, ...payload, ...extraPayload,
@@ -45,10 +65,12 @@ class DataTables extends Component {
       if (status) {
         const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total },
-          dataSource,
-          columns
-        });
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns
+        }, () => this.postMessageToChild({
+          dataSource: this.state.dataSource, scrollHeight: 95, selectedRowKeys,
+          pageInfo: this.state.pageInfo, unitTableType: "dataAcquisition",
+          columns: this.state.columns
+        }));
       }
     }).catch(() => this.setState({ loading: { ...loading, query: false } }));
   };
@@ -59,6 +81,14 @@ class DataTables extends Component {
    * Date: 2023/2/20
    */
   handleClearRows = () => this.setState({ selectedRowKeys: [] });
+  postMessageToChild = (payload = {}) => {
+    const i18n = {
+      "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"), "删除": getLabel(111, "删除")
+    };
+    const childFrameObj = document.getElementById("unitTable");
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+  };
 
   render() {
     const { columns, dataSource, loading, selectedRowKeys, pageInfo } = this.state;
@@ -168,15 +198,27 @@ class DataTables extends Component {
         };
       }
     });
-    return <UnifiedTable
-      rowKey="id"
-      rowSelection={rowSelection}
-      columns={getColumns}
-      dataSource={dataSource}
-      pagination={pagination}
-      loading={loading.query}
-      xWidth={getColumns.length * 160}
-    />;
+    let height = 280;
+    if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 108 : 500;
+    return (<div style={{ height: height + "px" }}>
+      <Spin spinning={loading.query}>
+        <iframe
+          style={{ border: 0, width: "100%", height: "100%" }}
+          src="http://localhost:7607/#/unitTable"
+          // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
+          id="unitTable"
+        />
+      </Spin>
+    </div>);
+    // <UnifiedTable
+    //   rowKey="id"
+    //   rowSelection={rowSelection}
+    //   columns={getColumns}
+    //   dataSource={dataSource}
+    //   pagination={pagination}
+    //   loading={loading.query}
+    //   xWidth={getColumns.length * 160}
+    // />;
   }
 }
 
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
index f5272aed..68f26be8 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
@@ -57,6 +57,15 @@
   height: 100%;
   display: flex;
   flex-direction: column;
+  background: #F6F6F6;
+
+  .wea-new-top-wapper, .wea-tab {
+    background: #FFF;
+  }
+
+  .wea-tab {
+    margin: 8px 16px;
+  }
 
   .wea-tab-left {
     min-width: 600px !important;
@@ -112,8 +121,12 @@
   }
 
   .dataContent {
-    flex: 1;
     overflow: hidden;
+    padding: 0 16px;
+
+    .ant-spin-nested-loading, .ant-spin-container {
+      height: 100% !important;
+    }
   }
 
 }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
index 9337f5f9..513660aa 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
@@ -7,7 +7,7 @@
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
-import { WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
+import { WeaLocaleProvider, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
 import ImportModal from "./importDialog";
 import LogDialog from "../../components/logViewModal";
 import SlideModalTitle from "../../components/slideModalTitle";
@@ -99,6 +99,7 @@ class Layout extends Component {
                 ]}
         />
         <WeaTab
+          advanceHeight={162}
           searchType={["base", "advanced"]}
           replaceLeft={leftComp}
           searchsAd={getSearchs(form, toJS(condition), 2)}
@@ -111,7 +112,7 @@ class Layout extends Component {
           searchsBaseValue={form.getFormParams().username}
         />
         <div className="dataContent">
-          <WeaNewScroll height="100%">{children}</WeaNewScroll>
+          {children}
           {/*导入弹框*/}
           <ImportModal
             visible={importVisiable} onCancel={onCancel} importParams={importFormComponent}
@@ -124,7 +125,7 @@ class Layout extends Component {
             visible={visible}
             top={0}
             measureT="%"
-            width={80}
+            width={50}
             measureX="%"
             height={100}
             measureY="%"

From 5e2f6bbbbcc262916e8a626b306af22c3a609698 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 30 Oct 2024 10:59:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feature/2.16.1.2410.01-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/dataAcquisition/cumDeduct/index.js  | 10 +++----
 .../pages/dataAcquisition/dataTables.js       |  2 +-
 .../pages/dataAcquisition/index.less          | 26 ++++---------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 2d7d12f6..9f1e481f 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -244,12 +244,10 @@ class Index extends Component {
         };
         this.handleSaveDeduction(payload);
       } else {
-        f.showErrors();
-        this.forceUpdate();
-        // Modal.warning({
-        //   title: "信息确认",
-        //   content: "必要信息不完整，红色*为必填项！"
-        // });
+        Modal.warning({
+          title: "信息确认",
+          content: "必要信息不完整，红色*为必填项！"
+        });
       }
     });
   };
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index 58acfc56..e1ac75f4 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -199,7 +199,7 @@ class DataTables extends Component {
       }
     });
     let height = 280;
-    if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 108 : 500;
+    if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 124 : 500;
     return (<div style={{ height: height + "px" }}>
       <Spin spinning={loading.query}>
         <iframe
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
index 68f26be8..2e8fb3e1 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
@@ -23,33 +23,17 @@
 }
 
 .addItemsWrapper {
+  padding-bottom: 8px;
+
   .baseForm {
     .wea-form-cell {
       padding-right: 20% !important;
     }
   }
 
-  .wea-search-group {
-    .wea-form-cell-wrapper {
-      border: 1px solid #e5e5e5;
-
-      & > div:last-child {
-        border-bottom: none
-      }
-
-      .wea-form-cell {
-        padding: 4px 16px;
-        border-bottom: 1px solid #e5e5e5;
-
-        .wea-form-item-wrapper {
-          line-height: 30px;
-        }
-
-        .wea-form-item {
-          padding: 0;
-        }
-      }
-    }
+  .tipWrapper {
+    background: #FFF;
+    margin: 0 16px;
   }
 }
 

From 004175f88228e5714b1405c3ff5d18df444494a7 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 30 Oct 2024 16:23:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feature/2.16.1.2410.01-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataAcquisition/cumDeduct/columns.js      | 397 ------------------
 .../dataAcquisition/cumSituation/columns.js   |  73 +---
 .../pages/dataAcquisition/dataTables.js       | 135 +-----
 .../pages/dataAcquisition/index.less          |  53 +++
 .../hrmSalary/pages/dataAcquisition/layout.js |  35 +-
 .../dataAcquisition/otherDeduct/columns.js    |  73 +---
 .../components/condition.js                   |   4 +-
 7 files changed, 100 insertions(+), 670 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
index 8945d37b..fb50fd4c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
@@ -1,400 +1,3 @@
-export const columns = [
-  {
-    title: "姓名",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "个税扣缴义务人",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "部门",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "手机号",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "工号",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "证件号码",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "入职日期",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计子女教育",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计继续教育",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计住房贷款利息",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计住房租金",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计赡养老人",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "操作",
-    dataIndex: "title",
-    key: "title"
-  }
-];
-
-
-export const modalColumns = [
-  {
-    title: "姓名",
-    dataIndex: "username",
-    key: "username"
-  },
-  {
-    title: "个税扣缴义务人",
-    dataIndex: "taxAgentName",
-    key: "taxAgentName"
-  },
-  {
-    title: "部门",
-    dataIndex: "departmentName",
-    key: "departmentName"
-  },
-  {
-    title: "手机号",
-    dataIndex: "mobile",
-    key: "mobile"
-  },
-  {
-    title: "工号",
-    dataIndex: "jobNum",
-    key: "jobNum"
-  },
-  {
-    title: "证件号码",
-    dataIndex: "idNo",
-    key: "idNo"
-  },
-  {
-    title: "入职日期",
-    dataIndex: "hiredate",
-    key: "hiredate"
-  },
-  {
-    title: "累计子女教育",
-    dataIndex: "addUpChildEducation",
-    key: "addUpChildEducation"
-  },
-  {
-    title: "累计继续教育",
-    dataIndex: "addUpContinuingEducation",
-    key: "addUpContinuingEducation"
-  },
-  {
-    title: "累计住房贷款利息",
-    dataIndex: "addUpHousingLoanInterest",
-    key: "addUpHousingLoanInterest"
-  },
-  {
-    title: "累计住房租金",
-    dataIndex: "addUpHousingRent",
-    key: "addUpHousingRent"
-  },
-  {
-    title: "累计赡养老人",
-    dataIndex: "addUpSupportElderly",
-    key: "addUpSupportElderly"
-  },
-  {
-    title: "累计婴幼儿照护",
-    dataIndex: "addUpInfantCare",
-    key: "addUpInfantCare"
-  },
-  {
-    title: "累计大病医疗",
-    dataIndex: "addUpIllnessMedical",
-    key: "addUpIllnessMedical"
-  }
-];
-export const specialModalColumns = [
-  {
-    title: "姓名",
-    dataIndex: "username",
-    key: "username"
-  },
-  {
-    title: "个税扣缴义务人",
-    dataIndex: "taxAgentName",
-    key: "taxAgentName"
-  },
-  {
-    title: "部门",
-    dataIndex: "departmentName",
-    key: "departmentName"
-  },
-  {
-    title: "手机号",
-    dataIndex: "mobile",
-    key: "mobile"
-  },
-  {
-    title: "工号",
-    dataIndex: "jobNum",
-    key: "jobNum"
-  },
-  {
-    title: "证件号码",
-    dataIndex: "idNo",
-    key: "idNo"
-  },
-  {
-    title: "入职日期",
-    dataIndex: "hiredate",
-    key: "hiredate"
-  },
-  {
-    title: "子女教育",
-    dataIndex: "childrenEducation",
-    key: "childrenEducation"
-  },
-  {
-    title: "继续教育",
-    dataIndex: "continuingEducation",
-    key: "continuingEducation"
-  },
-  {
-    title: "住房贷款利息",
-    dataIndex: "housingLoanInterest",
-    key: "housingLoanInterest"
-  },
-  {
-    title: "住房租金",
-    dataIndex: "housingRent",
-    key: "housingRent"
-  },
-  {
-    title: "赡养老人",
-    dataIndex: "supportingElder",
-    key: "supportingElder"
-  },
-  {
-    title: "婴幼儿照护",
-    dataIndex: "infantCare",
-    key: "infantCare"
-  },
-  {
-    title: "大病医疗",
-    dataIndex: "seriousIllnessTreatment",
-    key: "seriousIllnessTreatment"
-  }
-];
-export const otherModalColumns = [
-  {
-    title: "姓名",
-    dataIndex: "username",
-    key: "username"
-  },
-  {
-    title: "个税扣缴义务人",
-    dataIndex: "taxAgentName",
-    key: "taxAgentName"
-  },
-  {
-    title: "部门",
-    dataIndex: "departmentName",
-    key: "departmentName"
-  },
-  {
-    title: "手机号",
-    dataIndex: "mobile",
-    key: "mobile"
-  },
-  {
-    title: "工号",
-    dataIndex: "jobNum",
-    key: "jobNum"
-  },
-  {
-    title: "证件号码",
-    dataIndex: "idNo",
-    key: "idNo"
-  },
-  {
-    title: "入职日期",
-    dataIndex: "hiredate",
-    key: "hiredate"
-  },
-  {
-    title: "商业健康保险",
-    dataIndex: "businessHealthyInsurance",
-    key: "businessHealthyInsurance"
-  },
-  {
-    title: "税延养老保险",
-    dataIndex: "taxDelayEndowmentInsurance",
-    key: "taxDelayEndowmentInsurance"
-  },
-  {
-    title: "其他",
-    dataIndex: "otherDeduction",
-    key: "otherDeduction"
-  },
-  {
-    title: "准予扣除的捐赠额",
-    dataIndex: "deductionAllowedDonation",
-    key: "deductionAllowedDonation"
-  }
-];
-export const situationModalColumns = [
-  {
-    title: "姓名",
-    dataIndex: "username",
-    key: "username"
-  },
-  {
-    title: "个税扣缴义务人",
-    dataIndex: "taxAgentName",
-    key: "taxAgentName"
-  },
-  {
-    title: "部门",
-    dataIndex: "departmentName",
-    key: "departmentName"
-  },
-  {
-    title: "手机号",
-    dataIndex: "mobile",
-    key: "mobile"
-  },
-  {
-    title: "工号",
-    dataIndex: "jobNum",
-    key: "jobNum"
-  },
-  {
-    title: "证件号码",
-    dataIndex: "idNo",
-    key: "idNo"
-  },
-  {
-    title: "入职日期",
-    dataIndex: "hiredate",
-    key: "hiredate"
-  },
-  {
-    title: "累计收入额",
-    dataIndex: "addUpIncome",
-    key: "addUpIncome"
-  },
-  {
-    title: "累计减除费用",
-    dataIndex: "addUpSubtraction",
-    key: "addUpSubtraction"
-  },
-  {
-    title: "累计社保个人合计",
-    dataIndex: "addUpSocialSecurityTotal",
-    key: "addUpSocialSecurityTotal"
-  },
-  {
-    title: "累计公积金个人合计",
-    dataIndex: "addUpAccumulationFundTotal",
-    key: "addUpAccumulationFundTotal"
-  },
-  {
-    title: "累计子女教育",
-    dataIndex: "addUpChildEducation",
-    key: "addUpChildEducation"
-  },
-  {
-    title: "累计继续教育",
-    dataIndex: "addUpContinuingEducation",
-    key: "addUpContinuingEducation"
-  },
-  {
-    title: "累计住房贷款利息",
-    dataIndex: "addUpHousingLoanInterest",
-    key: "addUpHousingLoanInterest"
-  },
-  {
-    title: "累计住房租金",
-    dataIndex: "addUpHousingRent",
-    key: "addUpHousingRent"
-  },
-  {
-    title: "累计赡养老人",
-    dataIndex: "addUpSupportElderly",
-    key: "addUpSupportElderly"
-  },
-  {
-    title: "累计企业（职业）年金及其他福利",
-    dataIndex: "addUpEnterpriseAndOther",
-    key: "addUpEnterpriseAndOther"
-  },
-  {
-    title: "累计其他免税扣除",
-    dataIndex: "addUpOtherDeduction",
-    key: "addUpOtherDeduction"
-  },
-  {
-    title: "累计免税收入",
-    dataIndex: "addUpTaxExemptIncome",
-    key: "addUpTaxExemptIncome"
-  },
-  {
-    title: "累计准予扣除的捐赠额",
-    dataIndex: "addUpAllowedDonation",
-    key: "addUpAllowedDonation"
-  },
-  {
-    title: "累计减免税额",
-    dataIndex: "addUpTaxSavings",
-    key: "addUpTaxSavings"
-  },
-  {
-    title: "累计已预扣预缴税额",
-    dataIndex: "addUpAdvanceTax",
-    key: "addUpAdvanceTax"
-  },
-  {
-    title: "累计婴幼儿照护",
-    dataIndex: "addUpInfantCare",
-    key: "addUpInfantCare"
-  },
-  {
-    title: "累计大病医疗",
-    dataIndex: "addUpIllnessMedical",
-    key: "addUpIllnessMedical"
-  }
-
-];
-
-
-export const dataSource = [];
-
 export const dataCollectCondition = [
   {
     items: [
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
index 197463bb..4fb2d80f 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
@@ -1,70 +1,3 @@
-export const columns = [
-  {
-    title: "姓名",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "个税扣缴义务人",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "部门",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "手机号",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "工号",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "证件号码",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "入职日期",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计子女教育",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计继续教育",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计住房贷款利息",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计住房租金",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计赡养老人",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "操作",
-    dataIndex: "title",
-    key: "title"
-  }
-];
 export const dataCollectCondition = [
   {
     items: [
@@ -74,7 +7,7 @@ export const dataCollectCondition = [
         fieldcol: 12,
         label: "税款所属期",
         lanId: 542240,
-        labelcol: 4,
+        labelcol: 8,
         value: "",
         rules: "required|string",
         viewAttr: 3
@@ -84,7 +17,7 @@ export const dataCollectCondition = [
         domkey: ["taxAgentId"],
         fieldcol: 12,
         label: "个税扣缴义务人",
-        labelcol: 4,
+        labelcol: 8,
         lanId: 537996,
         value: "",
         options: [],
@@ -133,7 +66,7 @@ export const dataCollectCondition = [
         isQuickSearch: false,
         label: "人员",
         lanId: 30042,
-        labelcol: 4,
+        labelcol: 8,
         rules: "required",
         viewAttr: 3
       }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index e1ac75f4..bd4c25ca 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -5,9 +5,8 @@
  * Date: 2023/2/17
  */
 import React, { Component } from "react";
-// import UnifiedTable from "../../components/UnifiedTable";
 import { getTableDate } from "../../apis/cumDeduct";
-import { Menu, Popover, Spin } from "antd";
+import { Spin } from "antd";
 import { WeaLocaleProvider } from "ecCom";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -43,8 +42,16 @@ class DataTables extends Component {
           this.setState({ selectedRowKeys });
           break;
         case "DEL":
+          this.props.onTableOperate({ key: "deleteSelectAddUpDeduction" }, params);
           break;
         case "EDIT":
+          this.props.onTableOperate({ key: "handleAddData" }, params);
+          break;
+        case "VIEW":
+          this.props.onViewDetails(params);
+          break;
+        case "log":
+          this.props.onTableOperate({ key: "log" }, params);
           break;
         default:
           break;
@@ -54,7 +61,7 @@ class DataTables extends Component {
 
   getTableDate = (extraPayload = {}) => {
     const { loading, pageInfo, selectedRowKeys } = this.state;
-    const { url, payload } = this.props;
+    const { url, payload, isSpecial } = this.props;
     const module = {
       ...pageInfo, url, ...payload, ...extraPayload,
       departmentIds: extraPayload.departmentIds ? extraPayload.departmentIds.split(",") : []
@@ -67,7 +74,7 @@ class DataTables extends Component {
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns
         }, () => this.postMessageToChild({
-          dataSource: this.state.dataSource, scrollHeight: 95, selectedRowKeys,
+          dataSource: this.state.dataSource, scrollHeight: 95, selectedRowKeys, isSpecial,
           pageInfo: this.state.pageInfo, unitTableType: "dataAcquisition",
           columns: this.state.columns
         }));
@@ -84,120 +91,15 @@ class DataTables extends Component {
   postMessageToChild = (payload = {}) => {
     const i18n = {
       "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), "共": getLabel(18609, "共"),
-      "条": getLabel(18256, "条"), "删除": getLabel(111, "删除")
+      "条": getLabel(18256, "条"), "删除": getLabel(111, "删除"), "查看明细": getLabel(111, "查看明细"),
+      "操作日志": getLabel(545781, "操作日志")
     };
     const childFrameObj = document.getElementById("unitTable");
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
   };
 
   render() {
-    const { columns, dataSource, loading, selectedRowKeys, pageInfo } = this.state;
-    const { showOperateBtn, onTableOperate, onViewDetails, isSpecial = false, form } = this.props;
-    const rowSelection = {
-      selectedRowKeys,
-      onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
-    };
-    const pagination = {
-      ...pageInfo,
-      showTotal: (total) => `共 ${total} 条`,
-      pageSizeOptions: ["10", "20", "50", "100"],
-      showSizeChanger: true,
-      showQuickJumper: true,
-      onShowSizeChange: (current, pageSize) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current, pageSize }
-        }, () => {
-          this.getTableDate({ ...form.getFormParams() });
-        });
-      },
-      onChange: (current) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current }
-        }, () => {
-          this.getTableDate({ ...form.getFormParams() });
-        });
-      }
-    };
-    const getColumns = _.map(columns, item => {
-      const { dataIndex } = item;
-      if (dataIndex === "username") {
-        return {
-          ...item,
-          render: (text, record) => {
-            return <a
-              className="ellipsis"
-              href={`javaScript:openhrm(${record.employeeId});`}
-              onClick={e => window.pointerXY(e)}
-              title={text}
-            >
-              {text}
-            </a>;
-          }
-        };
-      } else if (dataIndex === "operate") {
-        return {
-          ...item,
-          width: 150,
-          render: (text, record) => (
-            <div className="linkWapper">
-              {
-                !isSpecial &&
-                <React.Fragment>
-                  <a href="javaScript:void(0);" style={{ marginRight: 12 }}
-                     onClick={() => onTableOperate({ key: "handleAddData" }, record)}>编辑</a>
-                  <a href="javaScript:void(0);" style={{ marginRight: 12 }}
-                     onClick={() => onViewDetails(record)}>查看明细</a>
-                  {
-                    showOperateBtn &&
-                    <Popover
-                      overlayClassName="moreIconWrapper"
-                      placement="bottomRight"
-                      content={<Menu onClick={(e) => onTableOperate(e, record)}>
-                        <Menu.Item key="deleteSelectAddUpDeduction">删除</Menu.Item>
-                        <Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
-                      </Menu>} title="">
-                      <i className="icon-coms-more"/>
-                    </Popover>
-                  }
-                </React.Fragment>
-              }
-              {
-                isSpecial &&
-                <React.Fragment>
-                  {
-                    showOperateBtn &&
-                    <React.Fragment>
-                      <a href="javaScript:void(0);" style={{ marginRight: 12 }}
-                         onClick={() => onTableOperate({ key: "handleAddData" }, record)}>编辑</a>
-                      <a href="javaScript:void(0);" style={{ marginRight: 12 }}
-                         onClick={() => onTableOperate({ key: "deleteSelectAddUpDeduction" }, record)}>删除</a>
-                      {
-                        showOperateBtn &&
-                        <Popover
-                          overlayClassName="moreIconWrapper"
-                          placement="bottomRight"
-                          content={<Menu onClick={(e) => onTableOperate(e, record)}>
-                            <Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
-                          </Menu>} title="">
-                          <i className="icon-coms-more"/>
-                        </Popover>
-                      }
-                    </React.Fragment>
-                  }
-                </React.Fragment>
-              }
-            </div>
-          )
-        };
-      } else {
-        return {
-          ...item,
-          render: (text) => {
-            return <span className="ellipsis" title={text}> {text} </span>;
-          }
-        };
-      }
-    });
+    const { dataSource, loading } = this.state;
     let height = 280;
     if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 124 : 500;
     return (<div style={{ height: height + "px" }}>
@@ -210,15 +112,6 @@ class DataTables extends Component {
         />
       </Spin>
     </div>);
-    // <UnifiedTable
-    //   rowKey="id"
-    //   rowSelection={rowSelection}
-    //   columns={getColumns}
-    //   dataSource={dataSource}
-    //   pagination={pagination}
-    //   loading={loading.query}
-    //   xWidth={getColumns.length * 160}
-    // />;
   }
 }
 
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
index 2e8fb3e1..65c81d5e 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
@@ -108,9 +108,62 @@
     overflow: hidden;
     padding: 0 16px;
 
+    .wea-new-table {
+      background: #FFF;
+    }
+
+    .wea-slide-modal .wea-slide-modal-content {
+      background: #f6f6f6;
+      height: 100%;
+    }
+
     .ant-spin-nested-loading, .ant-spin-container {
       height: 100% !important;
     }
+
+    .titleDialog {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 8px 46px 8px 16px;
+      background: #fff;
+
+      .titleCol {
+        flex: 1;
+        display: flex;
+        align-items: center;
+      }
+
+      .titleLeftBox {
+        .titleIcon {
+          color: #fff;
+          margin: 0;
+          width: 40px;
+          height: 40px;
+          line-height: 40px;
+          font-size: 22px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          background: #F14A2D;
+          border-radius: 50%;
+        }
+
+        .title {
+          font-size: 14px;
+          color: #333;
+          padding-left: 6px;
+        }
+      }
+
+      .titleRightBox {
+        justify-content: flex-end;
+
+        button:last-child {
+          margin-left: 10px;
+        }
+      }
+    }
   }
 
 }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
index 513660aa..cc06e263 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
@@ -8,6 +8,7 @@ import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 import { WeaLocaleProvider, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
+import { Button } from "antd";
 import ImportModal from "./importDialog";
 import LogDialog from "../../components/logViewModal";
 import SlideModalTitle from "../../components/slideModalTitle";
@@ -73,6 +74,19 @@ class Layout extends Component {
         break;
     }
   };
+  renderTitle = () => {
+    const { slidePayload, slideLoading, onSave } = this.props;
+    const { title } = slidePayload;
+    return <div className="titleDialog">
+      <div className="titleCol titleLeftBox">
+        <div className="titleIcon"><i className="icon-coms-fa"/></div>
+        <div className="title">{title}</div>
+      </div>
+      <div className="titleCol titleRightBox">
+        <Button type="primary" loading={slideLoading} onClick={onSave}>{getLabel(537558, "保存")}</Button>
+      </div>
+    </div>;
+  };
 
   render() {
     const { showSearchAd, logDialogVisible, filterConditions } = this.state;
@@ -125,20 +139,21 @@ class Layout extends Component {
             visible={visible}
             top={0}
             measureT="%"
-            width={50}
-            measureX="%"
+            width={850}
+            measureX="px"
             height={100}
             measureY="%"
             direction="right"
             title={
-              <SlideModalTitle
-                subtitle={subtitle}
-                loading={slideLoading}
-                onSave={onSave}
-                editable={subtitle.length <= 2}
-                showOperateBtn={showOperateBtn}
-                customOperate={subtitle.length <= 2 ? [] : detailOptBtns}
-              />
+              this.renderTitle()
+              // <SlideModalTitle
+              //   subtitle={subtitle}
+              //   loading={slideLoading}
+              //   onSave={onSave}
+              //   editable={subtitle.length <= 2}
+              //   showOperateBtn={showOperateBtn}
+              //   customOperate={subtitle.length <= 2 ? [] : detailOptBtns}
+              // />
             }
             content={slideChildren}
             onClose={onClose}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
index e693c017..92237ee8 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
@@ -1,70 +1,3 @@
-export const columns = [
-  {
-    title: "姓名",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "个税扣缴义务人",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "部门",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "手机号",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "工号",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "证件号码",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "入职日期",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计子女教育",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计继续教育",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计住房贷款利息",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计住房租金",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "累计赡养老人",
-    dataIndex: "title",
-    key: "title"
-  },
-  {
-    title: "操作",
-    dataIndex: "title",
-    key: "title"
-  }
-];
 export const dataCollectCondition = [
   {
     items: [
@@ -74,7 +7,7 @@ export const dataCollectCondition = [
         fieldcol: 12,
         label: "税款所属期",
         lanId: 542240,
-        labelcol: 4,
+        labelcol: 8,
         value: "",
         rules: "required|string",
         viewAttr: 3
@@ -84,7 +17,7 @@ export const dataCollectCondition = [
         domkey: ["taxAgentId"],
         fieldcol: 12,
         label: "个税扣缴义务人",
-        labelcol: 4,
+        labelcol: 8,
         lanId: 537996,
         value: "",
         options: [],
@@ -118,7 +51,7 @@ export const dataCollectCondition = [
         isQuickSearch: false,
         label: "人员",
         lanId: 30042,
-        labelcol: 4,
+        labelcol: 8,
         rules: "required",
         viewAttr: 3
       }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js
index 241efd93..1e009b70 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js
@@ -7,7 +7,7 @@ export const condition = [
         fieldcol: 12,
         label: "个税扣缴义务人",
         lanId: 537996,
-        labelcol: 4,
+        labelcol: 8,
         value: "",
         options: [],
         rules: "required|string",
@@ -40,7 +40,7 @@ export const condition = [
         isQuickSearch: false,
         label: "人员",
         lanId: 30042,
-        labelcol: 4,
+        labelcol: 8,
         rules: "required",
         viewAttr: 3
       }

From 66c6c6846004c7ccdf338427351d8f0c6d17d809 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 31 Oct 2024 10:22:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feature/2.16.1.2410.01-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataAcquisition/attendance/index.less     | 12 +++-
 .../dataAcquisition/components/index.less     | 38 +++++++++---
 .../dataAcquisition/components/tableRecord.js | 58 ++++++++++---------
 .../pages/dataAcquisition/cumDeduct/index.js  |  2 +-
 .../dataAcquisition/cumSituation/index.js     |  2 +-
 .../pages/dataAcquisition/dataTables.js       | 12 ++--
 .../pages/dataAcquisition/index.less          | 13 +++--
 .../hrmSalary/pages/dataAcquisition/layout.js | 24 +++-----
 .../dataAcquisition/otherDeduct/index.js      |  2 +-
 .../specialAddDeduction/index.js              |  2 +-
 10 files changed, 99 insertions(+), 66 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less
index fafbff7c..b8713b71 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less
@@ -4,7 +4,15 @@
   flex-direction: column;
 
   .wea-form-item {
-    padding: 8px 16px 0 16px;
+    height: 46px;
+    line-height: 46px;
+    background: #FFF;
+    margin: 8px 16px 0 16px;
+
+    .wea-form-item-label {
+      line-height: 46px !important;
+      padding-left: 8px !important;
+    }
 
     .to {
       padding: 0 10px
@@ -15,7 +23,7 @@
     flex: 1;
     overflow: hidden;
     background: #FFF;
-    margin: 16px;
+    margin: 8px 16px;
   }
 
   .linkWapper {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less
index 4d16b78a..94ab3cad 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less
@@ -1,13 +1,41 @@
 .tableRecordWrapper {
+  padding: 0 16px;
+
+  .form-dialog-layout {
+    padding: 0 !important;
+
+    .wea-search-group {
+      padding: 16px 0 !important;
+    }
+  }
+
+  .wea-form-cell-wrapper {
+    & > div:first-child {
+      height: 47px !important;
+      line-height: 47px;
+    }
+
+    & > div:last-child {
+
+      .wea-form-item-wrapper {
+        display: flex !important;
+        align-items: center;
+
+        .to {
+          padding: 0 10px;
+        }
+      }
+    }
+  }
+
   .accumulated {
     .wea-form-cell-wrapper {
       & > div:first-child {
-        height: 46px !important;
-        line-height: 46px;
+        height: 47px !important;
+        line-height: 47px;
       }
 
       & > div:nth-child(2) {
-        //width: 40% !important;
 
         .wea-form-item-wrapper {
           display: flex !important;
@@ -18,10 +46,6 @@
           }
         }
       }
-
-      & > div:last-child {
-        //width: 40% !important;
-      }
     }
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
index 9db08fac..4bba03cd 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
@@ -5,8 +5,7 @@
  * Date: 2023/2/20
  */
 import React, { Component } from "react";
-import { WeaSearchGroup } from "ecCom";
-import UnifiedTable from "../../../components/UnifiedTable";
+import { WeaSearchGroup, WeaTable } from "ecCom";
 import { getTableRecordDate } from "../../../apis/cumDeduct";
 import { DataCollectionDateRangePick, DataCollectionSelect, Input } from "../cumDeduct";
 import "./index.less";
@@ -87,9 +86,22 @@ class TableRecord extends Component {
       if (status) {
         const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total },
-          dataSource,
-          columns
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
+          columns: _.map(columns, (o, i) => {
+            let col = {
+              ...o, width: 110,
+              render: text => (<span className="dataAc-ellipsis" title={text}>{text}</span>)
+            };
+            switch (o.dataIndex) {
+              case "taxAgentName":
+                col = { ...col, width: 180 };
+                break;
+              default:
+                col = { ...col };
+                break;
+            }
+            return i === 0 ? { ...col, fixed: "left" } : col;
+          })
         });
       }
     }).catch(() => this.setState({ loading: { ...loading, query: false } }));
@@ -161,14 +173,6 @@ class TableRecord extends Component {
       {
         com: Input({ value: record.username })
       },
-      {
-        com: DataCollectionDateRangePick({
-          label: "税款所属期",
-          range: recordPayload[screenParams[screenParams.length - 1]] || [],
-          onChange: this.handleTablerecordScreen,
-          key: screenParams[screenParams.length - 1]
-        })
-      },
       {
         com: DataCollectionSelect({
           label: "个税扣缴义务人",
@@ -177,28 +181,26 @@ class TableRecord extends Component {
           onChange: this.handleTablerecordScreen,
           key: "taxAgentId"
         })
+      },
+      {
+        com: DataCollectionDateRangePick({
+          label: "税款所属期",
+          range: recordPayload[screenParams[screenParams.length - 1]] || [],
+          onChange: this.handleTablerecordScreen,
+          key: screenParams[screenParams.length - 1]
+        })
       }
     ];
     return (
       <div className="tableRecordWrapper">
         {
           !_.isEmpty(screenParams) &&
-          <WeaSearchGroup className={className} showGroup needTigger={false} items={items} col={width > 1280 ? 3 : 2}/>
+          <div className="form-dialog-layout">
+            <WeaSearchGroup className={className} showGroup needTigger={false} items={items} col={2}/>
+          </div>
         }
-        <UnifiedTable
-          rowKey="id"
-          rowSelection={rowSelection}
-          columns={_.map(columns, item => ({
-            ...item,
-            render: (text) => {
-              return <span className="ellipsis" title={text}> {text} </span>;
-            }
-          }))}
-          dataSource={dataSource}
-          pagination={pagination}
-          loading={loading.query}
-          xWidth={columns.length * 180}
-        />
+        <WeaTable rowKey="id" rowSelection={rowSelection} bordered dataSource={dataSource} pagination={pagination}
+                  loading={loading.query} scroll={{ x: 1200, y: `calc(100vh - 310px)` }} columns={columns}/>
       </div>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 9f1e481f..e1c8e21b 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -332,7 +332,7 @@ class Index extends Component {
         ...slidePayload,
         visible: false,
         title: "",
-        chidren: null,
+        children: null,
         data: {}
       }
     });
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index dd32ab7c..7a0e0ea4 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -379,7 +379,7 @@ class Index extends Component {
         ...slidePayload,
         visible: false,
         title: "",
-        chidren: null,
+        children: null,
         data: {}
       }
     });
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index bd4c25ca..dc5d395d 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -74,7 +74,7 @@ class DataTables extends Component {
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns
         }, () => this.postMessageToChild({
-          dataSource: this.state.dataSource, scrollHeight: 95, selectedRowKeys, isSpecial,
+          dataSource: this.state.dataSource, scrollHeight: 103, selectedRowKeys, isSpecial,
           pageInfo: this.state.pageInfo, unitTableType: "dataAcquisition",
           columns: this.state.columns
         }));
@@ -100,14 +100,18 @@ class DataTables extends Component {
 
   render() {
     const { dataSource, loading } = this.state;
+    const dom = document.querySelector(".dataContent");
     let height = 280;
-    if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 124 : 500;
+    if (dataSource.length > 0 && dom) {
+      const tableHeight = dataSource.length * 46 + 124;
+      height = dom.offsetHeight > tableHeight ? tableHeight : dom.offsetHeight;
+    }
     return (<div style={{ height: height + "px" }}>
       <Spin spinning={loading.query}>
         <iframe
           style={{ border: 0, width: "100%", height: "100%" }}
-          src="http://localhost:7607/#/unitTable"
-          // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
+          // src="http://localhost:7607/#/unitTable"
+          src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
           id="unitTable"
         />
       </Spin>
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
index 65c81d5e..8b4093da 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
@@ -105,11 +105,20 @@
   }
 
   .dataContent {
+    flex: 1;
     overflow: hidden;
     padding: 0 16px;
 
     .wea-new-table {
       background: #FFF;
+
+      .dataAc-ellipsis {
+        display: inline-block;
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
 
     .wea-slide-modal .wea-slide-modal-content {
@@ -158,10 +167,6 @@
 
       .titleRightBox {
         justify-content: flex-end;
-
-        button:last-child {
-          margin-left: 10px;
-        }
       }
     }
   }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
index cc06e263..a36aa418 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
@@ -11,7 +11,6 @@ import { WeaLocaleProvider, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
 import { Button } from "antd";
 import ImportModal from "./importDialog";
 import LogDialog from "../../components/logViewModal";
-import SlideModalTitle from "../../components/slideModalTitle";
 import { getSearchs } from "../../util";
 import "./index.less";
 
@@ -75,7 +74,7 @@ class Layout extends Component {
     }
   };
   renderTitle = () => {
-    const { slidePayload, slideLoading, onSave } = this.props;
+    const { slidePayload, slideLoading, detailOptBtns, onSave } = this.props;
     const { title } = slidePayload;
     return <div className="titleDialog">
       <div className="titleCol titleLeftBox">
@@ -83,7 +82,8 @@ class Layout extends Component {
         <div className="title">{title}</div>
       </div>
       <div className="titleCol titleRightBox">
-        <Button type="primary" loading={slideLoading} onClick={onSave}>{getLabel(537558, "保存")}</Button>
+        {(slidePayload.children && slidePayload.children.props.className) ? [...detailOptBtns] :
+          <Button type="primary" loading={slideLoading} onClick={onSave}>{getLabel(537558, "保存")}</Button>}
       </div>
     </div>;
   };
@@ -92,10 +92,10 @@ class Layout extends Component {
     const { showSearchAd, logDialogVisible, filterConditions } = this.state;
     const {
       title, btns, leftComp, children, taxAgentStore: { showOperateBtn },
-      slidePayload, onClose, onSave, slideLoading, form, condition, onImportFile,
-      onAdSearch, onCancel, importPayload, detailOptBtns, logFunction, onClearTargrtid
+      slidePayload, onClose, form, condition, onImportFile,
+      onAdSearch, onCancel, importPayload, logFunction, onClearTargrtid
     } = this.props;
-    const { visible, title: subtitle, children: slideChildren } = slidePayload;
+    const { visible, children: slideChildren } = slidePayload;
     const {
       visible: importVisiable, importFormComponent, importOpts,
       importResult, templateLink, previewUrl
@@ -144,17 +144,7 @@ class Layout extends Component {
             height={100}
             measureY="%"
             direction="right"
-            title={
-              this.renderTitle()
-              // <SlideModalTitle
-              //   subtitle={subtitle}
-              //   loading={slideLoading}
-              //   onSave={onSave}
-              //   editable={subtitle.length <= 2}
-              //   showOperateBtn={showOperateBtn}
-              //   customOperate={subtitle.length <= 2 ? [] : detailOptBtns}
-              // />
-            }
+            title={this.renderTitle()}
             content={slideChildren}
             onClose={onClose}
           />
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
index e9e61438..f812edda 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
@@ -394,7 +394,7 @@ class Index extends Component {
         ...slidePayload,
         visible: false,
         title: "",
-        chidren: null,
+        children: null,
         data: {}
       }
     });
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
index fe79d45f..70c04767 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
@@ -332,7 +332,7 @@ class Index extends Component {
         ...slidePayload,
         visible: false,
         title: "",
-        chidren: null,
+        children: null,
         data: {}
       }
     });