diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index e2e49517..3dd5c3a4 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -139,10 +139,10 @@ export default class CalculateDetail extends React.Component { multiple value={statuses} options={[ - { key: "0", showname: getLabel(111, "试用") }, { key: "1", showname: getLabel(111, "正式") }, - { key: "2", showname: getLabel(111, "临时") }, { key: "3", showname: getLabel(111, "试用延期") }, - { key: "4", showname: getLabel(111, "解雇") }, { key: "5", showname: getLabel(6091, "离职") }, - { key: "6", showname: getLabel(111, "退休") } + { key: "0", showname: getLabel(18883, "试用") }, { key: "1", showname: getLabel(15711, "正式") }, + { key: "2", showname: getLabel(480, "临时") }, { key: "3", showname: getLabel(15844, "试用延期") }, + { key: "4", showname: getLabel(542707, "解雇") }, { key: "5", showname: getLabel(6091, "离职") }, + { key: "6", showname: getLabel(6092, "退休") } ]} onChange={(val) => this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } })}/> diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js index 958bd281..4fdf844b 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js @@ -37,7 +37,7 @@ export const i18n = { "调薪": getLabel(542686, "调薪"), "停薪": getLabel(542692, "停薪"), "取消停薪": getLabel(543309, "取消停薪"), - "删除档案": getLabel(111, "删除档案") + "删除档案": getLabel(23238, "删除档案") }; @inject("calculateStore", "salaryFileStore") @observer @@ -123,10 +123,10 @@ export default class UserSure extends React.Component { multiple value={String(statuses)} options={[ - { key: "0", showname: getLabel(1831, "试用") }, { key: "1", showname: getLabel(111, "正式") }, - { key: "2", showname: getLabel(1831, "临时") }, { key: "3", showname: getLabel(1831, "在职") }, - { key: "4", showname: getLabel(1831, "解雇") }, { key: "5", showname: getLabel(6091, "离职") }, - { key: "6", showname: getLabel(1831, "退休") } + { key: "0", showname: getLabel(18883, "试用") }, { key: "1", showname: getLabel(15711, "正式") }, + { key: "2", showname: getLabel(480, "临时") }, { key: "3", showname: getLabel(1831, "在职") }, + { key: "4", showname: getLabel(542707, "解雇") }, { key: "5", showname: getLabel(6091, "离职") }, + { key: "6", showname: getLabel(6092, "退休") } ]} onChange={(val) => this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } })}/> diff --git a/pc4mobx/hrmSalary/pages/declare/index.js b/pc4mobx/hrmSalary/pages/declare/index.js index e88d3584..4c3751e1 100644 --- a/pc4mobx/hrmSalary/pages/declare/index.js +++ b/pc4mobx/hrmSalary/pages/declare/index.js @@ -68,10 +68,10 @@ export default class Declare extends React.Component { withDrawTaxDeclaration = (taxDeclarationId) => { withDrawTaxDeclaration({ taxDeclarationId }).then(({ status, errormsg }) => { if (status) { - message.success(getLabel(111, "撤回成功")); + message.success(getLabel(505793, "撤回成功")); this.getDeclareList(); } else { - message.error(errormsg || getLabel(111, "撤回失败")); + message.error(errormsg || getLabel(505791, "撤回失败")); } }); }; diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js index 265f5e0b..b29e9466 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 { 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 { @@ -84,7 +86,7 @@ class Index extends Component { this.setState({ externalPersonManagePayload: { ...externalPersonManagePayload, - visible: true, id, title: id ? "编辑" : "新建" + visible: true, id, title: id ? getLabel(501169, "编辑") : getLabel(365, "新建") } }); }; @@ -152,7 +154,7 @@ class Index extends Component { render: (_, { id }) => ( this.handleAdd(id)} - style={{ paddingRight: 8 }}>编辑 + style={{ paddingRight: 8 }}>{getLabel(501169, "编辑")} {/* this.handleDelete(id)}>删除*/} ) diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index 78739d74..9ec68b2b 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -3,7 +3,7 @@ import { inject, observer } from "mobx-react"; import { Button, Dropdown, Menu, Modal, Switch } from "antd"; -import { WeaInputSearch, WeaSlideModal, WeaTable, WeaTop } from "ecCom"; +import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTable, WeaTop } from "ecCom"; import { renderNoright } from "../../util"; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中 import CustomTab from "../../components/customTab"; import StepSlide from "../../components/stepSlide"; @@ -16,6 +16,7 @@ import SlideModalTitle from "../../components/slideModalTitle"; import CopyFormModal from "./copyFormModal"; import "./index.less"; +const getLabel = WeaLocaleProvider.getLabel; @inject("ledgerStore", "taxAgentStore") @observer export default class Ledger extends React.Component { @@ -379,10 +380,10 @@ export default class Ledger extends React.Component { overlay={ this.onOperatesClick(record, item.key)}> - 编辑 - 复制 + {getLabel(501169, "编辑")} + {getLabel(77, "复制")} {/*关联人员*/} - 删除 + {getLabel(535052, "删除")} }> diff --git a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js index f32e66d3..2862bb82 100644 --- a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js +++ b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js @@ -1,6 +1,6 @@ import React, { Fragment } from "react"; import { Icon, message, Modal, Button} from "antd"; -import { WeaCheckbox, WeaHelpfulTip, WeaTable } from "ecCom"; +import { WeaCheckbox, WeaHelpfulTip, WeaTable, WeaLocaleProvider } from "ecCom"; import { slideStep3Columns } from "../columns"; import AddSalaryItemModal from "./AddSalaryItemModal"; import { inject, observer } from "mobx-react"; @@ -8,6 +8,7 @@ import { toJS } from "mobx"; import FormalFormModal from "../../salaryItem/formalFormModal"; import AddCategoryModal from "../step3/AddCategoryModal"; +const getLabel = WeaLocaleProvider.getLabel; const helpContent = () => { return 1、新建薪资账套时，核算公式与【薪资项目管理】菜单一致；
@@ -234,7 +235,7 @@ export default class CanMoveItem extends React.Component { marginRight: "10px", cursor: "pointer" }} - title="编辑" + title={getLabel(501169, "编辑")} onClick={() => { this.handleEditGroupIconClick(this.props.title); }} @@ -242,7 +243,7 @@ export default class CanMoveItem extends React.Component { { this.handleDeleteGroupIconClick(); }} diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index 24bf675e..45accebc 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -119,7 +119,7 @@ export default MySalaryView; export const ConfirmBtns = (props) => { return
- - + +
; }; diff --git a/pc4mobx/hrmSalary/pages/payroll/components/config.js b/pc4mobx/hrmSalary/pages/payroll/components/config.js index 811c1170..35566821 100644 --- a/pc4mobx/hrmSalary/pages/payroll/components/config.js +++ b/pc4mobx/hrmSalary/pages/payroll/components/config.js @@ -7,7 +7,7 @@ export const commonVariables = [ { id: "HRM_Mobile", name: getLabel(501436, "当前操作者移动电话")}, { id: "HRM_Email", name: getLabel(501437, "当前操作者电子邮件")}, { id: "HRM_CurrentOperatorId", name: getLabel(501438, "当前操作者人员id")}, - { id: "HRM_Department", name: getLabel(111, "当前操作者部门")}, + { id: "HRM_Department", name: getLabel(501440, "当前操作者部门")}, { id: "HRM_SecondDepartment", name: getLabel(33553, "分部")}, { id: "HRM_CurrentDate", name: getLabel(15625, "当前日期")}, { id: "HRM_CurrentTime", name: getLabel(15626, "当前时间")}, diff --git a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js index bdbea48a..472ac3e7 100644 --- a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js +++ b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js @@ -106,7 +106,7 @@ class WaterMarkSetModal extends Component { value={wmClassify} detailtype={3} options={[ { key: "text", showname: getLabel(128895, "文本") }, - { key: "image", showname: getLabel(111, "图片") } + { key: "image", showname: getLabel(74, "图片") } ]} onChange={wmClassify => this.setState({ wmClassify })} /> diff --git a/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js b/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js index 253b7972..bb007682 100644 --- a/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js +++ b/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js @@ -149,7 +149,7 @@ class WmContentSetModal extends Component { diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index eb930f39..d78e6d4c 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -606,7 +606,7 @@ export default class PayrollGrant extends React.Component { { this.state.progressVisible && { this.setState({ progressVisible: false, progress: 0 }); diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js index bd4c19ee..2e28d5a0 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js @@ -194,7 +194,7 @@ export default class BaseInformForm extends React.Component { this.handleChange({ emailStatus: value === "1" })}/> - + { this.handleChange({ @@ -210,7 +210,7 @@ export default class BaseInformForm extends React.Component { { autoSendStatus && - + } - - + this.handleChange({ ackFeedbackStatus: value === "1", @@ -236,7 +236,7 @@ export default class BaseInformForm extends React.Component { { ackFeedbackStatus && - + - + this.handleChange({ feedbackUrl })} diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index a2433be1..e94ba8e6 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -65,8 +65,8 @@ class TemplateBaseSettings extends Component { const { feedBackUrl } = ackFeedbackSetting; if (!feedBackUrl) { Modal.warning({ - title: getLabel(111, "信息确认"), - content: getLabel(111, "必要信息不完整，红色*为必填项！") + title: getLabel(131329, "信息确认"), + content: getLabel(384146, "必要信息不完整，红色*为必填项！") }); return; } @@ -77,10 +77,10 @@ class TemplateBaseSettings extends Component { salaryBillBaseSetSave(payload).then(({ status, errormsg }) => { this.props.onChangeLoading(false); if (status) { - message.success(getLabel(111, "保存成功")); + message.success(getLabel(22619, "保存成功")); this.getSalaryBillBaseSetForm(); } else { - message.error(errormsg || getLabel(111, "保存失败")); + message.error(errormsg || getLabel(22620, "保存失败")); } }).catch(() => this.props.onChangeLoading(false)); }; @@ -122,8 +122,8 @@ class TemplateBaseSettings extends Component { } - - + + this.setState({ ackFeedbackSetting: { @@ -134,7 +134,7 @@ class TemplateBaseSettings extends Component { { ackStatus === "1" && - + - + this.setState({ diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition-柱状图数据为0不占位.js b/pc4mobx/hrmSalary/pages/reportView/components/condition-柱状图数据为0不占位.js index fba734b3..51f19399 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/condition-柱状图数据为0不占位.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/condition-柱状图数据为0不占位.js @@ -12,7 +12,7 @@ export const condition = [ conditionType: "SELECT", domkey: ["taxAgent"], fieldcol: 18, - label: getLabel(111, "个税扣缴义务人"), + label: getLabel(537996, "个税扣缴义务人"), labelcol: 6, options: [], multiple: true, @@ -35,7 +35,7 @@ export const condition = [ pageSize: 10, quickSearchName: "", replaceDatas: [], - title: getLabel(111, "分部"), + title: getLabel(33553, "分部"), type: "164", viewAttr: 2 }, @@ -44,7 +44,7 @@ export const condition = [ domkey: ["subCompany"], fieldcol: 18, isQuickSearch: false, - label: getLabel(111, "分部"), + label: getLabel(33553, "分部"), labelcol: 6, viewAttr: 2 }, @@ -65,7 +65,7 @@ export const condition = [ pageSize: 10, quickSearchName: "", replaceDatas: [], - title: getLabel(111, "部门"), + title: getLabel(27511, "部门"), type: "57", viewAttr: 2 }, @@ -74,7 +74,7 @@ export const condition = [ domkey: ["department"], fieldcol: 18, isQuickSearch: false, - label: getLabel(111, "部门"), + label: getLabel(27511, "部门"), labelcol: 6, viewAttr: 2 }, @@ -125,7 +125,7 @@ export const condition = [ pageSize: 10, quickSearchName: "", replaceDatas: [], - title: getLabel(111, "人员"), + title: getLabel(30042, "人员"), type: "17", viewAttr: 2 }, @@ -134,7 +134,7 @@ export const condition = [ domkey: ["employee"], fieldcol: 18, isQuickSearch: false, - label: getLabel(111, "人员"), + label: getLabel(30042, "人员"), labelcol: 6, viewAttr: 2 }, @@ -143,7 +143,7 @@ export const condition = [ conditionType: "RANGEPICKER", domkey: ["hiredate1", "hiredate2"], fieldcol: 18, - label: getLabel(111, "入职日期"), + label: getLabel(1516, "入职日期"), labelcol: 6, viewAttr: 2 } diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index 543793ab..bdbd0994 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -285,7 +285,7 @@ export default class Index extends Component { break; case "extEmpsWitch": this.saveSysOperate({ - title: getLabel(111, "开启非系统人员"), + title: getLabel(544097, "开启非系统人员"), module: "basic", confKey: key }); break; @@ -386,8 +386,8 @@ export default class Index extends Component { /> - - + + this.handleChange("extEmpsWitch", val)}/> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index 2ea97522..9804dac0 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -152,7 +152,7 @@ export default class Archives extends React.Component { { showOperateBtn && selectedKey === "stop" && salaryArchiveDelete === "1" && this.deleteSocialArchive([record.baseInfo])}>{getLabel(111, "删除档案")} + onClick={() => this.deleteSocialArchive([record.baseInfo])}>{getLabel(23238, "删除档案")} } { showOperateBtn && selectedKey === "stop" && salaryArchiveDelete !== "1" && @@ -177,7 +177,7 @@ export default class Archives extends React.Component { }); } }}> - {getLabel(111, "删除档案")} + {getLabel(23238, "删除档案")} {getLabel(543181, "删除待办")} : { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js index 534cf645..de57b2ab 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js @@ -79,7 +79,7 @@ class CustomBenefitsTable extends Component { return (
{showOperateBtn && - onCustomEdit(record)}>{getLabel(93, "编辑")} + onCustomEdit(record)}>{getLabel(501169, "编辑")} }
); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js index 9deac754..4b06a654 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js @@ -344,7 +344,7 @@ export default class DefaultSlideForm extends React.Component { this.onEdit(record)}>{getLabel(93, "编辑")} + this.onEdit(record)}>{getLabel(501169, "编辑")} ); default: return
; @@ -82,7 +82,7 @@ export default class Programme extends React.Component { return ( this.onEdit(record)} - style={{ marginRight: 10 }}>{showOperateBtn ? getLabel(93, "编辑") : getLabel(33564, "查看")} + style={{ marginRight: 10 }}>{showOperateBtn ? getLabel(501169, "编辑") : getLabel(33564, "查看")} { showOperateBtn && this.onCopy(record)} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index 07e9d5a1..bae14eaf 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -164,7 +164,7 @@ export default class StandingBook extends React.Component { paymentOrganizationId: r.paymentOrganizationId, creator })}> - 归档 + {getLabel(251, "归档")} )} {billStatus === "1" && ( @@ -177,7 +177,7 @@ export default class StandingBook extends React.Component { paymentOrganizationId: r.paymentOrganizationId, creator })}> - 查看 + {getLabel(111, "查看")} )} {billStatus === "1" && ( diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js index 9b465cdc..d14b472e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js @@ -229,7 +229,7 @@ class RegEditDetial extends Component { _.forEach(data, it => { if (item === it.insuranceName && it.paymentScope === getLabel(500201, "个人")) { obj = _.assign(obj, { ...it, personalPaymentAmount: it.insuranceValue }); - } else if (item === it.insuranceName && it.paymentScope === getLabel(1851, "公司")) { + } else if (item === it.insuranceName && it.paymentScope === getLabel(388108, "公司")) { obj = _.assign(obj, { ...it, companyPaymentAmount: it.insuranceValue }); } }); diff --git a/pc4mobx/hrmSalary/stores/programme.js b/pc4mobx/hrmSalary/stores/programme.js index b6d994d0..7d53a0bd 100644 --- a/pc4mobx/hrmSalary/stores/programme.js +++ b/pc4mobx/hrmSalary/stores/programme.js @@ -1,11 +1,13 @@ import { action, observable } from "mobx"; import { message } from "antd"; +import { WeaLocaleProvider } from "ecCom"; import { WeaForm, WeaTableNew } from "comsMobx"; import * as API from "../apis/welfareScheme"; // 引入API接口文件 import { notNull } from "../util/validate"; const { TableStore } = WeaTableNew; +const getLabel = WeaLocaleProvider.getLabel; export class ProgrammeStore { @observable tableStore = new TableStore(); // new table @@ -147,8 +149,8 @@ export class ProgrammeStore { rententionRule: it.rententionRule ? it.rententionRule : "2", validNum: !_.isNil(it.validNum) ? it.validNum : "2" })); - this.defaultPersonDataSource = resultList.filter(item => item.paymentScope == "个人"); - this.defaultCompanyDataSource = resultList.filter(item => item.paymentScope == "公司"); + this.defaultPersonDataSource = resultList.filter(item => item.paymentScope == getLabel(500201, "个人")); + this.defaultCompanyDataSource = resultList.filter(item => item.paymentScope == getLabel(388108, "公司")); let defaultRequest = { schemeName: "", remarks: "",