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 release/2.19.1.2501.01-个税

This commit is contained in:
lys 2025-03-27 15:30:16 +08:00
parent c3284fa160 bb3ded5692
commit 20da3fd4eb
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
View File

@ -41,6 +41,10 @@
.baseSettingWrapper { .baseSettingWrapper {
padding: 12px 12px 12px 20px; padding: 12px 12px 12px 20px;
.wea-form-item-wrapper {
display: inline-block !important;
}
.baseSettingLeft { .baseSettingLeft {
border: 1px solid #ebedf0; border: 1px solid #ebedf0;
padding: 0 !important; padding: 0 !important;

2
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
View File

@ -46,7 +46,7 @@ class LedgerSalaryItemBaseInfo extends Component {
}; };
handleDeleteEmplist = (item) => { handleDeleteEmplist = (item) => {
const { dataSource, onChangeSortableList } = this.props; const { dataSource, onChangeSortableList } = this.props;
onChangeSortableList(_.xorWith(dataSource, [item], _.isEqual)); onChangeSortableList(_.filter(dataSource, o => o.id !== item.id));
}; };
render() { render() {

1
pc4mobx/hrmSalary/pages/salaryItem/index.less
View File

@ -200,6 +200,7 @@
border: 1px solid #e5e5e5 !important; border: 1px solid #e5e5e5 !important;
padding: 4px 8px !important; padding: 4px 8px !important;
min-height: 70px !important; min-height: 70px !important;
word-wrap: break-word;
} }
} }
} }