Merge branch 'hotfix/v2-bug修复-1031' into develop

pc4mobx/hrmSalary/pages/taxAgent/editModal.js

@@ -103,7 +103,8 @@ export default class EditModal extends React.Component {
       saveloading,
       onClose,
       onChangeTab,
-      taxAgentStore
+      taxAgentStore,
+      isChief
     } = this.props;
     const { form } = taxAgentStore;
     return (
@@ -118,7 +119,8 @@ export default class EditModal extends React.Component {
               <div className="title">{title}</div>
             </div>
             <div className="right">
-              {editType !== "set" && (
+              {/*总管理权限*/}
+              {(editType !== "set" && isChief) && (
                 <Button
                   type="primary"
                   onClick={this.handleSubmit}

pc4mobx/hrmSalary/pages/taxAgent/index.js

@@ -1,14 +1,7 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
-import { toJS } from "mobx";
-import { Row, Col, Switch, message, Modal, Menu, Dropdown } from "antd";
-import {
-  WeaTop,
-  WeaRightMenu,
-  WeaSearchGroup,
-  WeaFormItem,
-  WeaTable
-} from "ecCom";
+import { Col, message, Modal, Row, Switch } from "antd";
+import { WeaFormItem, WeaRightMenu, WeaSearchGroup, WeaTable, WeaTop } from "ecCom";
 import { renderNoright } from "../../util"; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中
 import EditModal from "./editModal";
 import TipLabel from "../../components/TipLabel";
@@ -86,7 +79,8 @@ export default class TaxAgent extends React.Component {
           }
         });
       },
-      onCancel() {}
+      onCancel() {
+      }
     });
   };
 
@@ -301,7 +295,7 @@ export default class TaxAgent extends React.Component {
         "3、只有薪酬总管理员能够操作个税扣缴义务人的增减和开启/关闭分权；",
         "4、总管理员通过后台设置“薪酬管理权限”权限项进行配置；"
       ];
-      return <TipLabel tipList={tipList} />;
+      return <TipLabel tipList={tipList}/>;
     };
 
     const pagination = {
@@ -375,7 +369,7 @@ export default class TaxAgent extends React.Component {
         <WeaRightMenu>
           <WeaTop
             title="个税扣缴义务人" // 文字
-            icon={<i className="icon-coms-fa" />} // 左侧图标
+            icon={<i className="icon-coms-fa"/>} // 左侧图标
             iconBgcolor="#F14A2D" // 左侧图标背景色
             showDropIcon={true}>
             <Row
@@ -431,6 +425,7 @@ export default class TaxAgent extends React.Component {
             {...editModalLoading}
             editConditions={conditions}
             taxAgentStore={taxAgentStore}
+            isChief={permission.isChief}
             onPrev={() =>
               this.setState({
                 editModalProps: {