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

Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01

This commit is contained in:
黎永顺 2023-09-14 10:38:10 +08:00
parent a583087f5f 2b282b4211
commit 02be280127
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,7 @@ class LedgerAssociatedPersonnel extends Component {
<PersonalScopeModal
{...personalAddModal}
APISaveFox={APISaveFox}
isTaxgent={false}
// isTaxgent={false}
saveKeyVal={{ key: "salarySobId", value: editId || saveSalarySobId }}
onSuccess={() => this.personalScopeTableRef.getPersonalScopeList()}
onCancel={() =>

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
View File

@ -235,7 +235,7 @@ export default class NormalIndex extends Component {
};
getNormalList = async (payload = {}) => {
const { getNormalList } = this.props.standingBookStore;
getNormalList({ ...payload }).then(({ list, columns = [], total }) => {
getNormalList({ ...payload, pageSize: this.state.pageSize }).then(({ list, columns = [], total }) => {
this.setState({
tableData: { list, total, columns }
}, () => this.postMessageToChild());
@ -244,7 +244,7 @@ export default class NormalIndex extends Component {
getSupplementaryList = async (payload = {}) => {
const { getSupplementaryList } = this.props.standingBookStore;
getSupplementaryList({
...payload
...payload, pageSize: this.state.pageSize
}).then(({ list, columns = [], total }) => {
this.setState({
tableData: { list, columns, total }