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; + } +} +