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

Merge branch 'release/2.19.1.2501.01' into custom/汇通建设

This commit is contained in:
lys 2025-07-14 09:42:07 +08:00
parent b17251e8f0 0ec1cd1cb1
commit bd3741b2cf
3 changed files with 12 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() { componentDidMount() {
const { salaryItemFieldsList } = this.state; const { salaryItemFieldsList } = this.state;
const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props; 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({ this.setState({
salaryItemFieldsList: _.map(salaryItemFieldsList, item => { salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
const { key } = item; const { key } = item;
@ -87,6 +87,7 @@ class SalaryItemForm extends Component {
case "defaultValue": case "defaultValue":
return { return {
...item, ...item,
precision: pattern ? pattern : item.precision,
type: dataType === "number" ? "INPUTNUMBER" : "INPUT", type: dataType === "number" ? "INPUTNUMBER" : "INPUT",
display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0, display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0,
viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1 viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1

6
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js
View File

@ -54,6 +54,12 @@ class WelfareAdvanceSearchPannel extends Component {
viewAttr: 2 viewAttr: 2
} }
}; };
} else if (getKey(o) === "siSchemeId" || getKey(o) === "fundSchemeId" || getKey(o) === "otherSchemeId" || getKey(o) === "taxAgentId") {
return {
...o, otherParams: {
showSearch: true, optionFilterProp: "children"
}
};
} }
return { ...o }; return { ...o };
}) })

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

@ -111,7 +111,10 @@ class Index extends Component {
return { return {
...g, label: getLabel(g.lanId, g.label), ...g, label: getLabel(g.lanId, g.label),
viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : g.viewAttr, 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) { } else if (getKey(g).indexOf("StartTime") !== -1) {
return { return {