From b9d2a06d99dd88ee3bf024d0c4ea3d3ad3173bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 25 May 2023 16:25:33 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payrollFiles/index.js | 83 ++++++++++++++-----
 .../hrmSalary/pages/payrollFiles/index.less   |  4 +
 2 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index 5655e499..f3010961 100644
--- 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, Popover, 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,45 @@ 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 } = this.state;
+    if (type === "init") {
+      this.postMessageToChild({
+        columns, dataSource, showOperateBtn,
+        showSum: false, pageInfo, pointerXY: window.pointerXY
+      });
+    } else if (type === "turn") {
+      if (id === "PAGEINFO") {
+        const { pageNum: current, size: pageSize } = params;
+        console.log(current, pageSize);
+      } else if (id === "USERCARD") {
+      }
+    }
+  };
+  postMessageToChild = (payload) => {
+    const childFrameObj = document.getElementById("atdTable");
+    const { dataSource, columns, showSum, pageInfo } = payload;
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
+      dataSource, columns, showSum, pageInfo
+    }), "*");
+  };
+
   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" });
@@ -791,24 +826,32 @@ 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>
+            {/*<WeaNewScroll height="100%">*/}
+            {/*  <UnifiedTable*/}
+            {/*    rowKey="id"*/}
+            {/*    loading={loading.query}*/}
+            {/*    columns={this.getColumns()}*/}
+            {/*    dataSource={dataSource}*/}
+            {/*    pagination={pagination}*/}
+            {/*    rowSelection={rowSelection}*/}
+            {/*    xWidth={this.getColumns().length * 120}*/}
+            {/*  />*/}
+            {/*</WeaNewScroll>*/}
+            {/*人员卡片*/}
+            <WeaPopoverHrm/>
+            <WeaTableComx
+              style={{ display: "none" }}
+              comsWeaTableStore={tableStore}
+              needScroll={true}
+            />
           </div>
         </WeaTop>
         <div style={{ display: "none" }}>
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.less b/pc4mobx/hrmSalary/pages/payrollFiles/index.less
index 160a30ec..72e677e7 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.less
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.less
@@ -7,6 +7,10 @@
     .tableWrapper {
       flex: 1;
       overflow: hidden;
+
+      .ant-spin-nested-loading, .ant-spin-container {
+        height: 100%;
+      }
     }
   }
 

From 009b81b7074cd2655dff9dfb50ba29bd6c233aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 26 May 2023 10:44:05 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E6=94=B9=E9=80=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payrollFiles/index.js | 132 ++++++------------
 .../hrmSalary/pages/payrollFiles/index.less   |   1 +
 2 files changed, 40 insertions(+), 93 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index f3010961..d20192a3 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/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>
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.less b/pc4mobx/hrmSalary/pages/payrollFiles/index.less
index 72e677e7..3ca1c22b 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.less
+++ b/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%;

From 087e9d1abed1dd53c484335c8b03ed4b13994449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 26 May 2023 10:47:02 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E6=94=B9=E9=80=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payrollFiles/index.js | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index d20192a3..cf91c933 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -650,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") },
@@ -713,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",
@@ -779,17 +754,6 @@ class Index extends Component {
                 id="atdTable"
               />
             </Spin>
-            {/*<WeaNewScroll height="100%">*/}
-            {/*  <UnifiedTable*/}
-            {/*    rowKey="id"*/}
-            {/*    loading={loading.query}*/}
-            {/*    columns={this.getColumns()}*/}
-            {/*    dataSource={dataSource}*/}
-            {/*    pagination={pagination}*/}
-            {/*    rowSelection={rowSelection}*/}
-            {/*    xWidth={this.getColumns().length * 120}*/}
-            {/*  />*/}
-            {/*</WeaNewScroll>*/}
             {/*人员卡片*/}
             <WeaPopoverHrm/>
             <WeaTableComx

From 4d14d0296d1286744e4b3167a87adf3f135b188d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 26 May 2023 10:47:20 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E6=94=B9=E9=80=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payrollFiles/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index cf91c933..8fb623fa 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -749,8 +749,8 @@ class Index extends Component {
             <Spin spinning={loading.query}>
               <iframe
                 style={{ border: 0, width: "100%", height: "100%" }}
-                src="http://localhost:7607/#/payrollFilesTable"
-                // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/payrollFilesTable"
+                // src="http://localhost:7607/#/payrollFilesTable"
+                src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/payrollFilesTable"
                 id="atdTable"
               />
             </Spin>

From 167564053bd7b6c6a1143a1eccbb29de44cfecaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 26 May 2023 11:53:34 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AF=BC=E5=87=BA=E5=85=A8=E9=83=A8bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payrollFiles/components/exportMenu.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/exportMenu.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/exportMenu.js
index 78a36b27..4845c1b4 100644
--- 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;