From 6a56cee09086b5ddbc34b9e2c611cf212245ae85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 19 Aug 2024 10:42:54 +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

---
 .../components/importDialog/components/impStep1.js |  1 +
 .../importDialog/components/moveInResult.js        | 14 ++++++++------
 pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
index b2ac42b0..9d52e70f 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
@@ -36,6 +36,7 @@ class ImpStep1 extends Component {
       onChange: this.handleChange,
       ...this.props.customDragger
     };
+    console.log("this.props.customDragger", this.props.customDragger)
     return (
       <div className="weapp-batch-impsteps-picker-content-imp-step1">
         {/* 导入选项 */}
diff --git a/pc4mobx/hrmSalary/components/importDialog/components/moveInResult.js b/pc4mobx/hrmSalary/components/importDialog/components/moveInResult.js
index ab3bc675..6a448ec2 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/moveInResult.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/moveInResult.js
@@ -30,16 +30,18 @@ class MoveInResult extends Component {
         columns={[
           { title: getLabel(111, "导入信息"), dataIndex: "message" },
           {
-            title: getLabel(111, "下载信息"), dataIndex: "download", width: 200,
+            title: getLabel(111, "下载信息"), dataIndex: "download", width: 225,
             render: (text, record) => (<React.Fragment>
-              <span style={{ marginRight: 16, color: "#0BB746", cursor: "pointer" }}
-                    onClick={() => this.downloadTxtfile(record.success.join("\n"), getLabel(111, "成功"))}>
+              <span
+                style={{ marginRight: 16, color: "#0BB746", cursor: "pointer", display: "inline-block", minWidth: 60 }}
+                onClick={() => this.downloadTxtfile(record.success.join("\n"), getLabel(111, "成功"))}>
                 <i className="iconfont icon-successful"/><span
                 style={{ marginLeft: 8 }}>{record.success.length}</span></span>
-              <span style={{ marginRight: 16, color: "#E6960C", cursor: "pointer" }}
-                    onClick={() => this.downloadTxtfile(record.warning.join("\n"), getLabel(111, "警告"))}><i
+              <span
+                style={{ marginRight: 16, color: "#E6960C", cursor: "pointer", display: "inline-block", minWidth: 60 }}
+                onClick={() => this.downloadTxtfile(record.warning.join("\n"), getLabel(111, "警告"))}><i
                 className="iconfont icon-warning"/><span style={{ marginLeft: 8 }}>{record.warning.length}</span></span>
-              <span style={{ color: "#CF3736", cursor: "pointer" }}
+              <span style={{ color: "#CF3736", cursor: "pointer", display: "inline-block", minWidth: 60 }}
                     onClick={() => this.downloadTxtfile(record.error.join("\n"), getLabel(111, "错误"))}><i
                 className="iconfont icon-error"/><span style={{ marginLeft: 8 }}>{record.error.length}</span></span>
             </React.Fragment>)
diff --git a/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js b/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js
index 7707cc6c..afdf3765 100644
--- a/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js
+++ b/pc4mobx/hrmSalary/pages/appConfig/moveInDialog.js
@@ -39,7 +39,7 @@ class MoveInDialog extends Component {
   }
 
   handleImport = (payload) => {
-    const { importDialog } = this.state = this.props;
+    const { importDialog } = this.state;
     this.setState({ importDialog: { ...importDialog, nextloading: true } });
     API.uploadConfig({ ...payload }).then(({ data, status, errormsg }) => {
       this.setState({ importDialog: { ...importDialog, nextloading: false } });