From e6753ee33c367f19b960851f9c4a0a912b8e2464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 5 Sep 2024 14:24:19 +0800 Subject: [PATCH] =?UTF-8?q?custom/=E4=B8=8A=E6=B5=B7=E6=B8=AF=E6=B9=BE?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/ledgerPage/components/ledgerBaseSetting.js | 2 +- pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js | 2 +- pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index 74b7066d..8995c90b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -330,7 +330,7 @@ const buildSalaryInfo = (editBasicInfo, monthCal, nowYear, nowMonth) => { + prefixAddZero(customInfo.salaryMonth, 2) + "-" + prefixAddZero(getMonthDays(customInfo.salaryYear, customInfo.salaryMonth), 2); } else { - customInfo.salaryPeriodTip = getLabel(15322, "至") + nextMonthStr + (salaryCycleFromDayNum - 1) + "号"; + customInfo.salaryPeriodTip = getLabel(15322, "至") + nextMonthStr + (salaryCycleFromDayNum - 1) + getLabel(16992, "号"); customInfo.salaryPeriodStart = customInfo.salaryYear + "-" + prefixAddZero(customInfo.salaryMonth, 2) + "-" + prefixAddZero(salaryCycleFromDayNum, 2); let year = customInfo.salaryYear; diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js index d16b0f94..a7d66e8b 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js @@ -37,7 +37,7 @@ class Index extends Component { const [{ data: sysinfo }, { data: employeeData }] = await Promise.all([API.sysinfo(), commonEnumList({ enumClass: "com.engine.salary.enums.UserStatusEnum" })]); const { adjustShowStatus, salaryShowStatus } = sysinfo; let tabs = [ - { key: "1", title: getLabel(111, "工资单") }, + { key: "1", title: getLabel(503, "工资单") }, { key: "2", title: getLabel(543150, "调薪记录") }, { key: "3", title: getLabel(545960, "下属工资单") } ]; diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index 4bd9a07a..1a1002d3 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -217,16 +217,16 @@ class TemplateBaseSettings extends Component { placement="top"/>