Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop

This commit is contained in:
黎永顺 2023-10-09 08:58:09 +08:00
commit 9aaef674f0
3 changed files with 6 additions and 2 deletions

View File

@ -286,7 +286,7 @@ export default class Payroll extends React.Component {
viewcondition: "1"
},
{
title: getLabel(111, "工资单模板基础设置"),
title: getLabel(111, "工资单基础设置"),
viewcondition: "2"
}
];

View File

@ -27,7 +27,7 @@
border-bottom: 1px solid #e5e5e5;
.wea-input-number {
width: inherit !important;
width: 80px !important;
margin: 0 10px;
}
}

View File

@ -180,6 +180,10 @@ class TemplateBaseSettings extends Component {
}
})}/>
<span>{getLabel(111, "个月内的工资单")}</span>
<WeaHelpfulTip
title={getLabel(111, "0表示不控制")}
style={{ marginLeft: 10 }}
placement="top"/>
</div>
</WeaSearchGroup>
</React.Fragment>