diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js index bb22f65e..783b0cb5 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js @@ -59,6 +59,24 @@ export const conditions = [ lanId: 543358, defaultshow: true }, + { + items: [ + { + conditionType: "SWITCH", + domkey: ["openSecondaryAccount"], + fieldcol: 10, + label: "启用主次账号", + tip: "启用后,若有次账号相关档案,则此功能不能关闭。", + tipLanId: 111, + lanId: 111, + labelcol: 8, + viewAttr: 2 + } + ], + title: "主次身份", + lanId: 111, + defaultshow: true + }, { items: [ { diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/form.js b/pc4mobx/hrmSalary/pages/ruleConfig/form.js index 9b17f248..09a946f8 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/form.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/form.js @@ -1,8 +1,9 @@ import React from "react"; -import { WeaFormItem, WeaSearchGroup, WeaTools } from "ecCom"; +import { WeaFormItem, WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom"; import { WeaSwitch } from "comsMobx"; const getKey = WeaTools.getKey; +const getLabel = WeaLocaleProvider.getLabel; export const renderRuleForm = (form, condition, onChange) => { const { isFormInit } = form; @@ -14,7 +15,12 @@ export const renderRuleForm = (form, condition, onChange) => { items.push({ com: ( + {fields.label} + {fields.tip && } + } + labelCol={{ span: `${fields.labelcol}` }} wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)} tipPosition="bottom">