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

Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01

This commit is contained in:
黎永顺 2023-07-13 09:51:20 +08:00
parent 0650acb1fc 7c908c81db
commit f3fdd91201
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/calculateDetail/index.js
View File

@ -394,7 +394,7 @@ export default class CalculateDetail extends React.Component {
/>
{selectedKey == 0 && <UserSure/>}
{selectedKey == 1 && <SalaryDetail onChangeAccountIds={(ids) => this.setState({ accountIds: ids })}
employeeName={this.state.searchValue}/>}
employeeName={this.state.searchItemsValue}/>}
{acctResultImportVisiable &&
<AcctResultImportModal
visiable={acctResultImportVisiable}

8
pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
View File

@ -94,7 +94,7 @@ export default class SalaryDetail extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.props.employeeName,
...this.props.employeeName,
current, pageSize
}
};
@ -109,7 +109,7 @@ export default class SalaryDetail extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.props.employeeName
...this.props.employeeName
}
};
type && childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@ -158,7 +158,7 @@ export default class SalaryDetail extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.props.employeeName
...this.props.employeeName
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@ -192,7 +192,7 @@ export default class SalaryDetail extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.props.employeeName
...this.props.employeeName
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");

20
pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
View File

@ -120,7 +120,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue
...this.state.searchItemsValue,
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); //window.postMessage
@ -140,7 +140,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue,
...this.state.searchItemsValue,
current,
pageSize
}
@ -153,7 +153,7 @@ export default class UserSure extends React.Component {
url: this.state.selectedKey === "1" ? "/api/bs/hrmsalary/salaryacct/reducedemployee/list" : "/api/bs/hrmsalary/salaryacct/addedemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue,
...this.state.searchItemsValue,
current, pageSize
}
};
@ -180,7 +180,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue,
...this.state.searchItemsValue,
...this.pageInfo
}
};
@ -227,7 +227,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue,
...this.state.searchItemsValue,
...this.pageInfo,
current: 1
}
@ -258,7 +258,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue,
...this.state.searchItemsValue,
...this.pageInfo
}
};
@ -284,7 +284,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue,
...this.state.searchItemsValue,
...this.pageInfo
}
};
@ -430,7 +430,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue
...this.state.searchItemsValue,
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); //window.postMessage
@ -460,7 +460,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/reducedemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue
...this.state.searchItemsValue,
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@ -490,7 +490,7 @@ export default class UserSure extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/addedemployee/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.userListSearchValue
...this.state.searchItemsValue,
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");