From 36f763a133eda7172e9d617c817498971f5d4be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 11 Jan 2024 14:23:14 +0800
Subject: [PATCH] hotfix/2.9.10.2312.02

---
 pc4mobx/hrmSalary/pages/ruleConfig/index.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
index 893afa11..a707a040 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@@ -40,6 +40,7 @@ export default class Index extends Component {
         extEmpsWitch: "0",
         salaryAcctFixedColumns: 0,
         welBaseDiffByPerAndCom: "0",
+        welBaseAutoAdjust: "0"
       },
       showEncryptOperationButton: "",
       progressVisible: false,
@@ -68,7 +69,7 @@ export default class Index extends Component {
         taxDeclarationFunction: operateTaxDeclaration = "1", salaryArchiveDelete: confValue,
         salaryAcctEmployeeRule: matchRule, WITHDRAW_TAX_DECLARATION: withDrawTaxDeclaration = "0",
         OPEN_APPLICATION_ENCRYPT: enctry = "1", extEmpsWitch = "0", salaryAcctFixedColumns = "0",
-        welBaseDiffByPerAndCom = "0",
+        welBaseDiffByPerAndCom = "0", welBaseAutoAdjust = "0"
       }
     } = sysInfo;
     // const { data: { ascOrDesc, orderRule } } = orderRules;
@@ -90,7 +91,7 @@ export default class Index extends Component {
         ...saveParams,
         ascOrDesc, orderRule, rule, enctry, matchRule, confValue, withDrawTaxDeclaration, salaryAcctFixedColumns,
         extEmpsWitch, operateTaxDeclaration: (operateTaxDeclaration && operateTaxDeclaration !== "0") ? "1" : "0",
-        welBaseDiffByPerAndCom
+        welBaseDiffByPerAndCom, welBaseAutoAdjust
       }
     });
   }
@@ -311,8 +312,11 @@ export default class Index extends Component {
               });
               break;
             case "welBaseDiffByPerAndCom":
+            case "welBaseAutoAdjust":
               this.saveSysOperate({
-                title: getLabel(111, "福利档案基数区分个人和公司"),
+                title: key === "welBaseDiffByPerAndCom" ?
+                  getLabel(111, "福利档案基数区分个人和公司") :
+                  getLabel(111, "福利档案导入基数不符合要求时自动调整为上限/下限"),
                 module: "basic", confKey: key,
                 confValue: val
               });
@@ -353,7 +357,8 @@ export default class Index extends Component {
       withDrawTaxDeclaration,
       extEmpsWitch,
       salaryAcctFixedColumns,
-      welBaseDiffByPerAndCom
+      welBaseDiffByPerAndCom,
+      welBaseAutoAdjust
     } = saveParams;
     return (
       <div className="ruleWrapper">
@@ -414,6 +419,11 @@ export default class Index extends Component {
               <WeaCheckbox display="switch" value={welBaseDiffByPerAndCom}
                            onChange={val => this.handleChange("welBaseDiffByPerAndCom", val)}/>
             </WeaFormItem>
+            <WeaFormItem label={getLabel(111, "导入基数自动调整上/下限")} labelCol={{ span: 8 }}
+                         wrapperCol={{ span: 16 }}>
+              <WeaCheckbox display="switch" value={welBaseAutoAdjust}
+                           onChange={val => this.handleChange("welBaseAutoAdjust", val)}/>
+            </WeaFormItem>
           </WeaSearchGroup>
           <WeaSearchGroup title={getLabel(111, "薪资核算人员匹配规则")} showGroup center>
             <WeaFormItem label={getLabel(111, "匹配规则")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>