qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotfix/2.14.2.2406.02

This commit is contained in:
黎永顺 2024-06-19 11:43:08 +08:00
parent 823788e531
commit c39515d7f9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
View File

@ -8,6 +8,7 @@ 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;
@ -21,7 +22,8 @@ class LedgerSalaryItemEditSlide extends Component {
handleChange = (params) => {
const request = { ...this.props.request, ...params };
const key = Object.keys(params)[0];
this.props.onUpdateRequest(request, key);
const { defaultValue, pattern, ...extra } = request;
this.props.onUpdateRequest({ ...extra, pattern, defaultValue: toDecimal_n(defaultValue, parseInt(pattern)) }, key);
};
handleShowFormal = (salaryItemName) => this.props.onEditFormnul(salaryItemName);

5
pc4mobx/hrmSalary/pages/salaryItem/index.js
View File

@ -2,7 +2,7 @@ import React from "react";
import { inject, observer } from "mobx-react";
import { Button, Dropdown, Menu, message, Modal, Switch } from "antd";
import { WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTop } from "ecCom";
import { renderLoading } from "../../util";
import { renderLoading, toDecimal_n } from "../../util";
import CustomTab from "../../components/customTab";
import SystemSalaryItemModal from "./systemSalaryItemModal";
import { columns } from "./columns";
@ -358,7 +358,8 @@ export default class SalaryItem extends React.Component {
const handleSaveSlideChange = (value) => {
const { salaryItemStore: { setRequest } } = this.props;
setRequest(value);
const { defaultValue, pattern, ...extra } = value;
setRequest({ ...extra, pattern, defaultValue: toDecimal_n(defaultValue, parseInt(pattern)) });
};
const rowSelection = {
selectedRowKeys,