From 07ef0535c40eaf5c18683d3f4c20e58f5c88b4cd Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 7 Jan 2025 15:55:25 +0800 Subject: [PATCH 1/3] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/style/index.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less index 6bc0127b..c10d1873 100644 --- a/pc4mobx/hrmSalary/style/index.less +++ b/pc4mobx/hrmSalary/style/index.less @@ -39,6 +39,10 @@ .form-dialog-layout { background: #f6f6f6; + .wea-form-item-wrapper { + display: block; + } + .wea-form-item .wea-form-item-wrapper .wea-field-readonly { line-height: 28px; } From 30bbcfb7122493c67ca97303e337963a593a2626 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 7 Jan 2025 15:59:44 +0800 Subject: [PATCH 2/3] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/style/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less index c10d1873..eedbf38d 100644 --- a/pc4mobx/hrmSalary/style/index.less +++ b/pc4mobx/hrmSalary/style/index.less @@ -40,7 +40,7 @@ background: #f6f6f6; .wea-form-item-wrapper { - display: block; + display: block !important; } .wea-form-item .wea-form-item-wrapper .wea-field-readonly { From 811083310b71a33f4d11c395eb6cf72b5636d100 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 14 Jan 2025 14:02:24 +0800 Subject: [PATCH 3/3] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/ruleConfig/conditions.js | 9 +++++++++ pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js index c5701013..5813e659 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js @@ -188,6 +188,15 @@ export const conditions = [ lanId: 111, labelcol: 8, viewAttr: 2 + }, + { + conditionType: "SWITCH", + domkey: ["SHOT_EMP_BTN"], + fieldcol: 10, + label: "启用组织快照", + lanId: 111, + labelcol: 8, + viewAttr: 2 } ], title: "薪资核算", diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js index 573bc864..ab502d5c 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js @@ -154,6 +154,7 @@ class RuleConfig extends Component { case "APPROVAL_CAN_RE_CALC_STATUS": case "APPROVAL_CAN_EDIT_RESULT_STATUS": case "ATTENDANCE_SERIAL_COLLECTION_BTN": + case "SHOT_EMP_BTN": if (!this.handleDebounce) { this.handleDebounce = _.debounce(() => { const confTitle = { @@ -171,7 +172,8 @@ class RuleConfig extends Component { APPROVAL_CAN_MANUAL_FILE_STATUS: getLabel(111, "开启审批的核算记录允许手动归档"), APPROVAL_CAN_RE_CALC_STATUS: getLabel(111, "开启审批的核算记录允许重新核算"), APPROVAL_CAN_EDIT_RESULT_STATUS: getLabel(111, "审批流程发起后允许修改核算数据"), - ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据") + ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据"), + SHOT_EMP_BTN: getLabel(111, "启用组织快照") }; this.unifiedSettings(key, confTitle[key]); this.handleDebounce = null;