From 7b66f866df67ea5562184e7f9ee6c85eadc39f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 23 Feb 2024 15:59:06 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SalaryAdjustmentRecords/index.js        |  7 +------
 pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js      |  2 +-
 pc4mobx/hrmSalary/pages/salaryItem/index.js            | 10 +++++-----
 3 files changed, 7 insertions(+), 12 deletions(-)

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