feature/2.10.1.2401.01-页面操作日志添加

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) => (<a href="javascript:void(0)"
-                                                   onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>)
-          }]
+          columns: _.map(columns, it => ({ ...it, width: 150 }))
         });
       }
     }).catch(() => this.setState({ loading: false }));

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 = <SalaryAdjustmentRecords onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>;
+        Dom = <SalaryAdjustmentRecords/>;
         break;
       default:
         break;

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 (
           <React.Fragment>
-            <a style={{ marginRight: 10 }}
-               onClick={() => this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}</a>
-            <a href="javascript:void(0)"
-               onClick={() => this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+            <a
+              onClick={() => this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}</a>
             {
               (record.canDelete && (showSalaryItemBtn || showOperateBtn)) &&
               <a href="javascript:void(0)" style={{ marginLeft: 10 }}
                  onClick={() => this.handleDeleteItem(record)}
               >{getLabel(535052, "删除")}</a>
             }
+            <a href="javascript:void(0)" style={{ marginLeft: 10 }}
+               onClick={() => this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}</a>
           </React.Fragment>
         );
       }