From 57ec917f3b4f461e1b70ea97c272699a4e45cf72 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 23 Oct 2025 13:25:28 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E4=BA=94=E9=99=A2=E6=9D=AD=E5=B7=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/salaryApproval/index.js |  1 +
 .../doCalc/components/salaryDiffence/index.js |  1 +
 .../editCalcAdvanceSearchPannel.js            | 26 +++++++++++--------
 .../doCalc/components/salaryEditCalc/index.js |  3 ++-
 .../hrmSalary/pages/calculate/doCalc/index.js |  7 ++---
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
index 59e90481..25c099fd 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
+++ b/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}/>
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
index 0d592969..ace37f9b 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
+++ b/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}/>
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
index 4ddc7908..54230b95 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
+++ b/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}/>
-          <div className="custom-advance-largeSpacing">
-            <Button className="link" icon="plus"
-                    onClick={this.handleAddCustomSearchForm}>{getLabel(111, "添加搜索条件")}</Button>
-          </div>
-          <div className="searchAdvanced-commonSelect">
-            {/*<Button type="ghost">{getLabel(111, "保存常用筛选")}</Button>*/}
-          </div>
+          {
+            this.props.calcType === "calc" && <React.Fragment>
+              <WeaSearchGroup needTigger showGroup title={getLabel(32843, "其他条件")} items={customSearchConditions}
+                              col={2}/>
+              <div className="custom-advance-largeSpacing">
+                <Button className="link" icon="plus"
+                        onClick={this.handleAddCustomSearchForm}>{getLabel(111, "添加搜索条件")}</Button>
+              </div>
+              <div className="searchAdvanced-commonSelect">
+                {/*<Button type="ghost">{getLabel(111, "保存常用筛选")}</Button>*/}
+              </div>
+            </React.Fragment>
+          }
         </div>
         <div className="wea-search-buttons">
           <div style={{ textAlign: "center" }}>
@@ -203,4 +207,4 @@ const CustomFormFields = (props) => {
       </Col>
     </Row>
   </WeaFormItem>;
-};
+};
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index 6bfa4ca9..9e782f3c 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/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}
@@ -92,4 +93,4 @@ class Index extends Component {
   }
 }
 
-export default Index;
+export default Index;
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 39359ff0..ecac6838 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/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;