From 68663087eebf262de356ba6c74de9848dac05cfd Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 28 Apr 2025 11:12:07 +0800 Subject: [PATCH] =?UTF-8?q?custom-=E8=81=94=E7=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerPage/components/ledgerBaseSetting.js | 18 +++++++++++++++++- pc4mobx/hrmSalary/pages/ledgerPage/config.js | 10 ++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index 1a4b426d..5861bd15 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -232,7 +232,8 @@ const CustomSelect = (props) => { const { key, options = [] } = item; return onChange(key, v)}/> + disabled={!admin || (key === "attendCycleFromDay" && (baseInfo["attendCycleType"] === "10" || baseInfo["attendCycleType"] === "11"))} + onChange={(v) => onChange(key, v)}/> ; }) } @@ -303,6 +304,21 @@ const buildEditBasicInfo = (editBasicInfo) => { case "4" : tmpV["attendCycleInfo"] = buildAttendanceInfo(editBasicInfo, 1, nowYear, nowMonth); break; + //联特二开:本季度10/上季度11 + case "10" : + tmpV["attendCycleInfo"] = { + attendancePeriodEnd: "本季度", + attendancePeriodStart: "", + attendancePeriodTip: "至本季度最后一天" + }; + break; + case "11" : + tmpV["attendCycleInfo"] = { + attendancePeriodEnd: "上季度", + attendancePeriodStart: "", + attendancePeriodTip: "至上季度最后一天" + }; + break; } return tmpV; }; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js index 1bcbc8aa..7ebdd40b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js @@ -361,6 +361,16 @@ export const baseSettingFormItem = [ key: "4", selected: false, showname: "下月" + }, + { + key: "10", + selected: true, + showname: "本季度" + }, + { + key: "11", + selected: false, + showname: "上季度" } ] },