custom/五院杭州中心

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js

@@ -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}/>

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js

@@ -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}/>

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js

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

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js

@@ -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}

pc4mobx/hrmSalary/pages/calculate/doCalc/index.js

@@ -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;