From f2b17872f731d8e56bb951f6e0f1ea6cc901922d 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, 25 Sep 2024 11:12:53 +0800 Subject: [PATCH] release/2.15.2.2409.01 --- .../hrmSalary/pages/ruleConfig/conditions.js | 28 +++++++++---------- .../hrmSalary/pages/ruleConfig/ruleConfig.js | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js index c04384b0..d7340658 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js @@ -144,20 +144,20 @@ export const conditions = [ title: getLabel(111, "薪资核算固定列头数"), defaultshow: true }, - { - items: [ - { - conditionType: "SWITCH", - domkey: ["extEmpsWitch"], - fieldcol: 10, - label: getLabel(111, "开启非系统人员"), - labelcol: 8, - viewAttr: 2 - } - ], - title: getLabel(111, "非系统人员"), - defaultshow: true - }, + // { + // items: [ + // { + // conditionType: "SWITCH", + // domkey: ["extEmpsWitch"], + // fieldcol: 10, + // label: getLabel(111, "开启非系统人员"), + // labelcol: 8, + // viewAttr: 2 + // } + // ], + // title: getLabel(111, "非系统人员"), + // defaultshow: true + // }, { items: [ { diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js index 3f24a0d6..d1dcdc12 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js @@ -10,10 +10,10 @@ import { WeaLocaleProvider, WeaTools, WeaTop } from "ecCom"; import { message, Modal } from "antd"; import * as API from "../../apis/ruleconfig"; import { conditions, payloadList } from "./conditions"; +import ProgressModal from "../../components/progressModal"; import { renderRuleForm } from "./form"; import { getConditionDomkeys } from "../../util"; import "./index.less"; -import ProgressModal from "../../components/progressModal"; const getKey = WeaTools.getKey; const getLabel = WeaLocaleProvider.getLabel;