diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js index a8493d61..3d68c4b9 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js @@ -55,7 +55,7 @@ class FieldTable extends Component { getColumns = () => { const { columns } = this.state; const { taxAgentStore, onEditLedger, onDeleteLedger } = this.props; - const { showSalaryItemBtn } = taxAgentStore; + const { showSalaryItemBtn, showOperateBtn } = taxAgentStore; return _.map([...columns, { dataIndex: "operate", display: true, @@ -70,9 +70,9 @@ class FieldTable extends Component { item.render = (text, record) => { return
onEditLedger(record)}>{showSalaryItemBtn ? "编辑" : "查看"} + onClick={() => onEditLedger(record)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"} { - record.canDelete && showSalaryItemBtn && + record.canDelete && (showSalaryItemBtn || showOperateBtn) && onDeleteLedger(record)}>删除 }
; diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js index ae337488..0e6564d9 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js @@ -71,7 +71,7 @@ class FieldManagement extends Component { render() { const { searchVal, doSearch, slideparams } = this.state; const { taxAgentStore } = this.props; - const { showSalaryItemBtn } = taxAgentStore; + const { showSalaryItemBtn, showOperateBtn } = taxAgentStore; const btns = [