Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03

This commit is contained in:
黎永顺 2024-06-28 17:00:13 +08:00
commit b7ececb0c4
1 changed files with 1 additions and 1 deletions

View File

@ -88,7 +88,7 @@ class SalaryItemForm extends Component {
return {
...item,
type: dataType === "number" ? "INPUTNUMBER" : "INPUT",
display: valueType && valueType.toString() === "1",
display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0,
viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1
};
case "formulaContent":