diff --git a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
index 19a14492..d9bc8de7 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
@@ -75,22 +75,22 @@ class PersonalScopeModal extends Component {
const targetTypeList = [
{
key: "EMPLOYEE",
- showname: "人员",
+ showname: getLabel(30042, "人员"),
selected: false
},
{
key: "SUBCOMPANY",
- showname: "分部",
+ showname: getLabel(33553, "分部"),
selected: false
},
{
key: "DEPT",
- showname: "部门",
+ showname: getLabel(27511, "部门"),
selected: false
},
{
key: "POSITION",
- showname: "岗位",
+ showname: getLabel(6086, "岗位"),
selected: false
}
];
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js
index 5026322a..e37285d8 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js
@@ -41,11 +41,11 @@ class Index extends Component {
items: _.map(item.items, o => {
if (getKey(o) === "salarySobId") {
return {
- ...o,
+ ...o, label: getLabel(o.lanId, o.label),
options: _.map(salarySobs, g => ({ key: g.id.toString(), showname: g.name }))
};
}
- return { ...o };
+ return { ...o, label: getLabel(o.lanId, o.label) };
})
}))
}, () => calculateForm.initFormFields(this.state.conditions));
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
index 59fcb015..0d353437 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
@@ -135,6 +135,7 @@ export const editCalcSearchConditions = [
fieldcol: 12,
isQuickSearch: false,
label: "合并计税",
+ lanId: 542607,
labelcol: 6,
viewAttr: 2
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
index 2b68f36e..9c7928b2 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
@@ -47,7 +47,7 @@ class EditCalcAdvanceSearchPannel extends Component {
]
};
}
- return { ...o };
+ return { ...o, label: getLabel(o.lanId, o.label) };
}),
title: getLabel(32905, "常用条件")
};
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
index 63e4f6b0..5617ce32 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
@@ -119,6 +119,7 @@ export const conditions = [
fieldcol: 14,
rules: "required|string",
label: getLabel(685, "字段名称"),
+ lanId: 685,
labelcol: 6,
value: "",
viewAttr: 3
@@ -130,18 +131,21 @@ export const conditions = [
fieldcol: 14,
isQuickSearch: false,
label: getLabel(500401, "类型"),
+ lanId: 500401,
labelcol: 6,
valueList: [],
options: [
{
key: "NUMBER",
selected: true,
- showname: getLabel(17639, "数值")
+ showname: getLabel(17639, "数值"),
+ lanId: 17639,
},
{
key: "TEXT",
selected: false,
- showname: getLabel(128895, "文本")
+ showname: getLabel(128895, "文本"),
+ lanId: 128895,
}
],
rules: "required|string",
@@ -153,6 +157,7 @@ export const conditions = [
domkey: ["enableStatus"],
fieldcol: 14,
label: getLabel(535448, "是否启用"),
+ lanId: 535448,
labelcol: 6,
viewAttr: 3,
rules: "required"
@@ -163,6 +168,7 @@ export const conditions = [
domkey: ["description"],
fieldcol: 14,
label: getLabel(536726, "备注"),
+ lanId: 536726,
labelcol: 6,
value: "",
viewAttr: 2
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
index c8847a7f..3d519db7 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
@@ -6,27 +6,41 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
-import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
import { Button, message } from "antd";
import { conditions } from "../columns";
import { getSearchs } from "../../../../util";
import { saveAttendanceField } from "../../../../apis/attendance";
import "./index.less";
+const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
+
@inject("attendanceStore")
@observer
class AttendanceCustomFieldsModal extends Component {
componentDidMount() {
const { attendanceStore: { form } } = this.props;
- form.initFormFields(conditions);
+ form.initFormFields(_.map(conditions, item => {
+ return {
+ ...item,
+ items: _.map(item.items, o => {
+ if (getKey(o) === "fieldType") {
+ return {
+ ...o, label: getLabel(o.lanId, o.label),
+ options: _.map(o.options, g => ({ ...g, showname: getLabel(g.lanId, g.showname) }))
+ };
+ }
+ return { ...o, label: getLabel(o.lanId, o.label) };
+ })
+ };
+ }));
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.handleResetForm();
}
-
/*
* Author: 黎永顺
* Description: 保存考勤字段
@@ -68,7 +82,20 @@ class AttendanceCustomFieldsModal extends Component {
buttons={buttons} hasScroll initLoadCss
className="modalWrapper"
>
- {getSearchs(form, conditions, 1)}
+ {getSearchs(form, _.map(conditions, item => {
+ return {
+ ...item,
+ items: _.map(item.items, o => {
+ if (getKey(o) === "fieldType") {
+ return {
+ ...o, label: getLabel(o.lanId, o.label),
+ options: _.map(o.options, g => ({ ...g, showname: getLabel(g.lanId, g.showname) }))
+ };
+ }
+ return { ...o, label: getLabel(o.lanId, o.label) };
+ })
+ };
+ }), 1)}
);
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
index 197463bb..aed552e2 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
@@ -323,50 +323,62 @@ export const dataCollectCondition = [
export const taxOptions = [
{
key: "01",
- showname: "一月"
+ showname: "一月",
+ lanId: 1492
},
{
key: "02",
- showname: "二月"
+ showname: "二月",
+ lanId: 1493
},
{
key: "03",
- showname: "三月"
+ showname: "三月",
+ lanId: 1494
},
{
key: "04",
- showname: "四月"
+ showname: "四月",
+ lanId: 1495
},
{
key: "05",
- showname: "五月"
+ showname: "五月",
+ lanId: 1496
},
{
key: "06",
- showname: "六月"
+ showname: "六月",
+ lanId: 1497
},
{
key: "07",
- showname: "七月"
+ showname: "七月",
+ lanId: 1498
},
{
key: "08",
- showname: "八月"
+ showname: "八月",
+ lanId: 1499
},
{
key: "09",
- showname: "九月"
+ showname: "九月",
+ lanId: 1800
},
{
key: "10",
- showname: "十月"
+ showname: "十月",
+ lanId: 1801
},
{
key: "11",
- showname: "十一月"
+ showname: "十一月",
+ lanId: 1802
},
{
key: "12",
- showname: "十二月"
+ showname: "十二月",
+ lanId: 1803
}
];
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index 176d6e35..2a424417 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -385,7 +385,7 @@ class Index extends Component {
label: getLabel(542240, "税款所属期"),
value: declareMonth,
onChange: this.screenChange,
- options: taxOptions,
+ options: _.map(taxOptions, o => ({ ...o, showname: getLabel(o.lanId, o.showname) })),
key: "declareMonth",
labelCol: 12,
wrapperCol: 12
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index aacc4da8..0bddb74f 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -104,7 +104,7 @@ class DataTables extends Component {
} else if (dataIndex === "operate") {
return {
...item,
- width: 150,
+ width: 175,
render: (text, record) => (
{
diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
index a2ce2936..ae50f835 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
@@ -41,11 +41,13 @@ class Index extends Component {
items: _.map(item.items, o => {
if (getKey(o) === "taxAgentId") {
return {
- ...o, options: _.map(data, g => ({ key: g.id, showname: g.content }))
+ ...o,
+ options: _.map(data, g => ({ key: g.id, showname: g.content })),
+ label: getLabel(o.lanId, o.label)
// helpfulTitle: getLabel(563420, "提示:可选择单个个税扣缴义务人进行申报,若不选择,则批量对管理下的所有个税扣缴义务人进行申报;")
};
}
- return { ...o };
+ return { ...o, label: getLabel(o.lanId, o.label) };
})
}))
}, () => declareForm.initFormFields(this.state.conditions));
diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
index 6186adae..335dcf90 100644
--- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
+++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
@@ -39,7 +39,14 @@ class Index extends Component {
componentDidMount() {
const { externalPersonManageStore: { form, addForm } } = this.props;
form.initFormFields(searchCondition);
- addForm.initFormFields(condition);
+ addForm.initFormFields(_.map(condition, item => {
+ return {
+ ...item, title: getLabel(1361, "基本信息"),
+ items: _.map(item.items, o => ({
+ ...o, label: getLabel(o.lanId, o.label)
+ }))
+ };
+ }));
this.listPage();
}
@@ -192,8 +199,16 @@ class Index extends Component {
xWidth={800}
/>
{
+ return {
+ ...item, title: getLabel(1361, "基本信息"),
+ items: _.map(item.items, o => ({
+ ...o, label: getLabel(o.lanId, o.label)
+ }))
+ };
+ })}
/>
{
externalPersonImportPayload.visiable &&
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/categoryAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/categoryAddModal.js
index 2cc941fc..96d16be4 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/categoryAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/categoryAddModal.js
@@ -41,7 +41,12 @@ class CategoryAddModal extends Component {
getFormFields = () => {
const { ledgerStore } = this.props;
const { categoryForm: form } = ledgerStore;
- form.initFormFields(categoryConditions);
+ form.initFormFields(_.map(categoryConditions, item => {
+ return {
+ ...item,
+ items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
+ };
+ }));
};
handleSubmit = () => {
const { ledgerStore, id, onSaveCategory, onCancel } = this.props;
@@ -73,7 +78,12 @@ class CategoryAddModal extends Component {
buttons={buttons}
onCancel={onCancel}
>
- {getSearchs(form, categoryConditions, 1)}
+ {getSearchs(form, _.map(categoryConditions, item => {
+ return {
+ ...item,
+ items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
+ };
+ }), 1)}
);
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js
index 55376043..eafc098f 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js
@@ -50,11 +50,11 @@ class CopyLedgerModal extends Component {
it.items = _.map(it.items, child => {
if (child.domkey[0] === "taxAgentId") {
return {
- ...child,
+ ...child, label: getLabel(child.lanId, child.label),
options: _.map(data, it => ({ key: it.id, showname: it.content }))
};
} else {
- return { ...child };
+ return { ...child, label: getLabel(child.lanId, child.label) };
}
});
return { ...it };
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
index 7551434f..a787cacd 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
@@ -104,7 +104,8 @@ class LedgerAdjustRuleAddModal extends Component {
onCancel={this.handleReset}
>
-
this.setState({ salaryItemId, salaryItemName })}
/>
- } labelCol={{ span: languageidweaver == "8" ? 6 : 4 }} wrapperCol={{ span: languageidweaver == "8" ? 18 : 20 }} colon={false}>
+ } labelCol={{ span: languageidweaver == "8" ? 6 : 4 }}
+ wrapperCol={{ span: languageidweaver == "8" ? 18 : 20 }} colon={false}>
{getLabel(543496, "如果:调薪生效日期在")}
@@ -123,7 +125,7 @@ class LedgerAdjustRuleAddModal extends Component {
viewAttr={3}
style={{ width: 60, margin: "0 6px" }}
value={dayOfMonth}
- options={monthDays}
+ options={_.map(monthDays, o => ({ ...o, showname: getLabel(o.lanId, o.showname) }))}
onChange={(dayOfMonth) => this.setState({ dayOfMonth })}
/>
{getLabel(543497, "(含)之前")}
@@ -148,7 +150,8 @@ class LedgerAdjustRuleAddModal extends Component {
-
{getLabel(543503, "否则:调薪生效日期在")}{dayOfMonth}{getLabel(543505, "号之后")}
+
{getLabel(543503, "否则:调薪生效日期在")}{dayOfMonth}{getLabel(543505, "号之后")}
{getLabel(543498, "计薪规则为:")}
this.setState({ afterAdjustmentType: e.target.value })}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
index 251c38be..47e7df0f 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
@@ -42,6 +42,7 @@ export const categoryConditions = [
fieldcol: 14,
rules: "required|string",
label: getLabel(33439, "名称"),
+ lanId: 33439,
otherParams: { inputType: "multilang" },
labelcol: 6,
value: "",
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index 33ed89fc..28957600 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -428,7 +428,7 @@ class Index extends Component {
return [
,
+ }}>{getLabel(32935, "导入")},
}>