From fdf82d883d6247d34bfdd3ee6a02916607526cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 20 Aug 2024 14:10:27 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A5=E5=8F=8A=E5=AD=97=E6=AE=B5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/salaryItem/customSalaryItemSlide.js    | 16 ++++++++++++++++
 pc4mobx/hrmSalary/style/index.less               |  7 +++++++
 2 files changed, 23 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index e3486a31..f615f0e6 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -2,6 +2,7 @@ import React from "react";
 import { inject, observer } from "mobx-react";
 import { WeaFormItem, WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup, WeaSlideModal } from "ecCom";
 import { WeaSwitch } from "comsMobx";
+import { salaryItemConditions } from "./columns";
 // import FormalFormModal from "./formalFormModal";
 // import SalaryItemForm from "./salaryItemForm";
 
@@ -51,6 +52,21 @@ export default class CustomSalaryItemSlide extends React.Component {
       originSqlContent: data.referenceType === "sql" ? data.formula : ""
     });
   };
+  initForm = (props) => {
+    this.setState({
+      conditions: _.map(salaryItemConditions, c => {
+        return {
+          ...c, items: _.map(c.items, fields => {
+            return {
+              ...fields, label: getLabel(fields.lanId, fields.label)
+            };
+          })
+        };
+      })
+    }, () => {
+      props.salaryItemStore.itemsForm.initFormFields(this.state.conditions);
+    });
+  };
   renderForm = (form) => {
     const { conditions } = this.state, { isFormInit } = form, formParams = form.getFormParams();
     let group = [];
diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index 8e65be90..5f2c76d6 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -117,3 +117,10 @@
 
 }
 
+//公共slide框标题样式
+.zIndex0-weaslide-title {
+  .wea-new-top-req {
+    z-index: 0 !important;
+  }
+}
+