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
;
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 = [
}
iconBgcolor="#F14A2D"
showDropIcon={false}
- buttons={showSalaryItemBtn ? btns : btns.slice(-1)}
+ buttons={(showSalaryItemBtn || showOperateBtn) ? btns : btns.slice(-1)}
>
{
- const { salaryItemStore, taxAgentStore: { showSalaryItemBtn } } = this.props;
+ const { salaryItemStore, taxAgentStore: { showSalaryItemBtn, showOperateBtn } } = this.props;
const { tableColumns } = salaryItemStore;
let columns = tableColumns.map(column => {
let newColumn = column;
@@ -128,7 +128,7 @@ export default class SalaryItem extends React.Component {
return (
{
this.onEditItem(record, true);
- }}>{showSalaryItemBtn ? "编辑" : "查看"}
+ }}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}
);
}
});
@@ -137,7 +137,7 @@ export default class SalaryItem extends React.Component {
key: "moreOperate",
dataIndex: "moreOperate",
render: (text, record) => {
- if (record.canDelete && showSalaryItemBtn) {
+ if (record.canDelete && (showSalaryItemBtn || showOperateBtn)) {
return (
@@ -245,11 +245,11 @@ export default class SalaryItem extends React.Component {
const renderRightOperation = () => {
return (
{
- showSalaryItemBtn &&
+ (showOperateBtn || showSalaryItemBtn) &&
新增
}
{
- showSalaryItemBtn &&
+ (showOperateBtn || showSalaryItemBtn) &&
}
content={