From a433de7671024deacea759e7fda43d8e6c031314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 1 Aug 2023 16:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/externalPersonManage/index.js          | 16 ++++++++++++++--
 .../pages/payroll/stepForm/salaryItemSettings.js |  2 --
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
index 2f01ecd2..cecd0b15 100644
--- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
+++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
@@ -6,7 +6,7 @@
  */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaTab, WeaTable, WeaTop } from "ecCom";
+import { WeaHelpfulTip, WeaLocaleProvider, WeaTab, WeaTable, WeaTop } from "ecCom";
 import ExternalPersonManageEditSlide from "./components/externalPersonManageEditSlide";
 import { Button, message, Modal } from "antd";
 import { getSearchs } from "../../util";
@@ -14,6 +14,8 @@ import { condition, searchCondition } from "./conditions";
 import { deleteExtEmp, listPage } from "../../apis/externalPersonManage";
 import "./index.less";
 
+const getLabel = WeaLocaleProvider.getLabel;
+
 @inject("externalPersonManageStore", "taxAgentStore")
 @observer
 class Index extends Component {
@@ -132,8 +134,18 @@ class Index extends Component {
           <div className="externalPerCont">
             <WeaTab
               buttons={(showOperateBtn || showSalaryItemBtn) ? [
+                <WeaHelpfulTip
+                  title={getLabel(111, "非系统人员，且需要缴纳社保福利以及代发工资的人员，需在本表维护人员信息")}
+                  placement="topRight"
+                />,
+                <Button type="ghost">{getLabel(32935, "导入")}</Button>,
                 <Button type="primary" onClick={() => this.handleAdd()}>新建</Button>
-              ] : []}
+              ] : [
+                <WeaHelpfulTip
+                  title={getLabel(111, "非系统人员，且需要缴纳社保福利以及代发工资的人员，需在本表维护人员信息")}
+                  placement="topRight"
+                />
+              ]}
               searchType={["base", "advanced"]} showSearchAd={showSearchAd}
               setShowSearchAd={(showSearchAd) => this.setState({ showSearchAd })}
               searchsAd={getSearchs(form, searchCondition, 2)}
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index d316745a..0e5803e5 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -217,8 +217,6 @@ class SalaryItemSettings extends Component {
     }
   };
   handleEditSalaryItemName = (item, field, viewAttr) => {
-    //暂时关闭
-    return
     const { groupId } = item, { salaryItemId } = field, { dataList } = this.state;
     if (groupId === "111111111111111111") return;
     this.setState({