From de7180882d6afe67a17968be1b5e3e4ae126115a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 27 Feb 2023 13:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/fieldManagement/components/fieldTable.js |  6 +++---
 pc4mobx/hrmSalary/pages/fieldManagement/index.js   |  4 ++--
 pc4mobx/hrmSalary/pages/salaryItem/index.js        | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

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 <div className="optWrapper">
             <a href="javascript:void(0);" className="mr10"
-               onClick={() => onEditLedger(record)}>{showSalaryItemBtn ? "编辑" : "查看"}</a>
+               onClick={() => onEditLedger(record)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}</a>
             {
-              record.canDelete && showSalaryItemBtn &&
+              record.canDelete && (showSalaryItemBtn || showOperateBtn) &&
               <a href="javascript:void(0);" className="mr10" onClick={() => onDeleteLedger(record)}>删除</a>
             }
           </div>;
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 = [
       <Button
         type="primary"
@@ -89,7 +89,7 @@ class FieldManagement extends Component {
         icon={<i className="icon-coms-fa"/>}
         iconBgcolor="#F14A2D"
         showDropIcon={false}
-        buttons={showSalaryItemBtn ? btns : btns.slice(-1)}
+        buttons={(showSalaryItemBtn || showOperateBtn) ? btns : btns.slice(-1)}
       >
         <div className="fieldManageWrapper">
           <FieldTable name={searchVal} doSearch={doSearch} onEditLedger={this.handleEditField}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index ff053372..a3e9c096 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -100,7 +100,7 @@ export default class SalaryItem extends React.Component {
   }
 
   getColumns = () => {
-    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 (
           <a onClick={() => {
             this.onEditItem(record, true);
-          }}>{showSalaryItemBtn ? "编辑" : "查看"}</a>
+          }}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}</a>
         );
       }
     });
@@ -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 (
             <Dropdown overlay={<Menu>
               <Menu.Item>
@@ -245,11 +245,11 @@ export default class SalaryItem extends React.Component {
     const renderRightOperation = () => {
       return (<div style={{ display: "inline-block" }}>
         {
-          showSalaryItemBtn &&
+          (showOperateBtn || showSalaryItemBtn) &&
           <Dropdown.Button overlay={menu} type="primary" style={{ marginRight: "10px" }}>新增</Dropdown.Button>
         }
         {
-          showSalaryItemBtn &&
+          (showOperateBtn || showSalaryItemBtn) &&
           <Button
             type="primary"
             style={{ marginRight: "10px" }}
@@ -401,8 +401,8 @@ export default class SalaryItem extends React.Component {
               <SlideModalTitle
                 subtitle={(this.state.isAdd ? "新建" : "修改") + "自定义薪资项目"}
                 editable={false}
-                showOperateBtn={showSalaryItemBtn}
-                customOperate={showSalaryItemBtn ? renderCustomOperate() : []}
+                showOperateBtn={(showSalaryItemBtn || showOperateBtn)}
+                customOperate={(showSalaryItemBtn || showOperateBtn) ? renderCustomOperate() : []}
               />
             }
             content={