From c0b517201fce3ca86d8a47b0bb2d5c0b83982cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 20 Aug 2024 10:07:29 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/welfarePlanEditSlide/baseValidateDialog.js    | 4 +++-
 .../welfarePlan/components/welfarePlanEditSlide/index.js     | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js
index 51ec9e1b..631ef2ee 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js
@@ -23,7 +23,9 @@ class BaseValidateDialog extends Component {
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) {
       this.setState({
-        dataSource: _.map(nextProps.baseChangeInfo.split("\n"), (g, gi) => ({ id: gi + 1, name: g }))
+        dataSource: _.filter(_.map(nextProps.baseChangeInfo.split("\n"), (g, gi) => ({
+          id: gi + 1, name: g
+        })), k => !!k.name)
       });
     }
     if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
index 3f2c44f3..da42ac66 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
@@ -115,6 +115,11 @@ class Index extends Component {
                 message.success(getLabel(30700, "操作成功！"));
                 setHasBeenModify(false);
                 this.props.onClose(true);
+                this.setState({
+                  baseValidateDialog: {
+                    ...baseValidateDialog, baseChangeInfo: [], validatePayload: { validate: true, changeData: false }
+                  }
+                });
               }
             } else {
               message.error(errormsg);