diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js index 288f6303..d476edbd 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js @@ -8,7 +8,6 @@ import React, { Component } from "react"; import { WeaLocaleProvider, WeaSlideModal } from "ecCom"; import SlideModalTitle from "../../../components/slideModalTitle"; import SalaryItemForm from "../../salaryItem/salaryItemForm"; -import { toDecimal_n } from "../../../util"; import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -22,8 +21,7 @@ class LedgerSalaryItemEditSlide extends Component { handleChange = (params) => { const request = { ...this.props.request, ...params }; const key = Object.keys(params)[0]; - const { defaultValue, pattern, ...extra } = request; - this.props.onUpdateRequest({ ...extra, pattern, defaultValue: toDecimal_n(defaultValue, parseInt(pattern)) }, key); + this.props.onUpdateRequest(request, key); }; handleShowFormal = (salaryItemName) => this.props.onEditFormnul(salaryItemName); diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index def95fcd..16db4771 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -10,6 +10,7 @@ import LedgerSalaryItemEditSlide from "./ledgerSalaryItemEditSlide"; import { getSalaryItemForm } from "../../../apis/ledger"; import { commonEnumList } from "../../../apis/ruleconfig"; import FormalFormModal from "../../salaryItem/formalFormModal"; +import { toDecimal_n } from "../../../util"; const getLabel = WeaLocaleProvider.getLabel; @@ -155,7 +156,7 @@ class LedgerSalaryItemTable extends Component { originFormulaContent, originSqlContent, formulaId } = request; this.handleChangeSalaryItem({ - itemHide: hideDefault.toString(), defaultValue, + itemHide: hideDefault.toString(), defaultValue: toDecimal_n(defaultValue, parseInt(pattern)), roundingMode, pattern, valueType, formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent, formulaId: ((valueType.toString() === "3" && (!originSqlContent || originSqlContent === " ")) || (valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || valueType.toString() === "1") ? "" : formulaId, diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index d96ae163..7f55028d 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -314,16 +314,18 @@ export default class SalaryItem extends React.Component { }); return; } - saveItem(payload, continueFlag).then(() => { - getTableDatas({ ...this.state.searchParams }).then(res => { - this.setState({ - searchParams: { - ...this.state.searchParams, - total: res.total - } + const { pattern, defaultValue, ...extra } = payload; + saveItem({ ...extra, pattern, defaultValue: toDecimal_n(defaultValue, parseInt(pattern)) }, continueFlag) + .then(() => { + getTableDatas({ ...this.state.searchParams }).then(res => { + this.setState({ + searchParams: { + ...this.state.searchParams, + total: res.total + } + }); }); }); - }); }; const renderCustomOperate = () => { @@ -358,8 +360,7 @@ export default class SalaryItem extends React.Component { const handleSaveSlideChange = (value) => { const { salaryItemStore: { setRequest } } = this.props; - const { defaultValue, pattern, ...extra } = value; - setRequest({ ...extra, pattern, defaultValue: toDecimal_n(defaultValue, parseInt(pattern)) }); + setRequest(value); }; const rowSelection = { selectedRowKeys,