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 (
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 (
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 {
{getSearchs(ECSearchForm, searchConditions, 2, false)} - -
- -
-
- {/**/} -
+ { + this.props.calcType === "calc" && + +
+ +
+
+ {/**/} +
+
+ }
@@ -203,4 +207,4 @@ const CustomFormFields = (props) => { ; -}; +}; \ 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 {
; break; case "calc": - dom = this.calc = dom}/>; + dom = + this.calc = dom}/>; break; case "approval": - dom = this.approval = dom}/>; + dom = this.approval = dom}/>; break; case "deptSummary": dom = ; break; case "diffence": - dom = this.diffence = dom}/>; + dom = this.diffence = dom}/>; break; default: break;