From 6e193e028c45ff6d743842eebd2c86a4c3cc318e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 13 Dec 2023 16:10:30 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.9.10.2312.02-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=9F=BA=E6=95=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/dataAcquisition/addItems.js | 8 +++++--- .../dataAcquisition/cumDeduct/columns.js | 7 +++++++ .../pages/dataAcquisition/cumDeduct/index.js | 7 ++----- .../dataAcquisition/cumSituation/columns.js | 17 ++++++++++++++++ .../dataAcquisition/cumSituation/index.js | 7 ++----- .../hrmSalary/pages/dataAcquisition/layout.js | 20 ++++++++++++++++--- .../dataAcquisition/otherDeduct/columns.js | 5 +++++ .../dataAcquisition/otherDeduct/index.js | 7 ++----- .../components/condition.js | 7 +++++++ .../specialAddDeduction/index.js | 7 ++----- .../components/payrollList/index.js | 2 +- .../hrmSalary/pages/mySalaryMobile/index.js | 2 +- .../components/povitpivotChartModal.js | 7 ++++++- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 6 +++--- .../addCompensationPersonnelDialog.js | 6 +++--- .../components/regEditDetial.js | 2 -- .../welfareEditArchiveSlide/index.js | 2 +- .../welfareArchive/config.js | 6 +++--- 18 files changed, 84 insertions(+), 41 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js index 5b05c2d6..94b112bd 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js @@ -4,10 +4,12 @@ * Description: */ import React, { Component } from "react"; -import { WeaBrowser, WeaFormItem } from "ecCom"; +import { WeaBrowser, WeaFormItem, WeaLocaleProvider } from "ecCom"; import { getDomkes, getSearchs } from "../../util"; import "./index.less"; +const getLabel = WeaLocaleProvider.getLabel; + class AddItems extends Component { componentDidMount() { const { editId, condition, form } = this.props; @@ -63,7 +65,7 @@ class AddItems extends Component { return (
{getSearchs(form, condition)} - 若此员工数据已存在在同期列表中，则当前数据保存后会覆盖列表数据 + {getLabel(543350, "若此员工数据已存在在同期列表中，则当前数据保存后会覆盖列表数据")}
); } @@ -89,7 +91,7 @@ export const Tips = payload => { const { children } = payload; return (
-
小提示
+
{getLabel(543177, "小提示")}
{children}
); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js index 742d1573..8c6a9acd 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js @@ -464,6 +464,7 @@ export const dataCollectCondition = [ domkey: ["addUpChildEducation"], fieldcol: 14, label: "累计子女教育", + lanId: 542158, labelcol: 8, value: "", precision: 2, @@ -474,6 +475,7 @@ export const dataCollectCondition = [ domkey: ["addUpContinuingEducation"], fieldcol: 14, label: "累计继续教育", + lanId: 542159, labelcol: 8, value: "", precision: 2, @@ -484,6 +486,7 @@ export const dataCollectCondition = [ domkey: ["addUpHousingLoanInterest"], fieldcol: 14, label: "累计住房贷款利息", + lanId: 542160, labelcol: 8, value: "", precision: 2, @@ -494,6 +497,7 @@ export const dataCollectCondition = [ domkey: ["addUpHousingRent"], fieldcol: 14, label: "累计住房租金", + lanId: 542161, labelcol: 8, value: "", precision: 2, @@ -504,6 +508,7 @@ export const dataCollectCondition = [ domkey: ["addUpSupportElderly"], fieldcol: 14, label: "累计赡养老人", + lanId: 542162, labelcol: 8, value: "", precision: 2, @@ -514,6 +519,7 @@ export const dataCollectCondition = [ domkey: ["addUpIllnessMedical"], fieldcol: 14, label: "累计大病医疗", + lanId: 542163, labelcol: 8, value: "", precision: 2, @@ -524,6 +530,7 @@ export const dataCollectCondition = [ domkey: ["addUpInfantCare"], fieldcol: 14, label: "累计婴幼儿照护", + lanId: 537990, labelcol: 8, value: "", precision: 2, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index dd08f1ff..4d5ca560 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -325,11 +325,8 @@ class Index extends Component { addForm.initFormFields(conditions); this.setState({ slidePayload: { - ...slidePayload, - visible: true, - title, - data: editId, - children: title.length <= 2 ? + ...slidePayload, visible: true, title, data: editId, + children: title !== getLabel(543348, "累计专项附加扣除记录") ? this.addItemRef = dom} taxAgentOption={taxAgentOption} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js index aed552e2..67a71dd6 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js @@ -149,6 +149,7 @@ export const dataCollectCondition = [ domkey: ["addUpIncome"], fieldcol: 14, label: "累计收入额", + lanId: 542230, labelcol: 8, value: "", precision: 2, @@ -159,6 +160,7 @@ export const dataCollectCondition = [ domkey: ["addUpSubtraction"], fieldcol: 14, label: "累计减除费用", + lanId: 542231, labelcol: 8, value: "", precision: 2, @@ -169,6 +171,7 @@ export const dataCollectCondition = [ domkey: ["addUpSocialSecurityTotal"], fieldcol: 14, label: "累计社保个人合计", + lanId: 542232, labelcol: 8, value: "", precision: 2, @@ -179,6 +182,7 @@ export const dataCollectCondition = [ domkey: ["addUpAccumulationFundTotal"], fieldcol: 14, label: "累计公积金个人合计", + lanId: 542233, labelcol: 8, value: "", precision: 2, @@ -189,6 +193,7 @@ export const dataCollectCondition = [ domkey: ["addUpChildEducation"], fieldcol: 14, label: "累计子女教育", + lanId: 542158, labelcol: 8, value: "", precision: 2, @@ -199,6 +204,7 @@ export const dataCollectCondition = [ domkey: ["addUpContinuingEducation"], fieldcol: 14, label: "累计继续教育", + lanId: 542159, labelcol: 8, value: "", precision: 2, @@ -209,6 +215,7 @@ export const dataCollectCondition = [ domkey: ["addUpHousingLoanInterest"], fieldcol: 14, label: "累计住房贷款利息", + lanId: 542160, labelcol: 8, value: "", precision: 2, @@ -219,6 +226,7 @@ export const dataCollectCondition = [ domkey: ["addUpHousingRent"], fieldcol: 14, label: "累计住房租金", + lanId: 542161, labelcol: 8, value: "", precision: 2, @@ -229,6 +237,7 @@ export const dataCollectCondition = [ domkey: ["addUpSupportElderly"], fieldcol: 14, label: "累计赡养老人", + lanId: 542162, labelcol: 8, value: "", precision: 2, @@ -239,6 +248,7 @@ export const dataCollectCondition = [ domkey: ["addUpIllnessMedical"], fieldcol: 14, label: "累计大病医疗", + lanId: 542163, labelcol: 8, value: "", precision: 2, @@ -249,6 +259,7 @@ export const dataCollectCondition = [ domkey: ["addUpEnterpriseAndOther"], fieldcol: 14, label: "累计企业（职业）年金及其他福利", + lanId: 542234, labelcol: 8, value: "", precision: 2, @@ -259,6 +270,7 @@ export const dataCollectCondition = [ domkey: ["addUpOtherDeduction"], fieldcol: 14, label: "累计其他免税扣除", + lanId: 543361, labelcol: 8, value: "", precision: 2, @@ -269,6 +281,7 @@ export const dataCollectCondition = [ domkey: ["addUpTaxExemptIncome"], fieldcol: 14, label: "累计免税收入", + lanId: 542236, labelcol: 8, value: "", precision: 2, @@ -279,6 +292,7 @@ export const dataCollectCondition = [ domkey: ["addUpAllowedDonation"], fieldcol: 14, label: "累计准予扣除的捐赠额", + lanId: 542237, labelcol: 8, value: "", precision: 2, @@ -289,6 +303,7 @@ export const dataCollectCondition = [ domkey: ["addUpTaxSavings"], fieldcol: 14, label: "累计减免税额", + lanId: 542238, labelcol: 8, value: "", precision: 2, @@ -299,6 +314,7 @@ export const dataCollectCondition = [ domkey: ["addUpAdvanceTax"], fieldcol: 14, label: "累计已预扣预缴税额", + lanId: 542239, labelcol: 8, value: "", precision: 2, @@ -309,6 +325,7 @@ export const dataCollectCondition = [ domkey: ["addUpInfantCare"], fieldcol: 14, label: "累计婴幼儿照护", + lanId: 537990, labelcol: 8, value: "", precision: 2, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index 2a424417..24b19f12 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -215,11 +215,8 @@ class Index extends Component { addForm.initFormFields(conditions); this.setState({ slidePayload: { - ...slidePayload, - visible: true, - title, - data: editId, - children: title.length <= 2 ? + ...slidePayload, visible: true, title, data: editId, + children: title !== getLabel(543370, "往期累计情况（工资、薪金）记录") ? this.addItemRef = dom} taxAgentOption={taxAgentOption} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js index 4c421d60..f78c9f99 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js @@ -7,12 +7,14 @@ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; import { toJS } from "mobx"; -import { WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom"; +import { WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom"; import ImportModal from "../../components/importModal"; import SlideModalTitle from "../../components/slideModalTitle"; import { getSearchs } from "../../util"; import "./index.less"; +const getLabel = WeaLocaleProvider.getLabel; + @inject("taxAgentStore") @observer class Layout extends Component { @@ -116,9 +118,21 @@ class Layout extends Component { subtitle={subtitle} loading={slideLoading} onSave={onSave} - editable={subtitle.length <= 2} + editable={( + subtitle !== getLabel(543348, "累计专项附加扣除记录") && + subtitle !== getLabel(543385, "专项附加扣除记录") && + subtitle !== getLabel(543365, "其他免税扣除记录") && + subtitle !== getLabel(543370, "往期累计情况（工资、薪金）记录") + )} showOperateBtn={showOperateBtn} - customOperate={subtitle.length <= 2 ? [] : detailOptBtns} + customOperate={ + ( + subtitle !== getLabel(543348, "累计专项附加扣除记录") && + subtitle !== getLabel(543385, "专项附加扣除记录") && + subtitle !== getLabel(543365, "其他免税扣除记录") && + subtitle !== getLabel(543370, "往期累计情况（工资、薪金）记录") + ) ? [] : detailOptBtns + } /> } content={slideChildren} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js index e693c017..e46c8006 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js @@ -134,6 +134,7 @@ export const dataCollectCondition = [ domkey: ["businessHealthyInsurance"], fieldcol: 14, label: "商业健康保险", + lanId: 542292, labelcol: 8, value: "", precision: 2, @@ -144,6 +145,7 @@ export const dataCollectCondition = [ domkey: ["taxDelayEndowmentInsurance"], fieldcol: 14, label: "税延养老保险", + lanId: 542293, labelcol: 8, value: "", precision: 2, @@ -154,6 +156,7 @@ export const dataCollectCondition = [ domkey: ["otherDeduction"], fieldcol: 14, label: "其他", + lanId: 25740, labelcol: 8, value: "", precision: 2, @@ -164,6 +167,7 @@ export const dataCollectCondition = [ domkey: ["deductionAllowedDonation"], fieldcol: 14, label: "准予扣除的捐赠额", + lanId: 542294, labelcol: 8, value: "", precision: 2, @@ -174,6 +178,7 @@ export const dataCollectCondition = [ domkey: ["privatePension"], fieldcol: 14, label: "个人养老金", + lanId: 542295, labelcol: 8, value: "", precision: 2, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index a1f9d679..3440fbb0 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -318,11 +318,8 @@ class Index extends Component { addForm.initFormFields(conditions); this.setState({ slidePayload: { - ...slidePayload, - visible: true, - title, - data: editId, - children: title.length <= 2 ? + ...slidePayload, visible: true, title, data: editId, + children: title !== getLabel(543365, "其他免税扣除记录") ? this.addItemRef = dom} taxAgentOption={taxAgentOption} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js index 241efd93..1b352f7e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js @@ -56,6 +56,7 @@ export const condition = [ domkey: ["childrenEducation"], fieldcol: 14, label: "子女教育", + lanId: 503173, labelcol: 8, value: "", precision: 2, @@ -66,6 +67,7 @@ export const condition = [ domkey: ["continuingEducation"], fieldcol: 14, label: "继续教育", + lanId: 503174, labelcol: 8, value: "", precision: 2, @@ -76,6 +78,7 @@ export const condition = [ domkey: ["housingLoanInterest"], fieldcol: 14, label: "住房贷款利息", + lanId: 503175, labelcol: 8, value: "", precision: 2, @@ -86,6 +89,7 @@ export const condition = [ domkey: ["housingRent"], fieldcol: 14, label: "住房租金", + lanId: 503176, labelcol: 8, value: "", precision: 2, @@ -96,6 +100,7 @@ export const condition = [ domkey: ["supportingElder"], fieldcol: 14, label: "赡养老人", + lanId: 503177, labelcol: 8, value: "", precision: 2, @@ -106,6 +111,7 @@ export const condition = [ domkey: ["seriousIllnessTreatment"], fieldcol: 14, label: "大病医疗", + lanId: 542550, labelcol: 8, value: "", precision: 2, @@ -116,6 +122,7 @@ export const condition = [ domkey: ["infantCare"], fieldcol: 14, label: "婴幼儿照护", + lanId: 537983, labelcol: 8, value: "", precision: 2, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js index dc6c94fe..c0a28832 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js @@ -326,11 +326,8 @@ class Index extends Component { addForm.initFormFields(conditions); this.setState({ slidePayload: { - ...slidePayload, - visible: true, - title, - data: editId, - children: title.length <= 2 ? + ...slidePayload, visible: true, title, data: editId, + children: title !== getLabel(543385, "专项附加扣除记录") ? this.addItemRef = dom} taxAgentOption={taxAgentOption} diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js index ae884bc6..fa2a203e 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js @@ -24,7 +24,7 @@ class Index extends Component { {`${getLabel(15323, "第")}${it.acctTimes}${getLabel(18929, "次")}`}
- {getLabel(111, "发放时间")} + {getLabel(542610, "发放时间")} {moment(it.sendTime).format("YYYY-MM")}
{`${getLabel(33564, "查看")}>`} diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/index.js index e1fade72..3db3dfa6 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryMobile/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/index.js @@ -82,7 +82,7 @@ class Index extends Component {
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js index a5d2f7c0..c29f118a 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js @@ -75,8 +75,13 @@ class PovitpivotChartModal extends Component { postMessageToChild = (payload) => { const childFrameObj = document.getElementById("commonTable"); const { dataSource, showSum = false, pageInfo, columns } = payload; + const i18n = { + "总计": getLabel(523, "总计"), "共": getLabel(18609, "共"), + "条": getLabel(18256, "条"), "第": getLabel(15323, "第"), + "次": getLabel(18929, "次"), + }; childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ - dataSource, columns, showSum, pageInfo + dataSource, columns, showSum, pageInfo, i18n }), "*"); }; getDataPerspective = (payload) => { diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index ce5f8923..fe54d1df 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -302,7 +302,7 @@ export default class Index extends Component { break; case "salaryAcctFixedColumns": this.saveSysOperate({ - title: getLabel(111, "薪资核算固定列头数"), + title: getLabel(545791, "薪资核算固定列头数"), module: "basic", confKey: key, confValue: !_.isNil(val) ? val.toString() : "0" }); @@ -405,8 +405,8 @@ export default class Index extends Component { /> - - + + this.setState({ saveParams: { ...saveParams, salaryAcctFixedColumns: v } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/addCompensationPersonnelDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/addCompensationPersonnelDialog.js index 34b7edb4..a3952564 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/addCompensationPersonnelDialog.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/addCompensationPersonnelDialog.js @@ -39,7 +39,7 @@ class AddCompensationPersonnelDialog extends Component { items: _.map(o.items, g => ({ ...g, label: getLabel(g.lanId, g.label) })), - title: getLabel(111, "补差人员") + title: getLabel(545790, "补差人员") }; }) }, () => addCPForm.initFormFields(this.state.conditions)); @@ -69,7 +69,7 @@ class AddCompensationPersonnelDialog extends Component { ] }); } else { - message.error(getLabel(111, "数据不存在！")); + message.error(getLabel(542148, "数据不存在！")); this.setState({ paymentList: [ { title: getLabel(538967, "社保"), titleSign: "social", payment: [] }, @@ -186,7 +186,7 @@ class AddCompensationPersonnelDialog extends Component { const { conditions, paymentList, loading } = this.state; const { standingBookStore: { addCPForm } } = this.props; return ( - {getLabel(826, "确定")}]} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js index 4834ce49..9faf804a 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js @@ -14,8 +14,6 @@ import { toDecimal_n } from "../../../../util"; const getLabel = WeaLocaleProvider.getLabel; -const getLabel = WeaLocaleProvider.getLabel; - class RegEditDetial extends Component { constructor(props) { super(props); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js index ca113cfb..d2473e9b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js @@ -144,7 +144,7 @@ class Index extends Component { fundPayload = this.covertPayload("ACCUMULATION_FUND", "fund", getConditionDomkeys(this.props.fundBase.items)), otherPayload = this.covertPayload("OTHER", "other", getConditionDomkeys(this.props.otherBase.items)); if (!(socailPayload.validate && fundPayload.validate && otherPayload.validate)) { - message.warning(getLabel(111, "请维护起始缴纳月！")); + message.warning(getLabel(545938, "请维护起始缴纳月！")); return; } this.setState({ loading: true }); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js index 46b5ab58..d559c588 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js @@ -610,8 +610,8 @@ export const welfareConditions = [ conditionType: "SELECT", domkey: ["otherSchemeId"], fieldcol: 14, - label: "其它福利名称", - lanId: 111, + label: "其他福利方案名称", + lanId: 542271, labelcol: 10, value: "", options: [], @@ -623,7 +623,7 @@ export const welfareConditions = [ domkey: ["otherUnderTake"], fieldcol: 14, label: "其它福利个人实际承担方", - lanId: 111, + lanId: 543872, labelcol: 10, value: "", options: [],