From 9479a4ba9a2c3550036a33eb4772402bb0da23ed 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, 13 Aug 2024 14:33:10 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../importDialog/components/impStep3.js          | 16 ++++++++++------
 .../hrmSalary/pages/appConfig/moveInDialog.js    | 11 +++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
index 3ea07724..888cc763 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
@@ -19,12 +19,16 @@ class ImpStep3 extends Component {
           !_.isEmpty(importResult) ?
             <div className="weapp-batch-impsteps-picker-spinText">
               <p><img src={successImg} alt=""/></p>
-              <p>
-                <span>{getLabel(389249, "已导入")}</span>
-                <span style={{ color: "green" }}> {importResult.successCount}</span>&nbsp;&nbsp;
-                <span>{`${getLabel(30690, "条数据")},${getLabel(25009, "失败")}`}</span>
-                <span style={{ color: "red" }}> {importResult.errorCount}&nbsp;&nbsp;</span>{getLabel(30690, "条数据")}
-              </p>
+              {
+                importResult.successCount &&
+                <p>
+                  <span>{getLabel(389249, "已导入")}</span>
+                  <span style={{ color: "green" }}> {importResult.successCount}</span>&nbsp;&nbsp;
+                  <span>{`${getLabel(30690, "条数据")},${getLabel(25009, "失败")}`}</span>
+                  <span
+                    style={{ color: "red" }}> {importResult.errorCount}&nbsp;&nbsp;</span>{getLabel(30690, "条数据")}
+                </p>
+              }
             </div> :
             <div className="weapp-batch-impsteps-picker-spinText">
               <p>{getLabel(111, "导入失败")}</p>
diff --git a/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js b/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js
index 7fcc32cc..7707cc6c 100644
--- a/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js
+++ b/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js
@@ -26,6 +26,17 @@ class MoveInDialog extends Component {
     };
   }
 
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+      this.setState({
+        importDialog: {
+          ...this.state.importDialog,
+          importResult: {}, imageId: "",
+          customDragger: { showOperateDesc: false, accept: ".xml" }
+        }
+      });
+    }
+  }
 
   handleImport = (payload) => {
     const { importDialog } = this.state = this.props;