From d09230b2ca7fc125d8799f33c7897685c25e7347 Mon Sep 17 00:00:00 2001
From: 18652063575 <liyongshun321>
Date: Wed, 2 Nov 2022 09:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/dataAcquisition/addItems.js         |  2 +-
 .../dataAcquisition/cumSituation/columns.js   | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
index 751934a9..836fb1a8 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js
@@ -44,7 +44,7 @@ class AddItems extends Component {
       })
       fields.map(item => {
         nextProps.form.updateFields({
-          [item]: nextProps.editId[item]
+          [item]: nextProps.editId[item] || ''
         })
       })
     }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
index ce99e24c..0f825cfd 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
@@ -231,6 +231,60 @@ export const dataCollectCondition = [
         value: "",
         viewAttr: 2
       },
+      {
+        conditionType: "INPUT",
+        domkey: ["addUpChildEducation"],
+        fieldcol: 14,
+        label: "累计子女教育",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["addUpContinuingEducation"],
+        fieldcol: 14,
+        label: "累计继续教育",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["addUpHousingLoanInterest"],
+        fieldcol: 14,
+        label: "累计住房贷款利息",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["addUpHousingRent"],
+        fieldcol: 14,
+        label: "累计住房租金",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["addUpSupportElderly"],
+        fieldcol: 14,
+        label: "累计赡养老人",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["addUpIllnessMedical"],
+        fieldcol: 14,
+        label: "累计大病医疗",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
       {
         conditionType: "INPUT",
         domkey: ["addUpEnterpriseAndOther"],
@@ -284,6 +338,15 @@ export const dataCollectCondition = [
         labelcol: 8,
         value: "",
         viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["addUpInfantCare"],
+        fieldcol: 14,
+        label: "累计婴幼儿照护",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
       }
     ],
     title: "数据采集",