diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js index 83ddde51..a9c3ba0e 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js @@ -13,6 +13,7 @@ import SlideModalTitle from "../../../components/slideModalTitle"; import SalaryItemForm from "../../salaryItem/salaryItemForm"; import { sxwzApprovalConditions } from "../config"; import "./index.less"; +import { getConditionDomkeys } from "../../../util"; const getLabel = WeaLocaleProvider.getLabel; @@ -36,7 +37,13 @@ class LedgerSalaryItemEditSlide extends Component { items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) })) }; }) - }, () => sxwzForm.initFormFields(this.state.conditions)); + }, () => { + const { request } = nextProps; + sxwzForm.initFormFields(this.state.conditions); + _.forEach(getConditionDomkeys(this.state.conditions), g => { + sxwzForm.updateFields({ [g]: request[g] || "" }); + }); + }); } } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 123b74ab..423a7fe7 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -5,6 +5,7 @@ * Date: 2022/12/13 */ import React, { Component } from "react"; +import { inject, observer } from "mobx-react"; import { WeaCheckbox, WeaHelpfulTip, WeaLocaleProvider, WeaTable } from "ecCom"; import LedgerSalaryItemEditSlide from "./ledgerSalaryItemEditSlide"; import { getSalaryItemForm } from "../../../apis/ledger"; @@ -13,6 +14,8 @@ import FormalFormModal from "../../salaryItem/formalFormModal"; const getLabel = WeaLocaleProvider.getLabel; +@inject("ledgerStore") +@observer class LedgerSalaryItemTable extends Component { constructor(props) { super(props); @@ -144,6 +147,7 @@ class LedgerSalaryItemTable extends Component { * Date: 2023/7/19 */ handleSaveItem = () => { + const { ledgerStore: { sxwzForm } } = this.props; const { salaryItemPayload } = this.state; const { request, record } = salaryItemPayload; this.setState({ @@ -155,6 +159,7 @@ class LedgerSalaryItemTable extends Component { originFormulaContent, originSqlContent, formulaId } = request; this.handleChangeSalaryItem({ + ...sxwzForm.getFormParams(), itemHide: hideDefault.toString(), roundingMode, pattern, valueType, formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent,