Merge branch 'hotfix/v2-1124' into develop
This commit is contained in:
commit
7b083101c2
|
|
@ -170,8 +170,9 @@ export default class CalculateDetail extends React.Component {
|
|||
type: "PR",
|
||||
listType: "",
|
||||
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
|
||||
selectedRowKeys: [],
|
||||
queryParams: {
|
||||
salaryAcctRecordId
|
||||
salaryAcctRecordId,
|
||||
}
|
||||
};
|
||||
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
|
||||
|
|
@ -265,11 +266,6 @@ export default class CalculateDetail extends React.Component {
|
|||
btnOnClick={this.handleAccount}
|
||||
menuOnClick={(key) => this.handleAccount(key)}
|
||||
/>,
|
||||
// <Button
|
||||
// type="primary"
|
||||
// onClick={() => this.handleAccount()}>
|
||||
// 核算
|
||||
// </Button>,
|
||||
<Dropdown.Button overlay={menu}>
|
||||
更多
|
||||
</Dropdown.Button>
|
||||
|
|
|
|||
Loading…
Reference in New Issue