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

custom/五院杭州中心

This commit is contained in:
lys 2025-10-23 13:25:28 +08:00
parent 2a47ec2cc6
commit 57ec917f3b
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
View File

@ -129,6 +129,7 @@ class Index extends Component {
return (<div className="salary-edit-calc-content">
<div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
<EditCalcAdvanceSearchPannel
calcType={this.props.calcType}
salaryAcctRecordId={salaryAcctRecordId}
onToggleSwitch={this.openAdvanceSearch}
onAdSearch={this.onAdSearch}/>

1
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
View File

@ -105,6 +105,7 @@ class Index extends Component {
return (<div className="salary-edit-calc-content">
<div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
<EditCalcAdvanceSearchPannel
calcType={this.props.calcType}
salaryAcctRecordId={salaryAcctRecordId}
onToggleSwitch={this.openAdvanceSearch}
onAdSearch={this.onAdSearch}/>

6
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
View File

@ -47,7 +47,7 @@ class EditCalcAdvanceSearchPannel extends Component {
]
};
}
return { ...o };
return { ...o, hide: getKey(o) === "consolidatedTaxation" && this.props.calcType !== "calc" };
}),
title: getLabel(32905, "常用条件")
};
@ -143,6 +143,8 @@ class EditCalcAdvanceSearchPannel extends Component {
<React.Fragment>
<div className="wea-advanced-searchsAd">
{getSearchs(ECSearchForm, searchConditions, 2, false)}
{
this.props.calcType === "calc" && <React.Fragment>
<WeaSearchGroup needTigger showGroup title={getLabel(32843, "其他条件")} items={customSearchConditions}
col={2}/>
<div className="custom-advance-largeSpacing">
@ -152,6 +154,8 @@ class EditCalcAdvanceSearchPannel extends Component {
<div className="searchAdvanced-commonSelect">
{/*<Button type="ghost">{getLabel(111, "保存常用筛选")}</Button>*/}
</div>
</React.Fragment>
}
</div>
<div className="wea-search-buttons">
<div style={{ textAlign: "center" }}>

1
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
View File

@ -79,6 +79,7 @@ class Index extends Component {
</div>
<div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
<EditCalcAdvanceSearchPannel
calcType={this.props.calcType}
salaryAcctRecordId={salaryAcctRecordId}
onToggleSwitch={this.openAdvanceSearch}
onAdSearch={this.onAdSearch}

7
pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
View File

@ -235,16 +235,17 @@ class Index extends Component {
dom = <SalaryCalcPersonConfirm calcDetail={!canEdit} {...this.props}/>;
break;
case "calc":
dom = <SalaryEditCalc {...this.props} calcDetail={!canEdit} ref={dom => this.calc = dom}/>;
dom =
<SalaryEditCalc {...this.props} calcType={selectedKey} calcDetail={!canEdit} ref={dom => this.calc = dom}/>;
break;
case "approval":
dom = <SalaryApproval {...this.props} ref={dom => this.approval = dom}/>;
dom = <SalaryApproval {...this.props} calcType={selectedKey} ref={dom => this.approval = dom}/>;
break;
case "deptSummary":
dom = <SalaryDeptSummary {...this.props}/>;
break;
case "diffence":
dom = <SalaryDiffence {...this.props} ref={dom => this.diffence = dom}/>;
dom = <SalaryDiffence {...this.props} calcType={selectedKey} ref={dom => this.diffence = dom}/>;
break;
default:
break;