From 4fd8d91124de93cd54f771ef1f474593fa6c9910 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, 8 Dec 2022 10:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4=E4=B9=89?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E6=81=A2=E5=A4=8D=E5=88=A0=E9=99=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payroll/payrollGrant/index.js       |  9 +++--
 pc4mobx/hrmSalary/pages/taxAgent/index.js     | 34 +++++++++----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index f20f1570..de5fcd13 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -303,13 +303,15 @@ export default class PayrollGrant extends React.Component {
   }
 
   handleExportAll = () => {
+    const { selectedKey } = this.state;
     const { payrollStore: { exportPayroll } } = this.props;
     exportPayroll({
-      salarySendId: this.state.currentId
+      salarySendId: this.state.currentId,
+      isGranted: selectedKey !== "0"
     });
   };
   handleExportSelect = () => {
-    const { selectedRowKeys, currentId } = this.state;
+    const { selectedRowKeys, currentId, selectedKey } = this.state;
     const { payrollStore: { exportPayroll } } = this.props;
     if (selectedRowKeys.length === 0) {
       message.warning("未选择条目");
@@ -317,7 +319,8 @@ export default class PayrollGrant extends React.Component {
     }
     exportPayroll({
       ids: selectedRowKeys,
-      salarySendId: currentId
+      salarySendId: currentId,
+      isGranted: selectedKey !== "0"
     });
   };
   // 分页
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js
index 5896b994..ef782627 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/index.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js
@@ -1,6 +1,6 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
-import { Button, Col, message, Modal, Row, Switch } from "antd";
+import { Button, Col, message, Modal, Row, Switch, Dropdown, Menu } from "antd";
 import { WeaFormItem, WeaInputSearch, WeaSearchGroup, WeaTable, WeaTop } from "ecCom";
 import { renderNoright } from "../../util"; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中
 import EditModal from "./editModal";
@@ -356,22 +356,22 @@ export default class TaxAgent extends React.Component {
                 onClick={() => this.showEditModal(record.id)}>
                 编辑
               </a>
-              {/*<Dropdown*/}
-              {/*  overlay={*/}
-              {/*    <Menu>*/}
-              {/*      <Menu.Item key="0">*/}
-              {/*        <a*/}
-              {/*          href="javaScript:void(0);"*/}
-              {/*          onClick={() => this.deleteTaxAgent(record.id)}>*/}
-              {/*          删除*/}
-              {/*        </a>*/}
-              {/*      </Menu.Item>*/}
-              {/*    </Menu>*/}
-              {/*  }>*/}
-              {/*  <a className="ant-dropdown-link" href="javaScript:void(0);">*/}
-              {/*    <i className="icon-coms-more" />*/}
-              {/*  </a>*/}
-              {/*</Dropdown>*/}
+              <Dropdown
+                overlay={
+                  <Menu>
+                    <Menu.Item key="0">
+                      <a
+                        href="javaScript:void(0);"
+                        onClick={() => this.deleteTaxAgent(record.id)}>
+                        删除
+                      </a>
+                    </Menu.Item>
+                  </Menu>
+                }>
+                <a className="ant-dropdown-link" href="javaScript:void(0);">
+                  <i className="icon-coms-more" />
+                </a>
+              </Dropdown>
             </div>
         }
       ],