-
导入按钮使用场景说明:
-
1.档案初始化:
+
{getLabel(111, "导入按钮使用场景说明:")}
+
{getLabel(111, "1.档案初始化:")}
- a.初次使用薪酬模块,全量导入员工的薪资档案数据;
- b.员工入职,导入新入职的员工的薪资档案数据(若导入表格中的人员已存在在薪资档案中,初始化导入会将档案中该人员的数据清除再导入);
- c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴;
+ {getLabel(111, "a.初次使用薪酬模块,全量导入员工的薪资档案数据;")}
+ {getLabel(111, "b.员工入职,导入新入职的员工的薪资档案数据(若导入表格中的人员已存在在薪资档案中,初始化导入会将档案中该人员的数据清除再导入);")}
+ {getLabel(111, "c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴;")}
2.调薪:档案中已存在的人员批量调整薪资项目值(包括返聘人员的情况);
3.调整个税扣缴义务人:档案中已存在的人员批量调整个税扣缴义务人(包括返聘人员的情况);
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 958fe161..80431ebf 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -42,7 +42,8 @@ class SalaryItemForm extends Component {
return {
...item,
viewAttr: (!isLedger && ((editable && record.canEdit) || isAdd)) ? 2 : 1,
- display: !isLedger
+ display: !isLedger,
+ label: getLabel(lanId, label)
};
case "useInEmployeeSalary":
return {
@@ -71,7 +72,8 @@ class SalaryItemForm extends Component {
return {
...item,
viewAttr: 2,
- tip: isLedger ? getLabel(544291, "开启后,薪资核算不会展示该项目,但是不影响该项目的核算值") : item.tip
+ tip: isLedger ? getLabel(544291, "开启后,薪资核算不会展示该项目,但是不影响该项目的核算值") : item.tip,
+ label: getLabel(lanId, label)
};
case "valueType":
return {
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
index 60dc767a..c9f82c1e 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
@@ -96,7 +96,7 @@ export default class SystemSalaryItemModal extends React.Component {
};
return (
{
this.setState({ selectedRowKeys: [] }, () => {
@@ -104,7 +104,7 @@ export default class SystemSalaryItemModal extends React.Component {
});
}} style={{ width: "60vw" }} scalable
buttons={[
-
+
]}
>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
index 5a358ac5..3b3973cb 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
@@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
-import { Button, Dropdown, Menu, message, Modal, Popover } from "antd";
+import { Button, Dropdown, Icon, Menu, message, Modal, Popover } from "antd";
import { WeaHelpfulTip, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTools, WeaTop } from "ecCom";
import { getSearchs, renderLoading } from "../../../util";
import BaseForm from "./baseForm";
@@ -654,43 +654,77 @@ export default class Archives extends React.Component {
}
window.open(url, "_self");
};
-
- const btns = selectedKey === "fixed" ?
- [
- ,
-
- {getLabel(512938, "导出选中")}
+ let btns = [];
+ if (languageidweaver == "8") {
+ const menus = selectedKey === "fixed" ?
+ (
+
- } type="ghost">
- {getLabel(81272, "导出全部")}
-
- ] : selectedKey === "pending" ?
- [
-
- {getLabel(544348, "提示:缴纳月份区间包含起始缴纳月,不包含最后缴纳月; 若员工离职时还未增员进入在缴员工,则数据会自动清除,因此若确认缴纳,请及时维护档案数据并增员操作。若清除后还需缴纳,需先在个税扣缴义务人菜单将员工按离职状态添加回来,会重新出现在待增员。")}
-
- }
- placement="topLeft"
- />,
-
- {getLabel(543187, "批量增员")}
- {getLabel(543186, "批量删除待办")}
+ ) : selectedKey === "pending" ?
+ (
+
+ ) : selectedKey === "suspend" ?
+ (
+
- } type="ghost"
- >
- {getLabel(543185, "全量增员")}
- ,
+ ) : (
+
+ );
+ btns = [
+
+
+
+ ];
+ selectedKey === "pending" && btns.unshift(
+ {getLabel(544348, "提示:缴纳月份区间包含起始缴纳月,不包含最后缴纳月; 若员工离职时还未增员进入在缴员工,则数据会自动清除,因此若确认缴纳,请及时维护档案数据并增员操作。若清除后还需缴纳,需先在个税扣缴义务人菜单将员工按离职状态添加回来,会重新出现在待增员。")}
+
+ }
+ placement="topLeft"
+ />);
+ selectedKey === "suspend" && btns.unshift(