qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/V2-dev合并多语言

This commit is contained in:
黎永顺 2023-12-04 16:50:50 +08:00
parent b080e47190
commit 117b068baf
22 changed files with 143 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
View File

@ -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
}
];

4
pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js
View File

@ -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));

1
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
View File

@ -135,6 +135,7 @@ export const editCalcSearchConditions = [
fieldcol: 12,
isQuickSearch: false,
label: "合并计税",
lanId: 542607,
labelcol: 6,
viewAttr: 2
}

2
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
View File

@ -47,7 +47,7 @@ class EditCalcAdvanceSearchPannel extends Component {
]
};
}
return { ...o };
return { ...o, label: getLabel(o.lanId, o.label) };
}),
title: getLabel(32905, "常用条件")
};

10
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
View File

@ -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

35
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
View File

@ -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)}
</WeaDialog>
);
}

36
pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
View File

@ -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
}
];

2
pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
View File

@ -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

2
pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
View File

@ -104,7 +104,7 @@ class DataTables extends Component {
} else if (dataIndex === "operate") {
return {
...item,
width: 150,
width: 175,
render: (text, record) => (
<div className="linkWapper">
{

6
pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
View File

@ -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));

19
pc4mobx/hrmSalary/pages/externalPersonManage/index.js
View File

@ -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}
/>
<ExternalPersonManageEditSlide
showOperateBtn={showOperateBtn || showSalaryItemBtn} form={addForm} condition={condition}
showOperateBtn={showOperateBtn || showSalaryItemBtn} form={addForm}
onCancel={this.handleCancel} {...externalPersonManagePayload}
condition={_.map(condition, item => {
return {
...item, title: getLabel(1361, "基本信息"),
items: _.map(item.items, o => ({
...o, label: getLabel(o.lanId, o.label)
}))
};
})}
/>
{
externalPersonImportPayload.visiable &&

14
pc4mobx/hrmSalary/pages/ledgerPage/components/categoryAddModal.js
View File

@ -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)}
</WeaDialog>
);
}

4
pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js
View File

@ -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 };

11
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
View File

@ -104,7 +104,8 @@ class LedgerAdjustRuleAddModal extends Component {
onCancel={this.handleReset}
>
<WeaSearchGroup col={1} needTigger title="" showGroup>
<WeaFormItem label={getLabel(542362, "薪资项目")} labelCol={{ span: languageidweaver == "8" ? 6 : 4 }} wrapperCol={{ span: languageidweaver == "8" ? 18 : 20 }}
<WeaFormItem label={getLabel(542362, "薪资项目")} labelCol={{ span: languageidweaver == "8" ? 6 : 4 }}
wrapperCol={{ span: languageidweaver == "8" ? 18 : 20 }}
style={{ tableLayout: "fixed" }}>
<WeaSelect
multiple
@ -115,7 +116,8 @@ class LedgerAdjustRuleAddModal extends Component {
onChange={(salaryItemId, salaryItemName) => this.setState({ salaryItemId, salaryItemName })}
/>
</WeaFormItem>
<WeaFormItem label={<AdjustTitle/>} labelCol={{ span: languageidweaver == "8" ? 6 : 4 }} wrapperCol={{ span: languageidweaver == "8" ? 18 : 20 }} colon={false}>
<WeaFormItem label={<AdjustTitle/>} labelCol={{ span: languageidweaver == "8" ? 6 : 4 }}
wrapperCol={{ span: languageidweaver == "8" ? 18 : 20 }} colon={false}>
<div className="adjustRuleDetailWrapper">
<div className="adjustSalaryFlex">
<span>{getLabel(543496, "如果：调薪生效日期在")}</span>
@ -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 })}
/>
<span>{getLabel(543497, "（含）之前")}</span>
@ -148,7 +150,8 @@ class LedgerAdjustRuleAddModal extends Component {
</Radio>
</Radio.Group>
</div>
<div style={{ marginBottom: 10 }}>{getLabel(543503, "否则：调薪生效日期在")}{dayOfMonth}{getLabel(543505, "号之后")}</div>
<div
style={{ marginBottom: 10 }}>{getLabel(543503, "否则：调薪生效日期在")}{dayOfMonth}{getLabel(543505, "号之后")}</div>
<div className="adjustSalaryFlex">
<span>{getLabel(543498, "计薪规则为：")}</span>
<Radio.Group onChange={(e) => this.setState({ afterAdjustmentType: e.target.value })}

1
pc4mobx/hrmSalary/pages/ledgerPage/config.js
View File

@ -42,6 +42,7 @@ export const categoryConditions = [
fieldcol: 14,
rules: "required|string",
label: getLabel(33439, "名称"),
lanId: 33439,
otherParams: { inputType: "multilang" },
labelcol: 6,
value: "",

2
pc4mobx/hrmSalary/pages/payrollFiles/index.js
View File

@ -428,7 +428,7 @@ class Index extends Component {
return [
<Button type="primary" onClick={() => {
this.importRef.handleMenuClick({ key: "PENDING" });
}}>导入</Button>,
}}>{getLabel(32935, "导入")}</Button>,
<Dropdown overlay={<ExportMenu selectedKey={selectedKey} selectedRowKeys={selectedRowKeys}
searchItemsValue={searchItemsValue}/>}>
<Button type="primary">{getLabel(17416, "导出")}<i className="icon-coms-down2" style={{

24
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
View File

@ -80,22 +80,24 @@ class Index extends Component {
if (getKey(o) === "salarySob") {
return {
...o, options: _.map(salarySobOptions, g => ({ key: g.id.toString(), showname: g.name })),
viewAttr: _.isNil(id) ? o.viewAttr : 1
viewAttr: _.isNil(id) ? o.viewAttr : 1, label: getLabel(o.lanId, o.label)
};
} else if (getKey(o) === "reissueRule") {
return {
...o, options: [
{ key: "0", showname: getLabel(332, "全部") },
{ key: "1", showname: getLabel(542696, "按规则") }
]
], label: getLabel(o.lanId, o.label)
};
} else if (getKey(o) === "replenishRule") {
return {
...o, hide: (_.isNil(fieldsEchoData["reissueRule"]) || fieldsEchoData["reissueRule"] === "0"),
options: _.map(replenishRuleOptions, t => ({ key: t.id, showname: t.content }))
...o,
hide: (_.isNil(fieldsEchoData["reissueRule"]) || fieldsEchoData["reissueRule"] === "0"),
options: _.map(replenishRuleOptions, t => ({ key: t.id, showname: t.content })),
label: getLabel(o.lanId, o.label)
};
}
return { ...o };
return { ...o, label: getLabel(o.lanId, o.label) };
})
};
} else if (it.title === "sendSet") {
@ -104,16 +106,16 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "autoSendStatus") {
return {
...o,
...o, label: getLabel(o.lanId, o.label),
helpfulTitle: getLabel(544272, "开启后，还需在计划任务中配置定时任务，执行工资单定时发送任务；")
};
} else if (getKey(o) === "smsSetting") {
return {
...o,
...o, label: getLabel(o.lanId, o.label),
hide: _.isNil(fieldsEchoData["smsStatus"]) || (!_.isNil(fieldsEchoData["smsStatus"]) && (fieldsEchoData["smsStatus"].toString() === "0"))
};
}
return { ...o };
return { ...o, label: getLabel(o.lanId, o.label) };
})
};
}
@ -125,17 +127,17 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "autoAckDays") {
return {
...o,
...o, label: getLabel(o.lanId, o.label),
hide: _.isNil(fieldsEchoData["ackFeedbackStatus"]) ? o.hide : !fieldsEchoData["ackFeedbackStatus"],
helpfulTitle: getLabel(544273, "开启后，还需在计划任务中配置定时任务，执行自动确认任务；邮箱端查看工资单暂不支持确认及反馈；")
};
} else if (getKey(o) === "feedbackUrl") {
return {
...o,
...o, label: getLabel(o.lanId, o.label),
hide: _.isNil(fieldsEchoData["ackFeedbackStatus"]) ? o.hide : !fieldsEchoData["ackFeedbackStatus"]
};
}
return { ...o };
return { ...o, label: getLabel(o.lanId, o.label) };
})
};
}

2
pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
View File

@ -423,7 +423,7 @@ export const MonthRangePicker = (props) => {
onChange={(val) => onChange([val, endDate])}
viewAttr={viewAttr}
/>
<span className="to" style={{ margin: "0 10px" }}>至</span>
<span className="to" style={{ margin: "0 10px" }}>{getLabel(15322, "至")}</span>
<WeaDatePicker
value={endDate} disabled={disabled}
disabledDate={(current) => {

4
pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js
View File

@ -73,7 +73,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
items: _.map(item.items, o => {
if (getKey(o) === "adjustReason") {
return {
...o,
...o, label:getLabel(o.lanId, o.label),
options: _.map(adjustReasonList, it => ({ key: it.id, showname: it.content }))
};
}
@ -176,7 +176,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
const { salaryItemList, list } = salaryArchiveItemDetail;
const adjColumns = [
{
title: "薪资项目",
title: getLabel(542362, "薪资项目"),
dataIndex: "salaryItem",
key: "salaryItem",
com: [{

12
pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
View File

@ -8,12 +8,6 @@ import { PickDate } from "../appConfig";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
const selectedTabItems = [
{
key: "0",
name: getLabel(543328, "薪资调整记录")
}
];
const baseInfolist = [
{
id: 1,
@ -103,6 +97,12 @@ export default class SalaryFileViewSlide extends React.Component {
})
}
];
const selectedTabItems = [
{
key: "0",
name: getLabel(543328, "薪资调整记录")
}
];
return (
<div className="salaryFileViewSlide">
<WeaSearchGroup title={getLabel(1361, "基本信息")} items={[]} needTigger showGroup center>

6
pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
View File

@ -48,9 +48,9 @@ class SalaryItemForm extends Component {
};
case "pattern":
case "roundingMode":
return { ...item, display: dataType === "number" };
return { ...item, display: dataType === "number", label: getLabel(lanId, label) };
case "sortedIndex":
return { ...item };
return { ...item, label: getLabel(lanId, label) };
case "useInEmployeeSalary":
return {
...item,
@ -120,7 +120,7 @@ class SalaryItemForm extends Component {
return {
...item,
key: v === "3" ? "originSqlContent" : "originFormulaContent",
label: v === "2" ? "公式" : v === "3" ? "SQL" : "",
label: v === "2" ? getLabel(18125, "公式") : v === "3" ? "SQL" : "",
display: v === "2" || v === "3"
};
}

2
pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
View File

@ -40,7 +40,7 @@ class SyncToSalaryAccountSetDialog extends Component {
return {
...item,
items: _.map(item.items, o => ({
...o,
...o, label: getLabel(o.lanId, o.label),
options: _.map(data, it => ({ key: it.id, showname: it.content }))
}))
};