From 8dcf736db6f1f2cec59a2b83640ad299608dede8 Mon Sep 17 00:00:00 2001
From: liyongshun <971387674@qq.com>
Date: Thu, 9 Jun 2022 18:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E7=9A=84?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/importModal/modalStep1.js      | 20 +++++++++++++------
 .../components/slideModalTitle/index.js       |  7 ++++++-
 pc4mobx/hrmSalary/pages/ledger/index.js       |  4 ++--
 .../pages/taxAgent/editConditions.js          |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/importModal/modalStep1.js b/pc4mobx/hrmSalary/components/importModal/modalStep1.js
index 47652105..c00fd1cd 100644
--- a/pc4mobx/hrmSalary/components/importModal/modalStep1.js
+++ b/pc4mobx/hrmSalary/components/importModal/modalStep1.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { WeaSteps, WeaDatePicker, WeaInput, WeaSelect, message } from 'ecCom';
+import { WeaSteps, WeaDatePicker, WeaInput, WeaSelect, message, WeaCheckbox  } from 'ecCom';
 import { inject, observer } from 'mobx-react';
 import { Upload, Icon, Row, Col, Button } from "antd";
 import uploadImg from './upload.svg'
@@ -13,7 +13,8 @@ export default class ModalStep1 extends React.Component {
         super(props)
         this.state = {
             datetime: "",
-            taxAgentId: ""
+            taxAgentId: "",
+            hasData: "0"
         }
     }
 
@@ -23,7 +24,7 @@ export default class ModalStep1 extends React.Component {
     }
 
     render() {
-        const { datetime, taxAgentId } = this.state
+        const { datetime, taxAgentId, hasData } = this.state
         const { taxAgentStore: {taxAgentOption} } = this.props;
         const dragger = {
             name: 'file',
@@ -80,15 +81,22 @@ export default class ModalStep1 extends React.Component {
                         </div>
 
                         <div style={{ lineHeight: "30px" }}>
-                            <p>1. 第一步，请选择导出的Excel文件或 
+                            <p>1. 第一步，请选择导出的Excel文件或
                                 {
                                     (typeof this.props.templateLink) == "string" ? 
-                                    <a href={this.props.templateLink}>点击这里下载模板</a>
+                                    <a href={`${this.props.templateLink}&hasData=${hasData === '1' ? true : false}`}>点击这里下载模板</a>
                                     :
                                     <a onClick={() => {this.props.templateLink()}}>点击这里下载模板</a>
                                 }
                                 
-                                {this.props.headerSetCompoent && this.props.headerSetCompoent }
+                                {this.props.headerSetCompoent && this.props.headerSetCompoent };
+                                <WeaCheckbox 
+                                  value={hasData}
+                                  content="导出现有数据" 
+                                  helpfulTip="提示：建议先导出现有最新数据，修改后再导入" 
+                                  style={{ marginLeft: 10 }} 
+                                  onChange={(hasData)=> this.setState({hasData})}
+                                />
                             </p>
                             <p>2. 第二步，请一定要确定Excel文档中的格式是模板中的格式，没有被修改掉；</p>
                             <p>3. 第三步，选择填写好的Excel文档，点击“下一步”按钮进行数据预览；</p>
diff --git a/pc4mobx/hrmSalary/components/slideModalTitle/index.js b/pc4mobx/hrmSalary/components/slideModalTitle/index.js
index 056df410..946b61ec 100644
--- a/pc4mobx/hrmSalary/components/slideModalTitle/index.js
+++ b/pc4mobx/hrmSalary/components/slideModalTitle/index.js
@@ -5,8 +5,13 @@ import "./index.less"
 export default class SlideModalTitle extends React.Component {
   componentWillMount() { // 初始化渲染页面
     this.state = {
-      editable: this.props.editable === undefined ? "true": this.props.editable
+      editable: ""
     }
+  }
+  componentWillReceiveProps(nextProps){
+    this.setState({
+      editable: nextProps.editable
+    })
   }
     render() {
         return <div className="slideTitleWrapper">
diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js
index c8684100..166773a2 100644
--- a/pc4mobx/hrmSalary/pages/ledger/index.js
+++ b/pc4mobx/hrmSalary/pages/ledger/index.js
@@ -231,7 +231,7 @@ export default class Ledger extends React.Component {
       setShowSearchAd,
       baseInfoRequest,
     } = ledgerStore;
-    const { canEdit = "true" } = baseInfoRequest;
+    const { canEdit } = baseInfoRequest;
     const { currentStep, selectedTab } = this.state;
     if (!hasRight && !loading) {
       // 无权限处理
@@ -570,7 +570,7 @@ export default class Ledger extends React.Component {
                 measure={"%"}
                 title={
                   <SlideModalTitle
-                    subtitle={"编辑账套"}
+                    subtitle={`编辑账套${canEdit}`}
                     tabs={[
                       { title: "基础设置", key: 0 },
                       { title: "关联人员", key: 1 },
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js b/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
index f9afbe87..150d2908 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
@@ -2,7 +2,7 @@
  * Author: 黎永顺
  * Description: 表单渲染condition
  * Date: 2022-05-30 22:39:03
- * LastEditTime: 2022-05-31 20:34:07
+ * LastEditTime: 2022-06-09 14:00:30
  */
 export const editConditions = [
   {