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

Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税

This commit is contained in:
lys 2024-12-27 09:12:38 +08:00
parent 6e6262e67a 8aa696fee5
commit bafd4e7538
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
View File

@ -41,7 +41,7 @@ class PersonalScopeTable extends Component {
} }
getPersonalScopeList = (tabActive = this.props.tabActive) => { getPersonalScopeList = (tabActive = this.props.tabActive) => {
const { searchValue, searchKeyVal, APIFox } = this.props; const { searchValue, searchKeyVal, APIFox, showOperateBtn } = this.props;
const { pageInfo, loading } = this.state; const { pageInfo, loading } = this.state;
const payload = { const payload = {
[searchKeyVal["key"]]: searchKeyVal["value"], [searchKeyVal["key"]]: searchKeyVal["value"],
@ -60,7 +60,7 @@ class PersonalScopeTable extends Component {
return { return {
...item, ...item,
render: (text, record) => { render: (text, record) => {
if (item.dataIndex === "targetName") { if (item.dataIndex === "targetName" && showOperateBtn) {
return <a href="javascript:void(0);" onClick={() => this.props.onEditScope(record)}>{text}</a>; return <a href="javascript:void(0);" onClick={() => this.props.onEditScope(record)}>{text}</a>;
} }
return <span className="tdEllipsis" title={text}>{text}</span>; return <span className="tdEllipsis" title={text}>{text}</span>;

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

@ -289,6 +289,7 @@ class LedgerAssociatedPersonnel extends Component {
APIFox={APIFox} APIFox={APIFox}
tabActive={selectedKey} tabActive={selectedKey}
searchValue={searchValue} searchValue={searchValue}
showOperateBtn={showOperateBtn}
onChangeSelectKey={rowKeys => this.setState({ rowKeys })} onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
onEditScope={this.handleAddPersonal} onEditScope={this.handleAddPersonal}
/> />