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)}> 编辑 - {/**/} - {/* */} - {/* this.deleteTaxAgent(record.id)}>*/} - {/* 删除*/} - {/* */} - {/* */} - {/* */} - {/* }>*/} - {/* */} - {/* */} - {/* */} - {/**/} + + + this.deleteTaxAgent(record.id)}> + 删除 + + + + }> + + + + } ],