hotfix/2.9.10.2312.02

This commit is contained in:
黎永顺 2024-01-11 14:23:14 +08:00
parent 15bc21ecd5
commit 36f763a133
1 changed files with 14 additions and 4 deletions

View File

@ -40,6 +40,7 @@ export default class Index extends Component {
extEmpsWitch: "0",
salaryAcctFixedColumns: 0,
welBaseDiffByPerAndCom: "0",
welBaseAutoAdjust: "0"
},
showEncryptOperationButton: "",
progressVisible: false,
@ -68,7 +69,7 @@ export default class Index extends Component {
taxDeclarationFunction: operateTaxDeclaration = "1", salaryArchiveDelete: confValue,
salaryAcctEmployeeRule: matchRule, WITHDRAW_TAX_DECLARATION: withDrawTaxDeclaration = "0",
OPEN_APPLICATION_ENCRYPT: enctry = "1", extEmpsWitch = "0", salaryAcctFixedColumns = "0",
welBaseDiffByPerAndCom = "0",
welBaseDiffByPerAndCom = "0", welBaseAutoAdjust = "0"
}
} = sysInfo;
// const { data: { ascOrDesc, orderRule } } = orderRules;
@ -90,7 +91,7 @@ export default class Index extends Component {
...saveParams,
ascOrDesc, orderRule, rule, enctry, matchRule, confValue, withDrawTaxDeclaration, salaryAcctFixedColumns,
extEmpsWitch, operateTaxDeclaration: (operateTaxDeclaration && operateTaxDeclaration !== "0") ? "1" : "0",
welBaseDiffByPerAndCom
welBaseDiffByPerAndCom, welBaseAutoAdjust
}
});
}
@ -311,8 +312,11 @@ export default class Index extends Component {
});
break;
case "welBaseDiffByPerAndCom":
case "welBaseAutoAdjust":
this.saveSysOperate({
title: getLabel(111, "福利档案基数区分个人和公司"),
title: key === "welBaseDiffByPerAndCom" ?
getLabel(111, "福利档案基数区分个人和公司") :
getLabel(111, "福利档案导入基数不符合要求时自动调整为上限/下限"),
module: "basic", confKey: key,
confValue: val
});
@ -353,7 +357,8 @@ export default class Index extends Component {
withDrawTaxDeclaration,
extEmpsWitch,
salaryAcctFixedColumns,
welBaseDiffByPerAndCom
welBaseDiffByPerAndCom,
welBaseAutoAdjust
} = saveParams;
return (
<div className="ruleWrapper">
@ -414,6 +419,11 @@ export default class Index extends Component {
<WeaCheckbox display="switch" value={welBaseDiffByPerAndCom}
onChange={val => this.handleChange("welBaseDiffByPerAndCom", val)}/>
</WeaFormItem>
<WeaFormItem label={getLabel(111, "导入基数自动调整上/下限")} labelCol={{ span: 8 }}
wrapperCol={{ span: 16 }}>
<WeaCheckbox display="switch" value={welBaseAutoAdjust}
onChange={val => this.handleChange("welBaseAutoAdjust", val)}/>
</WeaFormItem>
</WeaSearchGroup>
<WeaSearchGroup title={getLabel(111, "薪资核算人员匹配规则")} showGroup center>
<WeaFormItem label={getLabel(111, "匹配规则")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>