hotfix/2.14.2.2406.02

This commit is contained in:
黎永顺 2024-07-02 15:05:17 +08:00
parent 230aea8d62
commit 5a2ecefa6f
2 changed files with 25 additions and 12 deletions

View File

@ -1,7 +1,9 @@
import React from "react";
import { WeaFormItem, WeaSearchGroup } from "ecCom";
import { WeaFormItem, WeaSearchGroup, WeaTools } from "ecCom";
import { WeaSwitch } from "comsMobx";
const getKey = WeaTools.getKey;
export const renderRuleForm = (form, condition, onChange) => {
const { isFormInit } = form;
const formParams = form.getFormParams();
@ -15,7 +17,11 @@ export const renderRuleForm = (form, condition, onChange) => {
label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)}
tipPosition="bottom">
<WeaSwitch fieldConfig={fields} form={form} formParams={formParams} onChange={onChange}/>
<WeaSwitch
fieldConfig={fields} form={form} formParams={formParams}
onChange={v => getKey(fields) !== "salaryAcctFixedColumns" && onChange(v)}
onBlur={(v) => getKey(fields) === "salaryAcctFixedColumns" && onChange({ salaryAcctFixedColumns: { value: v } })}
/>
</WeaFormItem>),
colSpan: 1,
hide: fields.hide

View File

@ -25,6 +25,7 @@ class RuleConfig extends Component {
super(props);
this.state = { conditions: [], sysinfo: {}, progressVisible: false, progress: 50 };
this.timer = null;
this.handleDebounce = null;
}
componentDidMount() {
@ -116,16 +117,22 @@ class RuleConfig extends Component {
case "taxAgentShowStatus":
case "salaryShowStatus":
case "adjustShowStatus":
const confTitle = {
welBaseDiffByPerAndCom: getLabel(111, "福利档案基数区分个人和公司"),
welBaseAutoAdjust: getLabel(111, "福利档案导入基数不符合要求时自动调整为上限/下限"),
salaryAcctFixedColumns: getLabel(545791, "薪资核算固定列头数"),
extEmpsWitch: getLabel(544097, "开启非系统人员"),
taxAgentShowStatus: getLabel(111, "显示【个税扣缴义务人】信息"),
salaryShowStatus: getLabel(111, "显示工资单页签"),
adjustShowStatus: getLabel(111, "显示调薪记录页签")
};
this.unifiedSettings(key, confTitle[key]);
if (!this.handleDebounce) {
this.handleDebounce = _.debounce(() => {
const confTitle = {
welBaseDiffByPerAndCom: getLabel(111, "福利档案基数区分个人和公司"),
welBaseAutoAdjust: getLabel(111, "福利档案导入基数不符合要求时自动调整为上限/下限"),
salaryAcctFixedColumns: getLabel(545791, "薪资核算固定列头数"),
extEmpsWitch: getLabel(544097, "开启非系统人员"),
taxAgentShowStatus: getLabel(111, "显示【个税扣缴义务人】信息"),
salaryShowStatus: getLabel(111, "显示工资单页签"),
adjustShowStatus: getLabel(111, "显示调薪记录页签")
};
this.unifiedSettings(key, confTitle[key]);
this.handleDebounce = null;
}, 500);
}
this.handleDebounce();
break;
default:
break;