diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js
index 5defd410..d13cd2fe 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js
@@ -44,12 +44,7 @@ class Index extends Component {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
this.setState({
dataSource, pageInfo: { ...pageInfo, current, pageSize, total },
- columns: [..._.map(columns, it => ({ ...it, width: 150 })), {
- dataIndex: "options",
- title: getLabel(30585, "操作"),
- width: 120, render: (_, record) => ( this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")})
- }]
+ columns: _.map(columns, it => ({ ...it, width: 150 }))
});
}
}).catch(() => this.setState({ loading: false }));
diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
index f7323c48..7a697539 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
@@ -36,7 +36,7 @@ class Index extends Component {
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>;
break;
case "2":
- Dom = this.onDropMenuClick(type, targetid)}/>;
+ Dom = ;
break;
default:
break;
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index edfebb4c..f1869a57 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -132,20 +132,20 @@ export default class SalaryItem extends React.Component {
columns.push({
key: "operate",
title: "操作",
- width: 120,
+ width: 185,
render: (text, record) => {
return (
- this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}
- this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}
+ this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}
{
(record.canDelete && (showSalaryItemBtn || showOperateBtn)) &&
this.handleDeleteItem(record)}
>{getLabel(535052, "删除")}
}
+ this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}
);
}