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-07-11 17:21:47 +08:00
parent 4c4dd3bd82 f3e2d878d0
commit 90c950774d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
View File

@ -127,7 +127,7 @@ class AssociativeSearchMult extends Component {
} }
let options = data.map(d => <Option key={d.id} title={d.name}>{d.name}</Option>); let options = data.map(d => <Option key={d.id} title={d.name}>{d.name}</Option>);
!tags && selectedValues && selectedValues.map((v) => { !tags && selectedValues && selectedValues.map((v) => {
v && options.unshift(<Option key={v} title={datas[v].name}>{datas[v].name}</Option>); v && datas[v] && options.unshift(<Option key={v} title={datas[v].name}>{datas[v].name}</Option>);
}); });
const select = <Select const select = <Select
{...this.props} {...this.props}

8
pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
View File

@ -91,11 +91,11 @@ class CustomBrowserDialog extends Component {
this.props.onCancel && this.props.onCancel(); this.props.onCancel && this.props.onCancel();
}; };
getItemById = (id) => { getItemById = (id) => {
const { listDatas } = this.state; const { listDatas } = this.state, dataSource = [...listDatas, ..._.values(this.props.datas)];
if (this.selectedData[id]) return this.selectedData[id]; if (this.selectedData[id]) return this.selectedData[id];
if (!_.isEmpty(listDatas)) { if (!_.isEmpty(dataSource)) {
for (let i = 0; i < listDatas.length; i++) { for (let i = 0; i < dataSource.length; i++) {
if (String(id) === String(listDatas[i].id)) return listDatas[i]; if (String(id) === String(dataSource[i].id)) return dataSource[i];
} }
} }
}; };