qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税

This commit is contained in:
lys 2025-06-25 14:50:21 +08:00
parent ac0ba88f71 8eadce0ce3
commit 4698ff8b17
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
View File

@ -30,7 +30,7 @@ class SalaryItemForm extends Component {
componentDidMount() {
const { salaryItemFieldsList } = this.state;
const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props;
const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType } = request;
const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType, pattern } = request;
this.setState({
salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
const { key } = item;
@ -87,6 +87,7 @@ class SalaryItemForm extends Component {
case "defaultValue":
return {
...item,
precision: pattern ? pattern : item.precision,
type: dataType === "number" ? "INPUTNUMBER" : "INPUT",
display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0,
viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1

5
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
View File

@ -113,7 +113,10 @@ class Index extends Component {
return {
...g, label: getLabel(g.lanId, g.label),
viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : g.viewAttr,
options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options
options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options,
otherParams: {
showSearch: true, optionFilterProp: "children"
}
};
} else if (getKey(g).indexOf("StartTime") !== -1) {
return {