diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index 91cf2263..749c7be0 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -52,6 +52,8 @@ export default class SalaryDetail extends React.Component { if (type === "PR") { if (id === "EDIT") { this.handleEdit(record); + } else if (id === "COSTCENTER") { + window.open(record ? record.url : "", "_blank"); } else if (id === "COLUMNINDEX") { if (!extraId) { this.setState({ columnIndex: record }); diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js index c6b0938a..e74a8d8a 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js @@ -4,7 +4,6 @@ import { WeaBrowser, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSearchGroup, WeaSe import { inject, observer } from "mobx-react"; import "./index.less"; import { getQueryString } from "../../util/url"; -import { calcPageNo } from "../../util"; @inject("calculateStore", "salaryFileStore") @observer @@ -87,8 +86,8 @@ export default class UserSure extends React.Component { this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } })}/> @@ -122,6 +121,8 @@ export default class UserSure extends React.Component { childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); //window.postMessage } else if (id === "DELETE") { this.handleDeleteItem(record); + } else if (id === "COSTCENTER") { + window.open(record.url, "_blank"); } else if (id === "BATCHDELETE") { this.onSelectChange(record); } else if (id === "PAGEINFO") { @@ -144,7 +145,7 @@ export default class UserSure extends React.Component { const payload = { type: "PC", listType: "MA", - url: this.state.selectedKey === '1'?"/api/bs/hrmsalary/salaryacct/reducedemployee/list":"/api/bs/hrmsalary/salaryacct/addedemployee/list", + url: this.state.selectedKey === "1" ? "/api/bs/hrmsalary/salaryacct/reducedemployee/list" : "/api/bs/hrmsalary/salaryacct/addedemployee/list", queryParams: { salaryAcctRecordId, employeeName: this.state.userListSearchValue, @@ -223,7 +224,7 @@ export default class UserSure extends React.Component { salaryAcctRecordId, employeeName: this.state.userListSearchValue, ...this.pageInfo, - current: 1, + current: 1 } }; childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); @@ -253,7 +254,7 @@ export default class UserSure extends React.Component { queryParams: { salaryAcctRecordId, employeeName: this.state.userListSearchValue, - ...this.pageInfo, + ...this.pageInfo } }; childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); @@ -570,6 +571,7 @@ export default class UserSure extends React.Component {