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

Merge branch 'feature/v2-社保福利档案退差-1124' into develop

This commit is contained in:
黎永顺 2022-11-25 09:51:28 +08:00
parent 75dbe7c096 f86d5a34e0
commit 760437734f
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
View File

@ -5,7 +5,7 @@
* Date: 2022/11/23
*/
import React, { Component } from "react";
import { WeaInput, WeaSearchGroup, WeaSlideModal, WeaTable } from "ecCom";
import { WeaInputNumber, WeaSearchGroup, WeaSlideModal, WeaTable } from "ecCom";
import { message } from "antd";
import * as API from "../../../../apis/standingBook";
import SlideModalTitle from "../../../../components/slideModalTitle";
@ -27,7 +27,8 @@ class RegEditDetial extends Component {
...item,
render: (text, record) => {
return (
<WeaInput
<WeaInputNumber
precision={3}
value={Number(text)}
onChange={v => this.handleChange("social", item.dataIndex, v, record)}
/>
@ -48,7 +49,8 @@ class RegEditDetial extends Component {
...item,
render: (text, record) => {
return (
<WeaInput
<WeaInputNumber
precision={3}
value={Number(text)}
onChange={v => this.handleChange("fund", item.dataIndex, v, record)}
/>
@ -69,7 +71,8 @@ class RegEditDetial extends Component {
...item,
render: (text, record) => {
return (
<WeaInput
<WeaInputNumber
precision={3}
value={Number(text)}
onChange={v => this.handleChange("other", item.dataIndex, v, record)}
/>
@ -104,16 +107,16 @@ class RegEditDetial extends Component {
otherComJson: {}
};
_.forEach(socialData.dataSource, item => {
payload["socialPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
payload["socialComJson"][item["insuranceId"]] = item.companyPaymentAmount;
payload["socialPerJson"][item["insuranceId"]] = item.personalPaymentAmount || "0";
payload["socialComJson"][item["insuranceId"]] = item.companyPaymentAmount || "0";
});
_.forEach(foundData.dataSource, item => {
payload["fundPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
payload["fundComJson"][item["insuranceId"]] = item.companyPaymentAmount;
payload["fundPerJson"][item["insuranceId"]] = item.personalPaymentAmount || "0";
payload["fundComJson"][item["insuranceId"]] = item.companyPaymentAmount || "0";
});
_.forEach(otherData.dataSource, item => {
payload["otherPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
payload["otherComJson"][item["insuranceId"]] = item.companyPaymentAmount;
payload["otherPerJson"][item["insuranceId"]] = item.personalPaymentAmount || "0";
payload["otherComJson"][item["insuranceId"]] = item.companyPaymentAmount || "0";
});
_.forEach(Object.keys(payload), item => {
payload[item] = JSON.stringify(payload[item]);
@ -136,7 +139,7 @@ class RegEditDetial extends Component {
case "social":
const sociallist = _.map(socialData.dataSource, item => {
if (item.insuranceId === record.insuranceId) {
return { ...item, [dataIndex]: value };
return { ...item, [dataIndex]: String(value) };
}
return { ...item };
});
@ -147,7 +150,7 @@ class RegEditDetial extends Component {
case "fund":
const fundlist = _.map(foundData.dataSource, item => {
if (item.insuranceId === record.insuranceId) {
return { ...item, [dataIndex]: value };
return { ...item, [dataIndex]: String(value) };
}
return { ...item };
});
@ -158,7 +161,7 @@ class RegEditDetial extends Component {
case "other":
const otherlist = _.map(otherData.dataSource, item => {
if (item.insuranceId === record.insuranceId) {
return { ...item, [dataIndex]: value };
return { ...item, [dataIndex]: String(value) };
}
return { ...item };
});

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
View File

@ -41,11 +41,13 @@ class RegList extends Component {
recessionList = (userName = "") => {
const { loading, pageInfo } = this.state;
const billMonth = getQueryString("billMonth");
const paymentOrganization = getQueryString("paymentOrganization");
const creator = Number(getQueryString("creator"));
const paymentStatus = getQueryString("paymentOrganization");
const paymentStatus = '3';
const payload = {
billMonth, paymentStatus,
creator, userName,
paymentOrganization,
...pageInfo
};
this.setState({ loading: { ...loading, query: true } });