From ff692d515783c126514209475e6b787156998e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 15 Feb 2023 16:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=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/fieldSlide.js   | 10 +++++-----
 .../pages/fieldManagement/components/fieldTable.js   | 12 ++++++------
 pc4mobx/hrmSalary/pages/fieldManagement/index.js     |  5 +++--
 .../ledgerPage/components/ledgerSalaryItemNormal.js  |  4 ++--
 pc4mobx/hrmSalary/pages/salaryItem/index.js          | 12 ++++++------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 9712d156..584d0880 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -35,8 +35,8 @@ class FieldSlide extends Component {
   componentDidMount() {
     const { taxAgentStore } = this.props;
     this.commonEnumList();
-    const { getTaxAgentSelectListAsAdmin } = taxAgentStore;
-    getTaxAgentSelectListAsAdmin();
+    const { fetchTaxAgentOption } = taxAgentStore;
+    fetchTaxAgentOption();
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
@@ -150,7 +150,7 @@ class FieldSlide extends Component {
   };
 
   render() {
-    const { title, visible, taxAgentStore: { showOperateBtn, taxAgentAdminOption }, onCancel } = this.props;
+    const { title, visible, taxAgentStore: { taxAgentOption }, onCancel } = this.props;
     const {
       loading,
       name,
@@ -177,7 +177,7 @@ class FieldSlide extends Component {
             subtitle={title}
             tabs={[]}
             loading={loading}
-            showOperateBtn={showOperateBtn}
+            showOperateBtn={true}
             editable={true}
             onSave={this.saveFieldInfo}
           />
@@ -213,7 +213,7 @@ class FieldSlide extends Component {
                   multiple
                   viewAttr={3}
                   value={taxAgentIds}
-                  options={taxAgentAdminOption}
+                  options={taxAgentOption}
                   onChange={value => this.handleChangeFields("taxAgentIds", value)}
                 />
               </WeaFormItem>
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
index 47ec7569..42dd5199 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
@@ -7,7 +7,7 @@
 import React, { Component } from "react";
 import { WeaTable } from "ecCom";
 import { inject, observer } from "mobx-react";
-import { message, Modal, Switch } from "antd";
+import { Switch } from "antd";
 import { salaryFieldList } from "../../../apis/fieldManage";
 
 @inject("taxAgentStore")
@@ -70,11 +70,11 @@ class FieldTable extends Component {
         item.render = (text, record) => {
           return <div className="optWrapper">
             <a href="javascript:void(0);" className="mr10"
-               onClick={() => onEditLedger(record)}>{showOperateBtn ? "编辑" : "查看"}</a>
-            {/*{*/}
-            {/*  showOperateBtn &&*/}
-            {/*  <a href="javascript:void(0);" className="mr10" onClick={() => onDeleteLedger(record)}>删除</a>*/}
-            {/*}*/}
+               onClick={() => onEditLedger(record)}>编辑</a>
+            {
+              // showOperateBtn &&
+              <a href="javascript:void(0);" className="mr10" onClick={() => onDeleteLedger(record)}>删除</a>
+            }
           </div>;
         };
       } else {
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
index be149e71..04b177b1 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
@@ -42,7 +42,7 @@ class FieldManagement extends Component {
         deleteSalaryField(filedIds).then(({ status, errormsg }) => {
           if (status) {
             message.success("删除成功");
-            this.setState({ doSearch: !this.state.doSearch })
+            this.setState({ doSearch: !this.state.doSearch });
           } else {
             message.error(errormsg || "删除失败");
           }
@@ -83,7 +83,8 @@ class FieldManagement extends Component {
         icon={<i className="icon-coms-fa"/>}
         iconBgcolor="#F14A2D"
         showDropIcon={false}
-        buttons={showOperateBtn ? btns : btns.slice(-1)}
+        // buttons={showOperateBtn ? btns : btns.slice(-1)}
+        buttons={btns}
       >
         <div className="fieldManageWrapper">
           <FieldTable name={searchVal} doSearch={doSearch} onEditLedger={this.handleEditField}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
index a02492f5..a9a7b503 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
@@ -215,7 +215,7 @@ const TitleNormalComp = (props) => {
     name, onEditCategory, onDeleteCategory,
     sortedIndex, dataSourceLen, id, onUpgo,
     onDowngo, selectedRowKeys = [], onDeleteCategoryItems,
-    onAddCategoryItems
+    onAddCategoryItems, items
   } = props;
   return <div className="titleNormalWrapper">
     <div className="titleWrapper">
@@ -225,7 +225,7 @@ const TitleNormalComp = (props) => {
         <i className="icon-coms-edit" title="编辑" onClick={() => onEditCategory(name, id)}/>
       }
       {
-        name !== "未分类" &&
+        name !== "未分类" && _.isEmpty(items) &&
         <i className="icon-coms-Delete" title="删除" onClick={() => onDeleteCategory(id)}/>
       }
       {
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index d09d92ab..9e467b93 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -51,8 +51,8 @@ export default class SalaryItem extends React.Component {
   componentWillMount() { // 初始化渲染页面
     const { salaryItemStore: { getTableDatas }, salaryFileStore, taxAgentStore } = this.props;
     const { commonEnumList } = salaryFileStore;
-    const { getTaxAgentSelectListAsAdmin } = taxAgentStore;
-    getTaxAgentSelectListAsAdmin();
+    const { fetchTaxAgentOption } = taxAgentStore;
+    fetchTaxAgentOption();
     commonEnumList("user", { enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" });
     getTableDatas({}).then(res => {
       this.setState({
@@ -142,7 +142,7 @@ export default class SalaryItem extends React.Component {
             return (
               <Dropdown overlay={<Menu>
                 <Menu.Item>
-                  <a onClick={() => {
+                  <a href="javascript: void(0);" onClick={() => {
                     this.handleDeleteItem(record);
                   }}>删除</a>
                 </Menu.Item>
@@ -206,11 +206,11 @@ export default class SalaryItem extends React.Component {
     const {
       salaryItemStore,
       salaryFileStore,
-      taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentAdminOption }
+      taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentOption }
     } = this.props;
     const { userStatusList } = salaryFileStore;
     const { selectedRowKeys } = this.state;
-    const { loading, deleteItemRequest, getTableDatas, initRequest } = salaryItemStore;
+    const { loading, deleteItemRequest, getTableDatas } = salaryItemStore;
     const {
       tableDataSource,
       tableColumns,
@@ -414,7 +414,7 @@ export default class SalaryItem extends React.Component {
                 record={this.record} editable={this.state.editable}
                 isAdd={this.state.isAdd} request={request}
                 userStatusList={userStatusList}
-                taxAgentAdminOption={taxAgentAdminOption}
+                taxAgentAdminOption={taxAgentOption}
                 onChange={(value) => {
                   handleSaveSlideChange(value);
                 }}/>