From df6eb00239dc21b9ea93c17ce2f1699cee20da1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 31 Jul 2023 18:58:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=B3=BB=E7=BB=9F=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/components/importModal/index.js | 2 +- .../components/conditions.js | 7 + .../calculateDetail/customExportDialog.js | 2 +- .../hrmSalary/pages/calculateDetail/index.js | 2 +- .../pages/externalPersonManage/conditions.js | 12 + .../pages/externalPersonManage/index.js | 12 +- .../fieldManagement/components/fieldSlide.js | 4 +- .../components/ledgerAssociatedPersonnel.js | 4 +- .../components/ledgerBaseSetting.js | 23 +- .../ledgerPage/components/ledgerSlide.js | 35 ++- pc4mobx/hrmSalary/pages/ledgerPage/config.js | 260 +++++++++++++----- .../hrmSalary/pages/mobilePayroll/index.js | 2 +- .../hrmSalary/pages/mySalary/mySalaryView.js | 2 +- .../pages/payroll/stepForm/baseInformForm.js | 27 +- .../pages/payroll/templateBaseSettings.js | 2 +- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 10 +- pc4mobx/hrmSalary/pages/salaryItem/columns.js | 6 +- .../socialSecurityBenefits/archives/index.js | 61 ++-- .../socialSecurityBenefits/programme/index.js | 6 +- .../hrmSalary/pages/taxAgent/personalScope.js | 4 +- .../pages/taxAgent/slideTaxagentUser.js | 2 +- pc4mobx/hrmSalary/stores/archives.js | 6 +- pc4mobx/hrmSalary/stores/calculate.js | 10 +- pc4mobx/hrmSalary/stores/programme.js | 20 +- pc4mobx/hrmSalary/util/index.js | 2 +- 25 files changed, 353 insertions(+), 170 deletions(-) diff --git a/pc4mobx/hrmSalary/components/importModal/index.js b/pc4mobx/hrmSalary/components/importModal/index.js index 030d1b23..79d846b2 100644 --- a/pc4mobx/hrmSalary/components/importModal/index.js +++ b/pc4mobx/hrmSalary/components/importModal/index.js @@ -131,7 +131,7 @@ export default class ImportModal extends React.Component { >
- + diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js index 3fd68eba..e010e827 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js @@ -12,6 +12,7 @@ export const condition = [ domkey: ["dimType"], fieldcol: 14, label: getLabel(389137, "维度类型"), + lanId: 389137, labelcol: 6, options: [], detailtype: 3, @@ -24,6 +25,7 @@ export const condition = [ domkey: ["setting4Qualitative"], fieldcol: 14, label: getLabel(506800, "统计维度"), + lanId: 506800, labelcol: 6, options: [], rules: "required|string", @@ -35,6 +37,7 @@ export const condition = [ domkey: ["dimName"], fieldcol: 14, label: getLabel(543321, "统计维度名称"), + lanId: 543321, labelcol: 6, value: "", rules: "required|string", @@ -46,6 +49,7 @@ export const condition = [ domkey: ["dimCode"], fieldcol: 14, label: getLabel(543322, "分组所属字段"), + lanId: 543322, labelcol: 6, options: [], viewAttr: 2, @@ -58,6 +62,7 @@ export const condition = [ domkey: ["remark"], fieldcol: 14, label: getLabel(433, "描述"), + lanId: 433, labelcol: 6, value: "", viewAttr: 2 @@ -76,6 +81,7 @@ export const reportCondition = [ domkey: ["reportName"], fieldcol: 14, label: getLabel(15517, "报表名称"), + lanId: 15517, labelcol: 6, value: "", rules: "required|string", @@ -87,6 +93,7 @@ export const reportCondition = [ domkey: ["dimensionIds"], fieldcol: 14, label: getLabel(506800, "统计维度"), + lanId: 506800, labelcol: 6, options: [], rules: "required|string", diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/customExportDialog.js b/pc4mobx/hrmSalary/pages/calculateDetail/customExportDialog.js index 601890a1..319bf4af 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/customExportDialog.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/customExportDialog.js @@ -84,7 +84,7 @@ class CustomExportDialog extends Component { return ( {getLabel(17416, "导出")}, diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index 3dd5c3a4..3e520d47 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -328,7 +328,7 @@ export default class CalculateDetail extends React.Component { {getLabel(32935, "导入")} {getLabel(543249, "线下对比")} {getLabel(81272, "导出全部")} - {getLabel(111, "自定义导出")} + {getLabel(544270, "自定义导出")} ); diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/conditions.js b/pc4mobx/hrmSalary/pages/externalPersonManage/conditions.js index c208e585..b5f0ffc2 100644 --- a/pc4mobx/hrmSalary/pages/externalPersonManage/conditions.js +++ b/pc4mobx/hrmSalary/pages/externalPersonManage/conditions.js @@ -7,6 +7,7 @@ export const searchCondition = [ domkey: ["username"], fieldcol: 16, label: "姓名", + lanId: 25034, labelcol: 8, value: "", viewAttr: 2 @@ -25,6 +26,7 @@ export const condition = [ rules: "required|string", fieldcol: 18, label: "姓名", + lanId: 25034, labelcol: 6, value: "", viewAttr: 3 @@ -56,6 +58,7 @@ export const condition = [ domkey: ["departmentId"], fieldcol: 18, label: "部门", + lanId: 27511, labelcol: 6, viewAttr: 2 }, @@ -65,6 +68,7 @@ export const condition = [ domkey: ["departmentName"], fieldcol: 18, label: "部门名称", + lanId: 111, labelcol: 6, value: "", hasBorder: true, @@ -97,6 +101,7 @@ export const condition = [ domkey: ["subcompanyId"], fieldcol: 18, label: "分部", + lanId: 33553, labelcol: 6, viewAttr: 2 }, @@ -106,6 +111,7 @@ export const condition = [ domkey: ["subcompanyName"], fieldcol: 18, label: "分部名称", + lanId: 111, labelcol: 6, value: "", hasBorder: true, @@ -147,6 +153,7 @@ export const condition = [ domkey: ["companystartdate"], fieldcol: 18, label: "入职日期", + lanId: 1516, labelcol: 6, value: "", viewAttr: 2 @@ -157,6 +164,7 @@ export const condition = [ domkey: ["mobile"], fieldcol: 18, label: "手机", + lanId: 111, labelcol: 6, value: "", viewAttr: 2 @@ -167,6 +175,7 @@ export const condition = [ domkey: ["workcode"], fieldcol: 18, label: "工号", + lanId: 1933, labelcol: 6, value: "", viewAttr: 2 @@ -177,6 +186,7 @@ export const condition = [ domkey: ["idNo"], fieldcol: 18, label: "身份证号码", + lanId: 1887, labelcol: 6, value: "", viewAttr: 2 @@ -187,6 +197,7 @@ export const condition = [ domkey: ["bankCardNum"], fieldcol: 18, label: "本人开户的银行卡卡号", + lanId: 111, labelcol: 6, value: "", viewAttr: 2 @@ -197,6 +208,7 @@ export const condition = [ domkey: ["bankName"], fieldcol: 18, label: "本人开户的银行卡开户支行全称", + lanId: 111, labelcol: 6, value: "", viewAttr: 2 diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js index b29e9466..836ce3e4 100644 --- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js +++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js @@ -27,7 +27,7 @@ class Index extends Component { pageInfo: { current: 1, pageSize: 10, total: 0 }, showSearchAd: false, externalPersonManagePayload: { - visible: false, title: "新建", id: "" + visible: false, title: getLabel(365, "新建"), id: "" } }; } @@ -107,7 +107,7 @@ class Index extends Component { current: pageInfo.current, pageSize: pageInfo.pageSize, total: pageInfo.total, - showTotal: total => `共 ${total} 条`, + showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, showQuickJumper: true, showSizeChanger: true, pageSizeOptions: ["10", "20", "50", "100"], @@ -125,18 +125,18 @@ class Index extends Component { return (
} + title={getLabel(111, "非系统人员管理")} icon={} iconBgcolor="#F14A2D" showDropIcon={false} >
this.handleAdd()}>新建 + ] : []} searchType={["base", "advanced"]} showSearchAd={showSearchAd} setShowSearchAd={(showSearchAd) => this.setState({ showSearchAd })} searchsAd={getSearchs(form, searchCondition, 2)} - searchsBasePlaceHolder="请输入姓名" onSearch={this.listPage} + searchsBasePlaceHolder={getLabel(26919, "请输入姓名")} onSearch={this.listPage} onSearchChange={username => form.updateFields({ username })} searchsBaseValue={form.getFormParams().username} onAdSearch={() => this.setState({ showSearchAd: false }, () => this.listPage())} @@ -149,7 +149,7 @@ class Index extends Component { ...this.getColumns(), { dataIndex: "operate", - title: "操作", + title: getLabel(30585, "操作"), width: 120, render: (_, { id }) => ( diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js index d3f9afb7..83d960de 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js @@ -268,14 +268,14 @@ class FieldSlide extends Component { placement="topLeft" /> - + this.handleChangeFields("hideDefault", value)} /> diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js index 23d0a66e..982573e2 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js @@ -117,7 +117,7 @@ class LedgerAssociatedPersonnel extends Component { }; deleteLedgerPersonExtRange = (resolve, reject) => { message.destroy(); - message.loading(getLabel(111, "正在删除中..."), 0); + message.loading(getLabel(529063, "正在删除中..."), 0); deleteLedgerPersonExtRange(this.state.rowKeys).then(({ status, errormsg }) => { message.destroy(); resolve(); @@ -136,7 +136,7 @@ class LedgerAssociatedPersonnel extends Component { }; deleteLedgerPersonRange = (resolve, reject) => { message.destroy(); - message.loading(getLabel(111, "正在删除中..."), 0); + message.loading(getLabel(529063, "正在删除中..."), 0); deleteLedgerPersonRange(this.state.rowKeys).then(({ status, errormsg }) => { message.destroy(); resolve(); diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index c92beaac..f3659e17 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -169,11 +169,11 @@ class LedgerBaseSetting extends Component { { _.map(baseForm, item => { - const { key, label, type, options = [], children = [] } = item; + const { key, label, lanId, type, options = [], children = [] } = item; taxAgentIdDisabled = key === "taxAgentId" && editId && taxAgentId; taxableItemsDisabled = key === "taxableItems" && editId; return { @@ -186,12 +186,16 @@ class LedgerBaseSetting extends Component { type === "CHECKBOX" ? - + content={getLabel(111, "【起薪日期≤薪资周期止】且【最后发薪日期≥薪资周期起】")}/> + : type === "SELECT" ? ({ + ...it, + showname: getLabel(it.lanId, it.showname) + }))} viewAttr={3} disabled={canEdit !== "true" || taxAgentIdDisabled || taxableItemsDisabled} onChange={(v) => this.handleChangeField(key, v)}/> : @@ -221,9 +225,14 @@ const CustomSelect = (props) => { _.map(list, item => { const { key, options = [] } = item; return - onChange(key, v)}/> + onChange={(v) => onChange(key, v)} + options={_.map(options, it => ({ + ...it, + showname: getLabel(it.lanId, it.showname) + }))} + /> ; }) } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index 51ff8f57..db682066 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -19,13 +19,6 @@ import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; const Step = WeaSteps.Step; -const tabs = [ - { key: 0, title: getLabel(82751, "基础设置") }, - { key: 1, title: getLabel(543467, "关联人员") }, - { key: 2, title: getLabel(542362, "薪资项目") }, - { key: 3, title: getLabel(543468, "回算薪资项目") }, - { key: 4, title: getLabel(543469, "调薪计薪规则") } -]; @inject("taxAgentStore") @observer @@ -214,14 +207,16 @@ class LedgerSlide extends Component { case 1: CurrentDom = !editId ? [ , - + ] : []; break; case 2: CurrentDom = !editId ? [ , - , + , , - , - + , + ] : []; break; case 4: CurrentDom = !editId ? [ - , - + , + ] : [ - + ]; break; default: @@ -262,6 +262,13 @@ class LedgerSlide extends Component { render() { const { title, visible, editId, taxAgentStore: { showOperateBtn } } = this.props; const { current } = this.state; + const tabs = [ + { key: 0, title: getLabel(82751, "基础设置") }, + { key: 1, title: getLabel(543467, "关联人员") }, + { key: 2, title: getLabel(542362, "薪资项目") }, + { key: 3, title: getLabel(543468, "回算薪资项目") }, + { key: 4, title: getLabel(543469, "调薪计薪规则") } + ]; return ( { Modal.confirm({ title: getLabel(131329, "信息确认"), - content: getLabel(111, "请确认薪资信息是有误，进行反馈并发起反馈流程。"), + content: getLabel(544271, "请确认薪资信息是有误，进行反馈并发起反馈流程。"), onOk: () => { feedBackSalaryBill({ salaryInfoId: getQueryString("id") }).then(({ status, errorMsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index 45accebc..d338505f 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -57,7 +57,7 @@ class MySalaryView extends Component { handleGoFeedback = () => { Modal.confirm({ title: getLabel(131329, "信息确认"), - content: getLabel(111, "请确认薪资信息是有误，进行反馈并发起反馈流程。"), + content: getLabel(544271, "请确认薪资信息是有误，进行反馈并发起反馈流程。"), onOk: () => { const { params: { salaryInfoId } } = this.props; feedBackSalaryBill({ salaryInfoId }).then(({ status, errorMsg }) => { diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js index 2e28d5a0..6780ae1b 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js @@ -107,9 +107,10 @@ export default class BaseInformForm extends React.Component { } = request; return ( - + @@ -124,7 +125,7 @@ export default class BaseInformForm extends React.Component { } @@ -135,7 +136,7 @@ export default class BaseInformForm extends React.Component { /> @@ -146,12 +147,15 @@ export default class BaseInformForm extends React.Component { /> @@ -174,7 +178,7 @@ export default class BaseInformForm extends React.Component { } @@ -204,7 +208,7 @@ export default class BaseInformForm extends React.Component { autoSendCycleType: value === "1" ? 1 : null }); }}/> - @@ -236,14 +240,15 @@ export default class BaseInformForm extends React.Component { { ackFeedbackStatus && - + this.handleChange({ autoAckDays })} /> diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index e94ba8e6..9a7983f5 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -144,7 +144,7 @@ class TemplateBaseSettings extends Component { } })}/> diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index 3ee9230c..47589048 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -252,7 +252,7 @@ export default class Index extends Component { const { saveParams } = this.state; Modal.confirm({ title: getLabel(131329, "信息确认"), - content: (key === "operateTaxDeclaration" && val === "0") ? getLabel(111, "关闭之后，将无法开启,确认要保存吗?") : getLabel(543854, "确认要保存吗?"), + content: (key === "operateTaxDeclaration" && val === "0") ? getLabel(544276, "关闭之后，将无法开启,确认要保存吗?") : getLabel(543854, "确认要保存吗?"), onOk: () => { this.setState({ saveParams: { @@ -362,13 +362,13 @@ export default class Index extends Component { } - - + + this.handleChange("operateTaxDeclaration", val)}/> - + this.handleChange("withDrawTaxDeclaration", val)}/> @@ -380,7 +380,7 @@ export default class Index extends Component { - + this.handleChange("matchRule", val)} /> diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js index 1314bcfa..b5625bfd 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js @@ -87,11 +87,11 @@ export const salaryItemFields = [ }, { key: "hideDefault", - label: getLabel(111, "核算时隐藏"), + label: getLabel(544274, "核算时隐藏"), type: "SWITCH", viewAttr: 2, - tip: getLabel(111, "提示：开启后，在薪资账套中添加该项目时，默认勾选隐藏且在核算时隐藏该薪资项目，可在具体薪资账套中设置是否隐藏"), - lanId: 111, + tip: getLabel(544275, "提示：开启后，在薪资账套中添加该项目时，默认勾选隐藏且在核算时隐藏该薪资项目，可在具体薪资账套中设置是否隐藏"), + lanId: 544275, tipLanId: 543298 }, { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index 9804dac0..94feed93 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -2,7 +2,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 { WeaHelpfulTip, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom"; +import { WeaHelpfulTip, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTools, WeaTop } from "ecCom"; import { getSearchs, renderLoading } from "../../../util"; import BaseForm from "./baseForm"; import SlideModalTitle from "../../../components/slideModalTitle"; @@ -117,6 +117,7 @@ export default class Archives extends React.Component { }; getColumns = () => { + const languageidweaver = WeaTools.ls.getJSONObj("languageidweaver"); const { columns, salaryArchiveDelete, selectedKey } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; let tmpV = _.map(columns.filter(item => item.display === "TRUE"), item => { @@ -132,7 +133,7 @@ export default class Archives extends React.Component { return tmpV.length > 0 ? [ ...tmpV, { title: getLabel(30585, "操作"), - width: 150, + width: languageidweaver == "8" ? 210 : 150, dataIndex: "operate", render: (text, record) => { return ( @@ -537,34 +538,34 @@ export default class Archives extends React.Component { dom =
{/*
1、新入职人员、返聘人员和个税扣缴义务人发生变更从【待减员】中减员操作的会进入【待增员】；
*/} {/*
2、返聘人员默认返聘前的社保福利缴纳方案、缴纳账号、缴纳组织数据，其他数据会清空；
*/} -
1、个税扣缴义务人变更进入【待增员】的，保留所有最新版本数据；若修改了数据再增员则修改的数据作为新版本保存；
-
2、维护好员工的社保福利档案数据后，点击【增员】，数据会进入【在缴员工】；
-
3、若不需给该员工缴纳，可点击【删除待办】进入【停缴员工】；进入【停缴员工】后，可以点击【取消停缴】再次进入【待增员】；
-
4、不管起始缴纳月维护到哪个月，都可以进行增员，不影响核算判断；若维护了最后缴纳月，且小于等于当前月，则增员失败；
-
5、增员失败情况：①终止缴纳月小于等于当前月；②方案或起始缴纳月未维护；
+
{getLabel(111, "1、个税扣缴义务人变更进入【待增员】的，保留所有最新版本数据；若修改了数据再增员则修改的数据作为新版本保存；")}
+
{getLabel(111, "2、维护好员工的社保福利档案数据后，点击【增员】，数据会进入【在缴员工】；")}
+
{getLabel(111, "3、若不需给该员工缴纳，可点击【删除待办】进入【停缴员工】；进入【停缴员工】后，可以点击【取消停缴】再次进入【待增员】；")}
+
{getLabel(111, "4、不管起始缴纳月维护到哪个月，都可以进行增员，不影响核算判断；若维护了最后缴纳月，且小于等于当前月，则增员失败；")}
+
{getLabel(111, "5、增员失败情况：①终止缴纳月小于等于当前月；②方案或起始缴纳月未维护；")}
{/* ②其他的个税扣缴义务人下的在缴员工中存在该员工，在缴员工未进入停缴员工；*/}
; break; case "fixed": dom =
-
1、需缴纳社保福利的员工维护在【在缴员工】；
-
2、可使用更新导入，调整档案数据；
-
3、若维护了最后缴纳月且小于等于当前月，则自动进入【待减员】；
-
4、核算人员范围为，【在缴员工】中的起始缴纳月和最后缴纳月区间包含当前月的人员；
+
{getLabel(111, "1、需缴纳社保福利的员工维护在【在缴员工】；")}
+
{getLabel(111, "2、可使用更新导入，调整档案数据；")}
+
{getLabel(111, "3、若维护了最后缴纳月且小于等于当前月，则自动进入【待减员】；")}
+
{getLabel(111, "4、核算人员范围为，【在缴员工】中的起始缴纳月和最后缴纳月区间包含当前月的人员；")}
; break; case "suspend": dom =
{/*④某员工分权时在原个税扣缴义务人下处于【在缴员工】里但又将该员工添加到其他的个税扣缴义务人下的情况；*/} -
1、数据进入【待减员】规则：①员工的人事状态属性从在职变成非在职，且在【在缴员工】里；②【在缴员工】里档案维护了缴纳终止月且小于等于当前月；③个税扣缴义务人发生调整；
-
2、【待减员】为是否不再缴纳的待办状态，数据是从【在缴员工】中复制的，若不处理列表中的待办数据，也不影响社保福利核算；【待减员】维护的数据和【在缴员工】数据是同步的；
-
3、点击【减员】前先维护最后缴纳月，所有有起始缴纳月的福利项的最后缴纳月都小于等于当前月且无未归档的核算数据的档案才能减员成功，减员成功后数据进入【停缴员工】；
+
{getLabel(111, "1、数据进入【待减员】规则：①员工的人事状态属性从在职变成非在职，且在【在缴员工】里；②【在缴员工】里档案维护了缴纳终止月且小于等于当前月；③个税扣缴义务人发生调整；")}
+
{getLabel(111, "2、【待减员】为是否不再缴纳的待办状态，数据是从【在缴员工】中复制的，若不处理列表中的待办数据，也不影响社保福利核算；【待减员】维护的数据和【在缴员工】数据是同步的；")}
+
{getLabel(111, "3、点击【减员】前先维护最后缴纳月，所有有起始缴纳月的福利项的最后缴纳月都小于等于当前月且无未归档的核算数据的档案才能减员成功，减员成功后数据进入【停缴员工】；")}
{/*
4、数据进入【待减员】规则的第四种情况下，若还需要在当前个税扣缴义务人下进行缴纳的话，当前该员工的【待减员】数据进行【删除待办】操作即可；若不在该个税扣缴义务人下继续缴纳，维护好最后缴纳月后进行【减员】操作，员工进入【停缴员工】；
*/}
; break; default: dom =
-
1、不需要缴纳社保福利的员工，保存在【停缴员工】；
+
{getLabel(111, "1、不需要缴纳社保福利的员工，保存在【停缴员工】；")}
{/*
2、【停缴员工】点击取消停缴，数据会回退到上次的位置（从【待减员】减员到停缴员工的，点击停缴返回到【在缴员工】，不返回到【待减员】）；
*/} {/*
3、若员工的社保福利从一个个税扣缴义务人下转到另一个个税扣缴义务人下去缴纳，则在转后的个税扣缴义务人的【待增员】中进行增员操作成功后，员工进入待【在缴员工】，而在原个税扣缴义务人下的【停缴员工】中，该员工数据将会被删除；是否开启分权员工的档案数据都只保存一份；
*/}
; @@ -667,8 +668,11 @@ export default class Archives extends React.Component { ] : selectedKey === "pending" ? [ 提示：缴纳月份区间包含起始缴纳月，不包含最后缴纳月； 若员工离职时还未增员进入在缴员工，则数据会自动清除， - 因此若确认缴纳，请及时维护档案数据并增员操作。若清除后还需缴纳，需先在个税扣缴义务人菜单将员工按离职状态添加回来，会重新出现在待增员。
} + title={ +
+ {getLabel(111, "提示：缴纳月份区间包含起始缴纳月，不包含最后缴纳月； 若员工离职时还未增员进入在缴员工，则数据会自动清除，因此若确认缴纳，请及时维护档案数据并增员操作。若清除后还需缴纳，需先在个税扣缴义务人菜单将员工按离职状态添加回来，会重新出现在待增员。")} +
+ } placement="topLeft" />, } placement="topLeft" />, - , + , {getLabel(512938, "导出选中")} @@ -828,14 +833,18 @@ export default class Archives extends React.Component { subtitle={getLabel(543191, "员工福利档案")} tabs={[ { title: getLabel(82751, "基础设置"), key: 0 }, { title: getLabel(538967, "社保"), key: 1 }, - { title: getLabel(538969, "公积金"), key: 2 }, { title: getLabel(542717, "企业年金及其他福利"), key: 3 }] + { title: getLabel(538969, "公积金"), key: 2 }, { + title: getLabel(542717, "企业年金及其他福利"), + key: 3 + }] } editable={false} selectedTab={selectedTab} showOperateBtn={showOperateBtn} customOperate={ (showOperateBtn && selectedKey !== "stop" && selectedTab != 0) ? - [] : [] + [] : [] } subItemChange={selectedTab => this.setState({ selectedTab })} /> @@ -913,16 +922,16 @@ export default class Archives extends React.Component { const HelpfulDiv = () => { return
- 1、缴纳月份区间包含起始缴纳月，不包含最后缴纳月; - 2、维护的所有的最后缴纳月都大于当前月，则该待办数据自动清除，不显示在待减员列表； - 3、减员失败情况：①有起始缴纳月却未维护最后缴纳月；②员工存在未归档的核算数据； + {getLabel(111, "1、缴纳月份区间包含起始缴纳月，不包含最后缴纳月;")} + {getLabel(111, "2、维护的所有的最后缴纳月都大于当前月，则该待办数据自动清除，不显示在待减员列表；")} + {getLabel(111, "3、减员失败情况：①有起始缴纳月却未维护最后缴纳月；②员工存在未归档的核算数据；")}
; }; const CancelHelpfulDiv = () => { return
- 1、缴纳月份区间包含起始缴纳月，不包含最后缴纳月; - 2、若员工当前不在停缴档案的个税扣缴义务人下，则不可取消停缴； - 3、若员工当前在其他个税扣缴义务人下正在缴纳，也不可取消停缴； + {getLabel(111, "1、缴纳月份区间包含起始缴纳月，不包含最后缴纳月;")} + {getLabel(111, "2、若员工当前不在停缴档案的个税扣缴义务人下，则不可取消停缴；")} + {getLabel(111, "3、若员工当前在其他个税扣缴义务人下正在缴纳，也不可取消停缴；")}
; }; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js index 0012429f..80ced7c0 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js @@ -293,9 +293,9 @@ export default class Programme extends React.Component { const renderCustomRightContent = () => { let tipList = [ - "1、可以为社保、公积金、企业年金及其他福利新增自定义的福利项，如：残疾保险等", - "2、新增自定义福利默认启用，社保福利方案中的自定义福利项均未开启缴纳，当前页面的自定义福利项才可以停用；停用后再新增方案时没有该福利项", - "3、自定义福利若要缴纳，需要在方案里填写缴纳相关数据" + getLabel(111, "1、可以为社保、公积金、企业年金及其他福利新增自定义的福利项，如：残疾保险等"), + getLabel(111, "2、新增自定义福利默认启用，社保福利方案中的自定义福利项均未开启缴纳，当前页面的自定义福利项才可以停用；停用后再新增方案时没有该福利项"), + getLabel(111, "3、自定义福利若要缴纳，需要在方案里填写缴纳相关数据") ]; return ; }; diff --git a/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js b/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js index 67d32d18..bd8a1e1f 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js @@ -149,7 +149,7 @@ export default class PersonalScope extends Component { const { taxAgentRangeExtDelete } = this.props.taxAgentStore; const { pageObj } = this.state; message.destroy(); - message.loading(getLabel(111, "正在删除中..."), 0); + message.loading(getLabel(529063, "正在删除中..."), 0); taxAgentRangeExtDelete(ids).then(({ status, errormsg }) => { message.destroy(); resolve(); @@ -172,7 +172,7 @@ export default class PersonalScope extends Component { const { taxAgentRangeDelete } = this.props.taxAgentStore; const { pageObj } = this.state; message.destroy(); - message.loading(getLabel(111, "正在删除中..."), 0); + message.loading(getLabel(529063, "正在删除中..."), 0); taxAgentRangeDelete(ids).then(({ status, errormsg }) => { message.destroy(); resolve(); diff --git a/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js b/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js index 8ddc1050..78a89180 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js @@ -209,7 +209,7 @@ export default class SlideTaxagentUser extends React.Component { [ { title: getLabel(124810, "人员范围"), viewcondition: "1" }, { title: getLabel(543489, "从范围中排除"), viewcondition: "0" }, - { title: getLabel(111, "非系统人员范围"), viewcondition: "2" } + { title: getLabel(544292, "非系统人员范围"), viewcondition: "2" } ] } keyParam="viewcondition" selectedKey={includeType} diff --git a/pc4mobx/hrmSalary/stores/archives.js b/pc4mobx/hrmSalary/stores/archives.js index 7ba4e492..37be30dc 100644 --- a/pc4mobx/hrmSalary/stores/archives.js +++ b/pc4mobx/hrmSalary/stores/archives.js @@ -1,11 +1,13 @@ import { action, observable, toJS } from "mobx"; import { message } from "antd"; import { WeaForm, WeaTableNew } from "comsMobx"; +import { WeaLocaleProvider } from "ecCom"; import { removePropertyCondition } from "../util/response"; import * as API from "../apis/welfareArchive"; // 引入API接口文件 const { TableStore } = WeaTableNew; +const getLabel = WeaLocaleProvider.getLabel; export class ArchivesStore { @observable tableStore = new TableStore( @@ -284,11 +286,11 @@ export class ArchivesStore { return new Promise((resolve, reject) => { API.save({ welfareType, baseForm, paymentForm }).then(res => { if (res.status) { - message.success("保存成功", 1); + message.success(getLabel(22619, "保存成功"), 1); resolve(); // this.getTableDatas() } else { - message.error(res.errormsg || "保存失败", 1); + message.error(res.errormsg || getLabel(22620, "保存失败"), 1); reject(); } }); diff --git a/pc4mobx/hrmSalary/stores/calculate.js b/pc4mobx/hrmSalary/stores/calculate.js index f842d9f0..23877e7a 100644 --- a/pc4mobx/hrmSalary/stores/calculate.js +++ b/pc4mobx/hrmSalary/stores/calculate.js @@ -1,10 +1,12 @@ import { action, observable } from "mobx"; import { message } from "antd"; import { WeaForm, WeaTableNew } from "comsMobx"; +import { WeaLocaleProvider } from "ecCom"; import * as API from "../apis/calculate"; const { TableStore } = WeaTableNew; +const getLabel = WeaLocaleProvider.getLabel; export class calculateStore { @observable tableStore = new TableStore(); // new table @@ -458,10 +460,10 @@ export class calculateStore { return new Promise((resolve, reject) => { API.reAccounting({ salaryAcctRecordId }).then(res => { if (res.status) { - message.success("保存成功"); + message.success(getLabel(22619, "保存成功")); resolve(); } else { - message.error(res.errormsg || "保存失败"); + message.error(res.errormsg || getLabel(22620, "保存失败")); reject(); } }); @@ -473,10 +475,10 @@ export class calculateStore { return new Promise((resolve, reject) => { API.backCalculate({ salaryAcctRecordId }).then(res => { if (res.status) { - message.success("回算成功"); + message.success(getLabel(111, "回算成功")); resolve(); } else { - message.error(res.errormsg || "回算失败"); + message.error(res.errormsg || getLabel(111, "回算失败")); reject(); } }); diff --git a/pc4mobx/hrmSalary/stores/programme.js b/pc4mobx/hrmSalary/stores/programme.js index 23d8fe10..4f4a6eb0 100644 --- a/pc4mobx/hrmSalary/stores/programme.js +++ b/pc4mobx/hrmSalary/stores/programme.js @@ -193,11 +193,11 @@ export class ProgrammeStore { API.createScheme(params).then(res => { if (res.status) { resolve(res); - message.success("新建成功"); + message.success(getLabel(111, "新建成功")); this.getTableDatas(this.selectedKey); } else { reject("新建失败"); - message.error(res.errormsg || "新建失败"); + message.error(res.errormsg || getLabel(111, "新建失败")); } }); }); @@ -213,11 +213,11 @@ export class ProgrammeStore { API.updateScheme(params).then(res => { if (res.status) { resolve(res); - message.success("更新成功"); + message.success(getLabel(31439, "更新成功")); this.getTableDatas(this.selectedKey); } else { - reject("更新失败"); - message.error(res.errormsg || "更新失败"); + reject(getLabel(31825, "更新失败")); + message.error(res.errormsg || getLabel(31825, "更新失败")); } }); }); @@ -228,12 +228,12 @@ export class ProgrammeStore { return new Promise((resolve, reject) => { API.copyScheme(params).then(res => { if (res.status) { - resolve("复制成功"); - message.success("复制成功"); + resolve(getLabel(125245, "复制成功")); + message.success(getLabel(125245, "复制成功")); this.getTableDatas(this.selectedKey); } else { reject(res.errormsg || "复制失败"); - message.error(res.errormsg || "复制失败"); + message.error(res.errormsg || getLabel(517265, "复制失败")); } }); }); @@ -244,10 +244,10 @@ export class ProgrammeStore { API.deleteScheme(params).then(res => { this.deleteLoading = false; if (res.status) { - message.success("刪除成功"); + message.success(getLabel(543721, "刪除成功")); this.getTableDatas(this.selectedKey); } else { - message.error(res.errormsg || "刪除失败"); + message.error(res.errormsg || getLabel(543722, "刪除失败")); } }); }; diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js index 702a281b..3dca7b69 100644 --- a/pc4mobx/hrmSalary/util/index.js +++ b/pc4mobx/hrmSalary/util/index.js @@ -27,7 +27,7 @@ export const getSearchs = (form, condition, col, isCenter, onChange = () => void items.push({ com: (