From 3be7f6cd50d66876263ea6ad853ea3c129686202 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, 8 Dec 2023 19:09:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?hotfix/2.9.9.2312.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/declareDetail/index.less | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.less b/pc4mobx/hrmSalary/pages/declareDetail/index.less
index 596d9423..3e6fced4 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.less
@@ -1,6 +1,15 @@
 .declareDetail-layout {
   .declareDetail-layout-content {
     padding: 0 16px;
+
+    .ant-table-tbody {
+      td {
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
   }
 
   .icon-span {

From c50f9c00562190086182608c6c53fb22baa4a48d 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, 8 Dec 2023 19:32:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?hotfix/2.9.9.2312.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/declareDetail/index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.less b/pc4mobx/hrmSalary/pages/declareDetail/index.less
index 3e6fced4..3cb3518c 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.less
@@ -4,7 +4,7 @@
 
     .ant-table-tbody {
       td {
-        width: 100%;
+        max-width: 150px;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;

From 1a57f4e392684ee285299ca9878d62d61146edf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 18 Dec 2023 14:56:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?release/2.9.9.2312.02-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/employeedeclareDetail/index.js      | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index bb692a36..fc764d11 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -48,7 +48,7 @@ class Index extends Component {
       declareEditDialog: { visible: false, id: "", title: "" },
       declareStatusList: [], employmentStatusList: [],
       employmentTypeList: [], adConditons: [],
-      selectedRowKeys: [], exportPaylaod: {}
+      selectedRowKeys: [], exportPayload: {}
     };
     this.baseInfoRef = null;
     this.timer = null;
@@ -110,7 +110,7 @@ class Index extends Component {
   };
 
   componentWillUnmount() {
-    this.setState({ exportPaylaod: {} });
+    this.setState({ exportPayload: {} });
     window.removeEventListener("message", this.handleReceive, false);
   }
 
@@ -169,7 +169,7 @@ class Index extends Component {
       departmentIds: departmentIds ? departmentIds.split(",") : [],
       positionIds: positionIds ? positionIds.split(",") : []
     };
-    this.setState({ exportPaylaod: payload, loading: { ...this.state.loading, query: true } });
+    this.setState({ exportPayload: payload, loading: { ...this.state.loading, query: true } });
     API[selectedKey](payload).then(({ status, data }) => {
       this.setState({ loading: { ...this.state.loading, query: false } });
       if (status) {
@@ -386,9 +386,17 @@ class Index extends Component {
         break;
     }
   };
-  handleEmployeedeclareExport = async () => {
+  handleEmployeedeclareExport = async ({ key }) => {
+    const { selectedRowKeys, exportPayload } = this.state;
+    if (key === "selected" && _.isEmpty(selectedRowKeys)) {
+      message.warning(getLabel(111, "请先选择需要导出的人员！"));
+      return;
+    }
     this.setState({ loading: { ...this.state.loading, exportLoading: true } });
-    const promise = await employeedeclareExport(_.omit(this.state.exportPaylaod, ["current", "total", "pageSize"]));
+    const promise = await employeedeclareExport(_.omit({
+      ...exportPayload,
+      ids: selectedRowKeys
+    }, ["current", "total", "pageSize"]));
     this.setState({ loading: { ...this.state.loading, exportLoading: false } });
   };
 
@@ -431,16 +439,26 @@ class Index extends Component {
       { title: getLabel(111, "本月信息变动"), viewcondition: "list4Update" }
     ];
     const tabBtns = [
+      <Button type="ghost" onClick={this.handleAdd}>{getLabel(1421, "新增")}</Button>,
+      // <Dropdown.Button
+      //   onClick={this.handleAdd}
+      //   overlay={
+      //     <Menu>
+      //       {/*<Menu.Item key="1">{getLabel(32935, "导入")}</Menu.Item>*/}
+      //     </Menu>
+      //   }
+      //   type="primary">{getLabel(1421, "新增")}</Dropdown.Button>,
       <Dropdown.Button
-        onClick={this.handleAdd}
+        onClick={() => this.handleEmployeedeclareExport({ key: "all" })}
+        loading={loading.exportLoading}
         overlay={
-          <Menu>
-            {/*<Menu.Item key="1">{getLabel(32935, "导入")}</Menu.Item>*/}
+          <Menu onClick={this.handleEmployeedeclareExport}>
+            <Menu.Item key="selected">{getLabel(543715, "导出所选")}</Menu.Item>
           </Menu>
         }
-        type="primary">{getLabel(1421, "新增")}</Dropdown.Button>,
-      <Button type="ghost" onClick={this.handleEmployeedeclareExport}
-              loading={loading.exportLoading}>{getLabel(17416, "导出")}</Button>,
+        type="primary">{getLabel(17416, "导出全部")}</Dropdown.Button>,
+      // <Button type="ghost" onClick={this.handleEmployeedeclareExport}
+      //         loading={loading.exportLoading}>{getLabel(17416, "导出")}</Button>,
       <WeaSelect
         value={declareStatus}
         style={{ width: 150 }}