diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
index 49d82cd8..b08bc557 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
@@ -1,10 +1,12 @@
import React from "react";
import { Menu, message, Modal, Popover } from "antd";
+import { WeaLocaleProvider } from "ecCom";
import { inject, observer } from "mobx-react";
import ChangeSalaryModal from "./changeSalaryModal";
import { deleteSalaryItem } from "../../apis/archive";
import UnifiedTable from "../../components/UnifiedTable";
+const getLabel = WeaLocaleProvider.getLabel;
@inject("salaryFileStore")
@observer
export default class SalaryItemChangeList extends React.Component {
@@ -34,17 +36,17 @@ export default class SalaryItemChangeList extends React.Component {
};
deleteSalaryItem = (salaryArchiveItemId) => {
Modal.confirm({
- title: "信息确认",
- content: "是否删除该调整数据",
+ title: getLabel(111, "信息确认"),
+ content: getLabel(111, "是否删除该调整数据"),
onOk: () => {
const { salaryFileStore: { fetchSingleSalaryItemList } } = this.props;
deleteSalaryItem({ salaryArchiveItemId }).then(({ status, errormsg }) => {
if (status) {
- message.success("删除成功");
+ message.success(getLabel(111, "删除成功"));
this.searchParams = { salaryArchiveId: this.props.id, current: 1 };
fetchSingleSalaryItemList(this.searchParams);
} else {
- message.error(errormsg || "删除失败");
+ message.error(errormsg || getLabel(111, "删除失败"));
}
});
},
@@ -62,15 +64,15 @@ export default class SalaryItemChangeList extends React.Component {
if (selectedKey === "fixed") {
columns = [...columns, {
dataIndex: "operate",
- title: "操作",
+ title: getLabel(111, "操作"),
render: (text, record) => {
return
-
this.handleEdit(record)}>编辑
+
this.handleEdit(record)}>{getLabel(111, "编辑")}
this.deleteSalaryItem(record.id)}>
- 删除
+ {getLabel(111, "删除")}
} title="">
@@ -114,7 +116,7 @@ export default class SalaryItemChangeList extends React.Component {
this.handlePageChange(value);
},
total: singleSalaryItemList.total,
- showTotal: (total) => `共 ${total} 条`,
+ showTotal: total => `${getLabel(83698, "共")} ${total} ${getLabel(18256, "条")}`,
current: singleSalaryItemList.pageNum
}}
xWidth={this.getColumns().length * 100}
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
index 3abb7f69..1ae1cf78 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
@@ -1,5 +1,5 @@
import React from "react";
-import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaInputNumber, WeaSearchGroup } from "ecCom";
+import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaInputNumber, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import { inject, observer } from "mobx-react";
import SelectedTab from "../../components/selectedTab";
import SalaryItemChangeList from "./salaryItemChangeList";
@@ -7,10 +7,11 @@ import TaxAgentChangeList from "./taxAgentChangeList";
import { PickDate } from "../appConfig";
import "./index.less";
+const getLabel = WeaLocaleProvider.getLabel;
const selectedTabItems = [
{
key: "0",
- name: "薪资调整记录"
+ name: getLabel(111, "薪资调整记录")
}
];
const baseInfolist = [
@@ -18,15 +19,15 @@ const baseInfolist = [
id: 1,
items: [
{
- label: "姓名",
+ label: getLabel(111, "姓名"),
value: "username"
},
{
- label: "部门",
+ label: getLabel(111, "部门"),
value: "department"
},
{
- label: "岗位",
+ label: getLabel(111, "岗位"),
value: "position"
}
]
@@ -35,15 +36,15 @@ const baseInfolist = [
id: 2,
items: [
{
- label: "入职时间",
+ label: getLabel(111, "入职时间"),
value: "hiredate"
},
{
- label: "手机号",
+ label: getLabel(111, "手机号"),
value: "mobile"
},
{
- label: "个税扣缴义务人",
+ label: getLabel(111, "个税扣缴义务人"),
value: "taxAgent"
}
]
@@ -86,7 +87,7 @@ export default class SalaryFileViewSlide extends React.Component {
const items = [
{
com: PickDate({
- label: "起始发薪日期",
+ label: getLabel(111, "起始发薪日期"),
viewAttr: selectedKey === "pending" ? 3 : 1,
value: paysetParams.payStartDate,
onChange: handleSetpay
@@ -94,7 +95,7 @@ export default class SalaryFileViewSlide extends React.Component {
},
{
com: PickDate({
- label: "最后发薪日期",
+ label: getLabel(111, "最后发薪日期"),
viewAttr: (selectedKey === "pending" || selectedKey === "fixed") ? 2 : selectedKey === "stop" ? 1 : 3,
value: paysetParams.payEndDate,
onChange: handleSetpay
@@ -103,7 +104,7 @@ export default class SalaryFileViewSlide extends React.Component {
];
return (
-
+
{
@@ -125,15 +126,15 @@ export default class SalaryFileViewSlide extends React.Component {
-
+
- 薪资档案
+ {getLabel(111, "薪资档案")}
@@ -169,7 +170,7 @@ export default class SalaryFileViewSlide extends React.Component {
/>
}
- )) : 暂无数据
+ )) : {getLabel(111, "暂无数据")}
}
}
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/taxAgentChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/taxAgentChangeList.js
index 0c900839..d769a08c 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/taxAgentChangeList.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/taxAgentChangeList.js
@@ -1,81 +1,81 @@
-import React from 'react';
-import { Table } from 'antd'
-import { WeaTable } from 'ecCom'
-import { inject, observer } from 'mobx-react';
-import EditAgentModal from './editAgentModal'
+import React from "react";
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+import { inject, observer } from "mobx-react";
+import EditAgentModal from "./editAgentModal";
-@inject('salaryFileStore')
+const getLabel = WeaLocaleProvider.getLabel;
+@inject("salaryFileStore")
@observer
export default class TaxAgentChangeList extends React.Component {
- constructor(props) {
- super(props)
- this.state = {
- recordId: '',
- editAgentVisible: false
+ constructor(props) {
+ super(props);
+ this.state = {
+ recordId: "",
+ editAgentVisible: false
+ };
+ this.searchParams = {};
+ }
+
+ componentWillMount() {
+ const { salaryFileStore: { fetchSingleTaxAgentList } } = this.props;
+ this.searchParams = { salaryArchiveId: this.props.id, current: 1 };
+ fetchSingleTaxAgentList(this.searchParams);
+ }
+
+ // 编辑回调
+ handleEdit(record) {
+ const { salaryFileStore: { setEditAgentVisible } } = this.props;
+ this.setState({
+ recordId: record.id,
+ editAgentVisible: true
+ });
+ }
+
+ // 获取Columns
+ getColumns() {
+ const { salaryFileStore: { singleTaxAgentList } } = this.props;
+ let columns = [];
+ if (singleTaxAgentList.columns) {
+ columns = [...singleTaxAgentList.columns];
+ }
+ return columns;
+ }
+
+ // 页面跳转
+ handlePageChange(value) {
+ this.searchParams.current = value;
+ const { salaryFileStore: { fetchSingleTaxAgentList } } = this.props;
+ fetchSingleTaxAgentList(this.searchParams);
+ }
+
+ render() {
+ const { salaryFileStore } = this.props;
+ const { singleTaxAgentList } = salaryFileStore;
+ return (
+
+
{
+ this.handlePageChange(value);
+ },
+ total: singleTaxAgentList.total,
+ showTotal: total => `${getLabel(83698, "共")} ${total} ${getLabel(18256, "条")}`,
+ current: singleTaxAgentList.pageNum
+ }}
+ />
+ {
+ this.state.editAgentVisible && {
+ this.setState({ editAgentVisible: false });
+ }}
+ />
}
- this.searchParams = {}
- }
-
- componentWillMount() {
- const { salaryFileStore: { fetchSingleTaxAgentList }} = this.props;
- this.searchParams = {salaryArchiveId: this.props.id, current: 1}
- fetchSingleTaxAgentList(this.searchParams)
- }
-
- // 编辑回调
- handleEdit(record) {
- const { salaryFileStore: {setEditAgentVisible} } = this.props;
- this.setState({
- recordId: record.id,
- editAgentVisible: true
- })
- }
-
- // 获取Columns
- getColumns() {
- const { salaryFileStore: {singleTaxAgentList} } = this.props;
- let columns = []
- if(singleTaxAgentList.columns) {
- columns = [...singleTaxAgentList.columns]
- }
- return columns
- }
-
- // 页面跳转
- handlePageChange(value) {
- this.searchParams.current = value
- const { salaryFileStore: { fetchSingleTaxAgentList }} = this.props;
- fetchSingleTaxAgentList(this.searchParams)
- }
-
- render() {
- const { salaryFileStore } = this.props;
- const { singleTaxAgentList } = salaryFileStore
- return (
-
- {
-this.handlePageChange(value)
-},
- total: singleTaxAgentList.total,
- showTotal: (total) => `共 ${total} 条`,
- current: singleTaxAgentList.pageNum
- }}
- />
- {
- this.state.editAgentVisible && {
-this.setState({editAgentVisible: false})
-}}
- />
- }
-
- )
- }
-}
\ No newline at end of file
+
+ );
+ }
+}
From 5196f38cb833ebad16ab16e987896a37735affd4 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, 18 Apr 2023 14:32:20 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=C2=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/dataAcquisition/addItems.js | 32 ++--
.../dataAcquisition/components/tableRecord.js | 11 +-
.../dataAcquisition/cumDeduct/columns.js | 171 +++++++++---------
.../cumDeduct/components/importFormCom.js | 10 +-
pc4mobx/hrmSalary/pages/ruleConfig/index.js | 79 ++++----
5 files changed, 157 insertions(+), 146 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
index 07dcad4d..1c0b3c7c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
@@ -4,12 +4,14 @@
* Description:
*/
import React, { Component } from "react";
-import { WeaBrowser, WeaFormItem, WeaInput, WeaSearchGroup } from "ecCom";
+import { WeaBrowser, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import { getSearchs } from "../../util";
import { Select } from "../ruleConfig";
import { PickDate } from "../appConfig";
import "./index.less";
+const getLabel = WeaLocaleProvider.getLabel;
+
class AddItems extends Component {
constructor(props) {
super(props);
@@ -77,7 +79,7 @@ class AddItems extends Component {
let items = [
{
com: PickDate({
- label: "税款所属期",
+ label: getLabel(111, "税款所属期"),
viewAttr: _.isEmpty(editId) ? 3 : 1,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
@@ -90,7 +92,7 @@ class AddItems extends Component {
},
{
com: Select({
- label: "个税扣缴义务人",
+ label: getLabel(111, "个税扣缴义务人"),
viewAttr: _.isEmpty(editId) ? 3 : 1,
options: taxAgentOption,
value: baseInfo.taxAgentId,
@@ -101,7 +103,7 @@ class AddItems extends Component {
},
{
com: Browser({
- label: "人员",
+ label: getLabel(111, "人员"),
viewAttr: _.isEmpty(editId) ? 3 : 1,
value: baseInfo.employeeId,
valueSpan: baseInfo.employeeName,
@@ -114,7 +116,7 @@ class AddItems extends Component {
const cumSituationitems = [
{
com: PickDate({
- label: "税款所属期",
+ label: getLabel(111, "税款所属期"),
viewAttr: _.isEmpty(editId) ? 3 : 1,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
@@ -127,7 +129,7 @@ class AddItems extends Component {
},
{
com: Select({
- label: "个税扣缴义务人",
+ label: getLabel(111, "个税扣缴义务人"),
viewAttr: _.isEmpty(editId) ? 3 : 1,
options: taxAgentOption,
value: baseInfo.taxAgentId,
@@ -138,11 +140,11 @@ class AddItems extends Component {
},
{
com: Select({
- label: "人员范围",
+ label: getLabel(111, "人员范围"),
viewAttr: _.isEmpty(editId) ? 3 : 1,
options: [
- { key: "ORGANIZATION", showname: "内部人员" }
- // { key: "EXT_EMPLOYEE", showname: "非系统人员" }
+ { key: "ORGANIZATION", showname: getLabel(111, "内部人员") }
+ // { key: "EXT_EMPLOYEE", showname: getLabel(111, "非系统人员") }
],
value: baseInfo.personArea,
onChange: (data) => {
@@ -153,7 +155,7 @@ class AddItems extends Component {
];
const insider = [{
com: Browser({
- label: "人员",
+ label: getLabel(111, "人员"),
viewAttr: _.isEmpty(editId) ? 3 : 1,
value: baseInfo.employeeId,
valueSpan: baseInfo.employeeName,
@@ -165,7 +167,7 @@ class AddItems extends Component {
const noSysPerson = [
{
com: InputCus({
- label: "姓名",
+ label: getLabel(111, "姓名"),
viewAttr: 2,
onChange: (username) => {
this.setState({ baseInfo: { ...baseInfo, username } });
@@ -174,7 +176,7 @@ class AddItems extends Component {
},
{
com: InputCus({
- label: "身份证号码",
+ label: getLabel(111, "身份证号码"),
viewAttr: 3,
onChange: (idcard) => {
this.setState({ baseInfo: { ...baseInfo, idcard } });
@@ -187,13 +189,13 @@ class AddItems extends Component {
{
getSearchs(form, condition, 2)
}
- 若此员工数据已存在在同期列表中,则当前数据保存后会覆盖列表数据
+ {getLabel(111, "若此员工数据已存在在同期列表中,则当前数据保存后会覆盖列表数据")}
);
}
@@ -227,7 +229,7 @@ export const Tips = payload => {
const { children } = payload;
return (
-
小提示
+
{getLabel(111, "小提示")}
{children}
);
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
index 00fedce7..3ac8fe1c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
@@ -5,12 +5,13 @@
* Date: 2023/2/20
*/
import React, { Component } from "react";
-import { WeaSearchGroup } from "ecCom";
+import { WeaSearchGroup, WeaLocaleProvider } from "ecCom";
import UnifiedTable from "../../../components/UnifiedTable";
import { getTableRecordDate } from "../../../apis/cumDeduct";
import { DataCollectionDateRangePick, DataCollectionSelect, Input } from "../cumDeduct";
import "./index.less";
+const getLabel = WeaLocaleProvider.getLabel;
class TableRecord extends Component {
constructor(props) {
super(props);
@@ -123,7 +124,7 @@ class TableRecord extends Component {
};
const pagination = {
...pageInfo,
- showTotal: (total) => `共 ${total} 条`,
+ showTotal: total => `${getLabel(83698, "共")} ${total} ${getLabel(18256, "条")}`,
pageSizeOptions: ["10", "20", "50", "100"],
showSizeChanger: true,
showQuickJumper: true,
@@ -152,7 +153,7 @@ class TableRecord extends Component {
},
{
com: DataCollectionDateRangePick({
- label: "税款所属期",
+ label: getLabel(111, "税款所属期"),
range: recordPayload[screenParams[screenParams.length - 1]] || [],
onChange: this.handleTablerecordScreen,
key: screenParams[screenParams.length - 1]
@@ -160,9 +161,9 @@ class TableRecord extends Component {
},
{
com: DataCollectionSelect({
- label: "个税扣缴义务人",
+ label: getLabel(111, "个税扣缴义务人"),
value: !_.isNil(recordPayload.taxAgentId) ? recordPayload.taxAgentId.toString() : "",
- options: [{ key: "", showname: "全部" }, ...taxAgentOption],
+ options: [{ key: "", showname: getLabel(111, "全部") }, ...taxAgentOption],
onChange: this.handleTablerecordScreen,
key: "taxAgentId"
})
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
index 9d6b6831..15b773ce 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
@@ -1,66 +1,69 @@
+import { WeaLocaleProvider } from "ecCom";
+
+const getLabel = WeaLocaleProvider.getLabel;
export const columns = [
{
- title: "姓名",
+ title: getLabel(111, "姓名"),
dataIndex: "title",
key: "title"
},
{
- title: "个税扣缴义务人",
+ title: getLabel(111, "个税扣缴义务人"),
dataIndex: "title",
key: "title"
},
{
- title: "部门",
+ title: getLabel(111, "部门"),
dataIndex: "title",
key: "title"
},
{
- title: "手机号",
+ title: getLabel(111, "手机号"),
dataIndex: "title",
key: "title"
},
{
- title: "工号",
+ title: getLabel(111, "工号"),
dataIndex: "title",
key: "title"
},
{
- title: "证件号码",
+ title: getLabel(111, "证件号码"),
dataIndex: "title",
key: "title"
},
{
- title: "入职日期",
+ title: getLabel(111, "入职日期"),
dataIndex: "title",
key: "title"
},
{
- title: "累计子女教育",
+ title: getLabel(111, "累计子女教育"),
dataIndex: "title",
key: "title"
},
{
- title: "累计继续教育",
+ title: getLabel(111, "累计继续教育"),
dataIndex: "title",
key: "title"
},
{
- title: "累计住房贷款利息",
+ title: getLabel(111, "累计住房贷款利息"),
dataIndex: "title",
key: "title"
},
{
- title: "累计住房租金",
+ title: getLabel(111, "累计住房租金"),
dataIndex: "title",
key: "title"
},
{
- title: "累计赡养老人",
+ title: getLabel(111, "累计赡养老人"),
dataIndex: "title",
key: "title"
},
{
- title: "操作",
+ title: getLabel(111, "操作"),
dataIndex: "title",
key: "title"
}
@@ -69,323 +72,323 @@ export const columns = [
export const modalColumns = [
{
- title: "姓名",
+ title: getLabel(111, "姓名"),
dataIndex: "username",
key: "username"
},
{
- title: "个税扣缴义务人",
+ title: getLabel(111, "个税扣缴义务人"),
dataIndex: "taxAgentName",
key: "taxAgentName"
},
{
- title: "部门",
+ title: getLabel(111, "部门"),
dataIndex: "departmentName",
key: "departmentName"
},
{
- title: "手机号",
+ title: getLabel(111, "手机号"),
dataIndex: "mobile",
key: "mobile"
},
{
- title: "工号",
+ title: getLabel(111, "工号"),
dataIndex: "jobNum",
key: "jobNum"
},
{
- title: "证件号码",
+ title: getLabel(111, "证件号码"),
dataIndex: "idNo",
key: "idNo"
},
{
- title: "入职日期",
+ title: getLabel(111, "入职日期"),
dataIndex: "hiredate",
key: "hiredate"
},
{
- title: "累计子女教育",
+ title: getLabel(111, "累计子女教育"),
dataIndex: "addUpChildEducation",
key: "addUpChildEducation"
},
{
- title: "累计继续教育",
+ title: getLabel(111, "累计继续教育"),
dataIndex: "addUpContinuingEducation",
key: "addUpContinuingEducation"
},
{
- title: "累计住房贷款利息",
+ title: getLabel(111, "累计住房贷款利息"),
dataIndex: "addUpHousingLoanInterest",
key: "addUpHousingLoanInterest"
},
{
- title: "累计住房租金",
+ title: getLabel(111, "累计住房租金"),
dataIndex: "addUpHousingRent",
key: "addUpHousingRent"
},
{
- title: "累计赡养老人",
+ title: getLabel(111, "累计赡养老人"),
dataIndex: "addUpSupportElderly",
key: "addUpSupportElderly"
},
{
- title: "累计婴幼儿照护",
+ title: getLabel(111, "累计婴幼儿照护"),
dataIndex: "addUpInfantCare",
key: "addUpInfantCare"
},
{
- title: "累计大病医疗",
+ title: getLabel(111, "累计大病医疗"),
dataIndex: "addUpIllnessMedical",
key: "addUpIllnessMedical"
}
];
export const specialModalColumns = [
{
- title: "姓名",
+ title: getLabel(111, "姓名"),
dataIndex: "username",
key: "username"
},
{
- title: "个税扣缴义务人",
+ title: getLabel(111, "个税扣缴义务人"),
dataIndex: "taxAgentName",
key: "taxAgentName"
},
{
- title: "部门",
+ title: getLabel(111, "部门"),
dataIndex: "departmentName",
key: "departmentName"
},
{
- title: "手机号",
+ title: getLabel(111, "手机号"),
dataIndex: "mobile",
key: "mobile"
},
{
- title: "工号",
+ title: getLabel(111, "工号"),
dataIndex: "jobNum",
key: "jobNum"
},
{
- title: "证件号码",
+ title: getLabel(111, "证件号码"),
dataIndex: "idNo",
key: "idNo"
},
{
- title: "入职日期",
+ title: getLabel(111, "入职日期"),
dataIndex: "hiredate",
key: "hiredate"
},
{
- title: "子女教育",
+ title: getLabel(111, "子女教育"),
dataIndex: "childrenEducation",
key: "childrenEducation"
},
{
- title: "继续教育",
+ title: getLabel(111, "继续教育"),
dataIndex: "continuingEducation",
key: "continuingEducation"
},
{
- title: "住房贷款利息",
+ title: getLabel(111, "住房贷款利息"),
dataIndex: "housingLoanInterest",
key: "housingLoanInterest"
},
{
- title: "住房租金",
+ title: getLabel(111, "住房租金"),
dataIndex: "housingRent",
key: "housingRent"
},
{
- title: "赡养老人",
+ title: getLabel(111, "赡养老人"),
dataIndex: "supportingElder",
key: "supportingElder"
},
{
- title: "婴幼儿照护",
+ title: getLabel(111, "婴幼儿照护"),
dataIndex: "infantCare",
key: "infantCare"
},
{
- title: "大病医疗",
+ title: getLabel(111, "大病医疗"),
dataIndex: "seriousIllnessTreatment",
key: "seriousIllnessTreatment"
}
];
export const otherModalColumns = [
{
- title: "姓名",
+ title: getLabel(111, "姓名"),
dataIndex: "username",
key: "username"
},
{
- title: "个税扣缴义务人",
+ title: getLabel(111, "个税扣缴义务人"),
dataIndex: "taxAgentName",
key: "taxAgentName"
},
{
- title: "部门",
+ title: getLabel(111, "部门"),
dataIndex: "departmentName",
key: "departmentName"
},
{
- title: "手机号",
+ title: getLabel(111, "手机号"),
dataIndex: "mobile",
key: "mobile"
},
{
- title: "工号",
+ title: getLabel(111, "工号"),
dataIndex: "jobNum",
key: "jobNum"
},
{
- title: "证件号码",
+ title: getLabel(111, "证件号码"),
dataIndex: "idNo",
key: "idNo"
},
{
- title: "入职日期",
+ title: getLabel(111, "入职日期"),
dataIndex: "hiredate",
key: "hiredate"
},
{
- title: "商业健康保险",
+ title: getLabel(111, "商业健康保险"),
dataIndex: "businessHealthyInsurance",
key: "businessHealthyInsurance"
},
{
- title: "税延养老保险",
+ title: getLabel(111, "税延养老保险"),
dataIndex: "taxDelayEndowmentInsurance",
key: "taxDelayEndowmentInsurance"
},
{
- title: "其他",
+ title: getLabel(111, "其他"),
dataIndex: "otherDeduction",
key: "otherDeduction"
},
{
- title: "准予扣除的捐赠额",
+ title: getLabel(111, "准予扣除的捐赠额"),
dataIndex: "deductionAllowedDonation",
key: "deductionAllowedDonation"
}
];
export const situationModalColumns = [
{
- title: "姓名",
+ title: getLabel(111, "姓名"),
dataIndex: "username",
key: "username"
},
{
- title: "个税扣缴义务人",
+ title: getLabel(111, "个税扣缴义务人"),
dataIndex: "taxAgentName",
key: "taxAgentName"
},
{
- title: "部门",
+ title: getLabel(111, "部门"),
dataIndex: "departmentName",
key: "departmentName"
},
{
- title: "手机号",
+ title: getLabel(111, "手机号"),
dataIndex: "mobile",
key: "mobile"
},
{
- title: "工号",
+ title: getLabel(111, "工号"),
dataIndex: "jobNum",
key: "jobNum"
},
{
- title: "证件号码",
+ title: getLabel(111, "证件号码"),
dataIndex: "idNo",
key: "idNo"
},
{
- title: "入职日期",
+ title: getLabel(111, "入职日期"),
dataIndex: "hiredate",
key: "hiredate"
},
{
- title: "累计收入额",
+ title: getLabel(111, "累计收入额"),
dataIndex: "addUpIncome",
key: "addUpIncome"
},
{
- title: "累计减除费用",
+ title: getLabel(111, "累计减除费用"),
dataIndex: "addUpSubtraction",
key: "addUpSubtraction"
},
{
- title: "累计社保个人合计",
+ title: getLabel(111, "累计社保个人合计"),
dataIndex: "addUpSocialSecurityTotal",
key: "addUpSocialSecurityTotal"
},
{
- title: "累计公积金个人合计",
+ title: getLabel(111, "累计公积金个人合计"),
dataIndex: "addUpAccumulationFundTotal",
key: "addUpAccumulationFundTotal"
},
{
- title: "累计子女教育",
+ title: getLabel(111, "累计子女教育"),
dataIndex: "addUpChildEducation",
key: "addUpChildEducation"
},
{
- title: "累计继续教育",
+ title: getLabel(111, "累计继续教育"),
dataIndex: "addUpContinuingEducation",
key: "addUpContinuingEducation"
},
{
- title: "累计住房贷款利息",
+ title: getLabel(111, "累计住房贷款利息"),
dataIndex: "addUpHousingLoanInterest",
key: "addUpHousingLoanInterest"
},
{
- title: "累计住房租金",
+ title: getLabel(111, "累计住房租金"),
dataIndex: "addUpHousingRent",
key: "addUpHousingRent"
},
{
- title: "累计赡养老人",
+ title: getLabel(111, "累计赡养老人"),
dataIndex: "addUpSupportElderly",
key: "addUpSupportElderly"
},
{
- title: "累计企业(职业)年金及其他福利",
+ title: getLabel(111, "累计企业(职业)年金及其他福利"),
dataIndex: "addUpEnterpriseAndOther",
key: "addUpEnterpriseAndOther"
},
{
- title: "累计其他免税扣除",
+ title: getLabel(111, "累计其他免税扣除"),
dataIndex: "addUpOtherDeduction",
key: "addUpOtherDeduction"
},
{
- title: "累计免税收入",
+ title: getLabel(111, "累计免税收入"),
dataIndex: "addUpTaxExemptIncome",
key: "addUpTaxExemptIncome"
},
{
- title: "累计准予扣除的捐赠额",
+ title: getLabel(111, "累计准予扣除的捐赠额"),
dataIndex: "addUpAllowedDonation",
key: "addUpAllowedDonation"
},
{
- title: "累计减免税额",
+ title: getLabel(111, "累计减免税额"),
dataIndex: "addUpTaxSavings",
key: "addUpTaxSavings"
},
{
- title: "累计已预扣预缴税额",
+ title: getLabel(111, "累计已预扣预缴税额"),
dataIndex: "addUpAdvanceTax",
key: "addUpAdvanceTax"
},
{
- title: "累计婴幼儿照护",
+ title: getLabel(111, "累计婴幼儿照护"),
dataIndex: "addUpInfantCare",
key: "addUpInfantCare"
},
{
- title: "累计大病医疗",
+ title: getLabel(111, "累计大病医疗"),
dataIndex: "addUpIllnessMedical",
key: "addUpIllnessMedical"
}
@@ -402,7 +405,7 @@ export const dataCollectCondition = [
conditionType: "INPUT",
domkey: ["addUpChildEducation"],
fieldcol: 14,
- label: "累计子女教育",
+ label: getLabel(111, "累计子女教育"),
labelcol: 8,
value: "",
viewAttr: 2
@@ -411,7 +414,7 @@ export const dataCollectCondition = [
conditionType: "INPUT",
domkey: ["addUpContinuingEducation"],
fieldcol: 14,
- label: "累计继续教育",
+ label: getLabel(111, "累计继续教育"),
labelcol: 8,
value: "",
viewAttr: 2
@@ -420,7 +423,7 @@ export const dataCollectCondition = [
conditionType: "INPUT",
domkey: ["addUpHousingLoanInterest"],
fieldcol: 14,
- label: "累计住房贷款利息",
+ label: getLabel(111, "累计住房贷款利息"),
labelcol: 8,
value: "",
viewAttr: 2
@@ -429,7 +432,7 @@ export const dataCollectCondition = [
conditionType: "INPUT",
domkey: ["addUpHousingRent"],
fieldcol: 14,
- label: "累计住房租金",
+ label: getLabel(111, "累计住房租金"),
labelcol: 8,
value: "",
viewAttr: 2
@@ -438,7 +441,7 @@ export const dataCollectCondition = [
conditionType: "INPUT",
domkey: ["addUpSupportElderly"],
fieldcol: 14,
- label: "累计赡养老人",
+ label: getLabel(111, "累计赡养老人"),
labelcol: 8,
value: "",
viewAttr: 2
@@ -447,7 +450,7 @@ export const dataCollectCondition = [
conditionType: "INPUT",
domkey: ["addUpIllnessMedical"],
fieldcol: 14,
- label: "累计大病医疗",
+ label: getLabel(111, "累计大病医疗"),
labelcol: 8,
value: "",
viewAttr: 2
@@ -456,13 +459,13 @@ export const dataCollectCondition = [
conditionType: "INPUT",
domkey: ["addUpInfantCare"],
fieldcol: 14,
- label: "累计婴幼儿照护",
+ label: getLabel(111, "累计婴幼儿照护"),
labelcol: 8,
value: "",
viewAttr: 2
}
],
- title: '数据采集',
+ title: getLabel(111, "数据采集"),
defaultshow: true
}
];
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js
index 0044f630..6b8707a9 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js
@@ -5,9 +5,11 @@
* Date: 2023/2/20
*/
import React, { Component } from "react";
-import { WeaSearchGroup } from "ecCom";
+import { WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import { DataCollectionDatePicker, DataCollectionSelect } from "../index";
+const getLabel = WeaLocaleProvider.getLabel;
+
class ImportFormCom extends Component {
screenChange = ({ key, value }) => {
const { onChangeImportForm } = this.props;
@@ -19,7 +21,7 @@ class ImportFormCom extends Component {
const items = [
{
com: DataCollectionDatePicker({
- label: "税款所属期",
+ label: getLabel(111, "税款所属期"),
value: declareMonth,
onChange: this.screenChange,
key: "declareMonth",
@@ -28,10 +30,10 @@ class ImportFormCom extends Component {
},
{
com: DataCollectionSelect({
- label: "个税扣缴义务人",
+ label: getLabel(111, "个税扣缴义务人"),
value: taxAgentId || "",
onChange: this.screenChange,
- options: [{ key: "", showname: "全部" }, ...taxAgentOption],
+ options: [{ key: "", showname: getLabel(111, "全部") }, ...taxAgentOption],
key: "taxAgentId"
})
}
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
index 3d3ac81f..53894d3a 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@@ -5,13 +5,15 @@
* Date: 2022-09-19 18:15:32
*/
import React, { Component } from "react";
-import { WeaFormItem, WeaNewScroll, WeaSearchGroup, WeaSelect, WeaTop } from "ecCom";
+import { WeaFormItem, WeaLocaleProvider, WeaNewScroll, WeaSearchGroup, WeaSelect, WeaTop } from "ecCom";
import { CheckBox } from "../appConfig";
import { Button, message, Modal } from "antd";
import * as API from "../../apis/ruleconfig";
import "./index.less";
import ProgressModal from "../../components/progressModal";
+const getLabel = WeaLocaleProvider.getLabel;
+
class Index extends Component {
constructor(props) {
super(props);
@@ -52,7 +54,7 @@ class Index extends Component {
items: [
{
com: Select({
- label: "排序字段",
+ label: getLabel(111, "排序字段"),
onChange: this.handleChane,
value: sysOrderRule.data.orderRule,
options: orderOptions
@@ -60,7 +62,7 @@ class Index extends Component {
},
{
com: Select({
- label: "正序/倒序",
+ label: getLabel(111, "正序/倒序"),
onChange: this.handleChane,
value: sysOrderRule.data.ascOrDesc,
options: ascOptions
@@ -70,7 +72,7 @@ class Index extends Component {
importItems: [
{
com: Select({
- label: "人员字段",
+ label: getLabel(111, "人员字段"),
onChange: this.handleChane,
value: sysConfCodeRule.data,
options: employeeOptions
@@ -80,18 +82,18 @@ class Index extends Component {
enctryItems: queryAppsetting.data.showEncryptOperationButton === "true" ? [
{
com: CheckBox({
- label: "加密设置",
+ label: getLabel(111, "加密设置"),
value: queryAppsetting.data.isOpenEncrypt,
- onChange: (data) => this.handleChane({ type: "加密设置", selected: data })
+ onChange: (data) => this.handleChane({ type: getLabel(111, "加密设置"), selected: data })
})
}
] : [],
declareItems: [
{
com: CheckBox({
- label: "个税申报",
+ label: getLabel(111, "个税申报"),
value: queryAppsetting.data.isOpenTaxDeclaration,
- onChange: (data) => this.handleChane({ type: "个税申报", selected: data })
+ onChange: (data) => this.handleChane({ type: getLabel(111, "个税申报"), selected: data })
})
}
],
@@ -138,8 +140,8 @@ class Index extends Component {
if (type === "ORDER") {
if (_.isEmpty(saveParams.orderRule) || _.isEmpty(saveParams.ascOrDesc)) {
Modal.warning({
- title: "信息确认",
- content: "必要信息不完整,红色*为必填项!"
+ title: getLabel(111, "信息确认"),
+ content: getLabel(111, "必要信息不完整,红色*为必填项!")
});
return;
}
@@ -147,17 +149,17 @@ class Index extends Component {
API.updateOrderRule(_.pick(saveParams, ["orderRule", "ascOrDesc"])).then(({ status, errormsg }) => {
this.setState({ loading: { ...this.state.loading, order: false } });
if (status) {
- message.success("保存成功!");
+ message.success(getLabel(111, "保存成功"));
let sysSetting = this.getSysSetting();
} else {
- message.error(errormsg || "保存失败!");
+ message.error(errormsg || getLabel(111, "保存失败"));
}
});
} else if (type === "EMPLOYEE") {
if (_.isEmpty(saveParams.rule)) {
Modal.warning({
- title: "信息确认",
- content: "必要信息不完整,红色*为必填项!"
+ title: getLabel(111, "信息确认"),
+ content: getLabel(111, "必要信息不完整,红色*为必填项!")
});
return;
}
@@ -165,16 +167,16 @@ class Index extends Component {
API.saveMatchEmployeeModeRule(_.pick(saveParams, ["rule"])).then(({ status, errormsg }) => {
this.setState({ loading: { ...this.state.loading, employee: false } });
if (status) {
- message.success("保存成功!");
+ message.success(getLabel(111, "保存成功"));
let sysSetting = this.getSysSetting();
} else {
- message.error(errormsg || "保存失败!");
+ message.error(errormsg || getLabel(111, "保存失败"));
}
});
} else if (type === "ENCRYTION") {
Modal.confirm({
- title: "信息确认",
- content: "开启/关闭加密前请做好数据库备份!!!逆向解密会花费几分钟时间,请耐心等待!!!",
+ title: getLabel(111, "信息确认"),
+ content: getLabel(111, "开启/关闭加密前请做好数据库备份!!!逆向解密会花费几分钟时间,请耐心等待!!!"),
onOk: () => {
this.setState({ loading: { ...this.state.loading, encry: true } });
API.saveEncryptSetting({ isOpenEncrypt: saveParams.enctry }).then(({ data, status, errormsg }) => {
@@ -182,7 +184,7 @@ class Index extends Component {
if (status) {
const { isSuccess, progressId, msg } = data;
if (!isSuccess) {
- message.error(errormsg || msg || "保存失败!");
+ message.error(errormsg || msg || getLabel(111, "保存失败"));
return;
}
this.setState({
@@ -205,7 +207,7 @@ class Index extends Component {
progressVisible: false
});
});
- message.success("保存成功");
+ message.success(getLabel(111, "保存成功"));
} else if (progress_statue === "in_progress" && this.timer) {
if (this.state.progress >= 90) {
this.setState({
@@ -227,7 +229,7 @@ class Index extends Component {
progressVisible: false
});
});
- message.error(errormsg || "保存失败!");
+ message.error(errormsg || getLabel(111, "保存失败"));
}
});
}, 1000);
@@ -243,10 +245,10 @@ class Index extends Component {
API.operateTaxDeclarationFunction(_.pick(saveParams, ["operateTaxDeclaration"])).then(({ status, errormsg }) => {
this.setState({ loading: { ...this.state.loading, declare: false } });
if (status) {
- message.success("保存成功!");
+ message.success(getLabel(111, "保存成功"));
let sysSetting = this.getSysSetting();
} else {
- message.error(errormsg || "保存失败!");
+ message.error(errormsg || getLabel(111, "保存失败"));
}
});
}
@@ -254,23 +256,23 @@ class Index extends Component {
handleChane = (data) => {
const { type, selected } = data;
- if (type === "排序字段") {
+ if (type === getLabel(111, "排序字段")) {
this.setState({
saveParams: { ...this.state.saveParams, orderRule: selected }
});
- } else if (type === "正序/倒序") {
+ } else if (type === getLabel(111, "正序/倒序")) {
this.setState({
saveParams: { ...this.state.saveParams, ascOrDesc: selected }
});
- } else if (type === "人员字段") {
+ } else if (type === getLabel(111, "人员字段")) {
this.setState({
saveParams: { ...this.state.saveParams, rule: selected }
});
- } else if (type === "加密设置") {
+ } else if (type === getLabel(111, "加密设置")) {
this.setState({
saveParams: { ...this.state.saveParams, enctry: selected }
});
- } else if (type === "个税申报") {
+ } else if (type === getLabel(111, "个税申报")) {
this.setState({
saveParams: { ...this.state.saveParams, operateTaxDeclaration: selected }
});
@@ -282,7 +284,7 @@ class Index extends Component {
return (
规则配置}
+ title={{getLabel(111, "规则配置")}}
icon={}
iconBgcolor="#F14A2D"
buttons={[]}
@@ -291,16 +293,17 @@ class Index extends Component {
- 排序规则
-
+ {getLabel(111, "排序规则")}
+
} showGroup center items={items}/>
- 人员校验规则
+ {getLabel(111, "人员校验规则")}
+ loading={loading.employee}>{getLabel(111, "保存")}
} showGroup center items={importItems}/>
{
@@ -308,24 +311,24 @@ class Index extends Component {