From f86d5a34e056cf278ef35e3f1c6744490d0e1d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 25 Nov 2022 09:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E9=80=80=E5=B7=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/regEditDetial.js               | 29 ++++++++++---------
 .../standingBookDetail/components/regList.js  |  4 ++-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
index 7c37be0f..b30f22ad 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
@@ -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 };
         });
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
index 99486ef8..76bb8a04 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
@@ -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 } });