From 61f2b764406121d4e8d251e6ebb75f8b12cff28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 13 Dec 2023 11:12:18 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.10.2312.02-=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=9F=BA=E6=95=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/archive.js           |  5 +++++
 pc4mobx/hrmSalary/pages/ruleConfig/index.js | 25 +++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/archive.js b/pc4mobx/hrmSalary/apis/archive.js
index a8a0516b..6faaad01 100644
--- a/pc4mobx/hrmSalary/apis/archive.js
+++ b/pc4mobx/hrmSalary/apis/archive.js
@@ -1,9 +1,14 @@
 import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
 
 //薪资档案-薪资档案列表
 export const getArchiveList = params => {
   return postFetch("/api/bs/hrmsalary/salaryArchive/list", params);
 };
+//薪资档案的高级搜索
+export const getSaCondition = params => {
+  return WeaTools.callApi("/api/bs/hrmsalary/archives/getSearchCondition", "get", params);
+};
 //薪资档案-获取薪资档案详情表单
 export const getArchiveForm = params => {
   return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getForm", "get", params);
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
index 6a2bf87a..893afa11 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@@ -38,7 +38,8 @@ export default class Index extends Component {
         confValue: "0",
         withDrawTaxDeclaration: "0",
         extEmpsWitch: "0",
-        salaryAcctFixedColumns: 0
+        salaryAcctFixedColumns: 0,
+        welBaseDiffByPerAndCom: "0",
       },
       showEncryptOperationButton: "",
       progressVisible: false,
@@ -66,7 +67,8 @@ export default class Index extends Component {
         ascOrDesc = "", orderRule = "", showEncryptOperationButton, matchEmployeeMode: rule = "",
         taxDeclarationFunction: operateTaxDeclaration = "1", salaryArchiveDelete: confValue,
         salaryAcctEmployeeRule: matchRule, WITHDRAW_TAX_DECLARATION: withDrawTaxDeclaration = "0",
-        OPEN_APPLICATION_ENCRYPT: enctry = "1", extEmpsWitch = "0", salaryAcctFixedColumns = "0"
+        OPEN_APPLICATION_ENCRYPT: enctry = "1", extEmpsWitch = "0", salaryAcctFixedColumns = "0",
+        welBaseDiffByPerAndCom = "0",
       }
     } = sysInfo;
     // const { data: { ascOrDesc, orderRule } } = orderRules;
@@ -87,7 +89,8 @@ export default class Index extends Component {
       saveParams: {
         ...saveParams,
         ascOrDesc, orderRule, rule, enctry, matchRule, confValue, withDrawTaxDeclaration, salaryAcctFixedColumns,
-        extEmpsWitch, operateTaxDeclaration: (operateTaxDeclaration && operateTaxDeclaration !== "0") ? "1" : "0"
+        extEmpsWitch, operateTaxDeclaration: (operateTaxDeclaration && operateTaxDeclaration !== "0") ? "1" : "0",
+        welBaseDiffByPerAndCom
       }
     });
   }
@@ -307,6 +310,13 @@ export default class Index extends Component {
                 confValue: !_.isNil(val) ? val.toString() : "0"
               });
               break;
+            case "welBaseDiffByPerAndCom":
+              this.saveSysOperate({
+                title: getLabel(111, "福利档案基数区分个人和公司"),
+                module: "basic", confKey: key,
+                confValue: val
+              });
+              break;
             default:
               break;
           }
@@ -342,7 +352,8 @@ export default class Index extends Component {
       confValue,
       withDrawTaxDeclaration,
       extEmpsWitch,
-      salaryAcctFixedColumns
+      salaryAcctFixedColumns,
+      welBaseDiffByPerAndCom
     } = saveParams;
     return (
       <div className="ruleWrapper">
@@ -398,6 +409,12 @@ export default class Index extends Component {
                            onChange={val => this.handleChange("confValue", val)}/>
             </WeaFormItem>
           </WeaSearchGroup>
+          <WeaSearchGroup title={getLabel(111, "福利档案基数")} showGroup center>
+            <WeaFormItem label={getLabel(111, "区分个人和公司")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+              <WeaCheckbox display="switch" value={welBaseDiffByPerAndCom}
+                           onChange={val => this.handleChange("welBaseDiffByPerAndCom", val)}/>
+            </WeaFormItem>
+          </WeaSearchGroup>
           <WeaSearchGroup title={getLabel(111, "薪资核算人员匹配规则")} showGroup center>
             <WeaFormItem label={getLabel(111, "匹配规则")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
               <WeaSelect options={matchRuleOptions} value={matchRule}