From 3413f8fc0bfff24b7c1fe2e2c531286214b55a57 Mon Sep 17 00:00:00 2001
From: liyongshun <971387674@qq.com>
Date: Tue, 14 Jun 2022 11:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/components/importModal/index.js   |  3 ++-
 .../components/importModal/modalStep1.js        | 17 ++++++++++-------
 .../attendance/editSlideContent.js              |  2 +-
 .../pages/dataAcquisition/attendance/index.js   |  2 +-
 pc4mobx/hrmSalary/pages/salaryFile/index.js     |  6 ++++--
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/importModal/index.js b/pc4mobx/hrmSalary/components/importModal/index.js
index e72c2608..5815c3de 100644
--- a/pc4mobx/hrmSalary/components/importModal/index.js
+++ b/pc4mobx/hrmSalary/components/importModal/index.js
@@ -68,7 +68,7 @@ export default class ImportModal extends React.Component {
     }
 
     render() {
-        const { step, slideDataSource } = this.props;
+        const { step, slideDataSource, isInit } = this.props;
         return (
         <Modal title="数据导入" visible={this.props.visiable}
           onCancel={this.props.onCancel}
@@ -84,6 +84,7 @@ export default class ImportModal extends React.Component {
             </div>
             {
                 this.props.step == 0 && (<ModalStep1 
+                    isInit={ isInit }
                     templateLink={this.props.templateLink}
                     headerSetCompoent={this.props.headerSetCompoent}
                     formComponent={this.props.renderFormComponent && this.props.renderFormComponent()}
diff --git a/pc4mobx/hrmSalary/components/importModal/modalStep1.js b/pc4mobx/hrmSalary/components/importModal/modalStep1.js
index c00fd1cd..c050c8ac 100644
--- a/pc4mobx/hrmSalary/components/importModal/modalStep1.js
+++ b/pc4mobx/hrmSalary/components/importModal/modalStep1.js
@@ -90,13 +90,16 @@ export default class ModalStep1 extends React.Component {
                                 }
                                 
                                 {this.props.headerSetCompoent && this.props.headerSetCompoent };
-                                <WeaCheckbox 
-                                  value={hasData}
-                                  content="导出现有数据" 
-                                  helpfulTip="提示：建议先导出现有最新数据，修改后再导入" 
-                                  style={{ marginLeft: 10 }} 
-                                  onChange={(hasData)=> this.setState({hasData})}
-                                />
+                                {
+                                  this.props.isInit &&
+                                  <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/pages/dataAcquisition/attendance/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/editSlideContent.js
index cbfad2eb..8fb10562 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/editSlideContent.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/editSlideContent.js
@@ -56,7 +56,7 @@ export default class EditSlideContent extends React.Component {
                 <div className="titleWrapper"> 
                     {
                         this.props.salaryYearMonth != "" && 
-                        <div className="slideLeftTitle">考勤周期： {moment(this.props.salaryYearMonth + "-01").startOf("month").format("YYYY-MM-DD")} 至 {moment(this.props.salaryYearMonth + "-01").endOf("month").format("YYYY-MM-DD")}</div>
+                        <div className="slideLeftTitle">考勤周期： {this.props.salaryYearMonth}</div>
                     }
                 </div>
                 <div>
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
index 0f1e2698..85f8819a 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
@@ -183,7 +183,7 @@ export default class Attendance extends React.Component {
   handleViewAttendance(record) {
     const { attendanceStore: {setSlideVisiable}} = this.props;
     this.recordId = record.id
-    this.salaryYearMonth = record.salaryYearMonth
+    this.salaryYearMonth = record.attendCycle
     setSlideVisiable(true)
   }
 
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/index.js b/pc4mobx/hrmSalary/pages/salaryFile/index.js
index 01d1e624..0bc0f1c0 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/index.js
@@ -60,6 +60,7 @@ export default class SalaryFile extends React.Component {
       selectedTab: 0,
       editSlideVisible: false,
       importType: "",
+      isInit: false, //是否是初始化导入
       modalVisiable: false,
       step: 0,
       recordSlideVisible: false,
@@ -313,12 +314,12 @@ export default class SalaryFile extends React.Component {
           title: "信息确认",
           content: `若导入表格中的人员已存在在薪资档案中，初始化导入会将档案中该人员的数据清除再导入，点击确定继续导入`,
           onOk: () => {
-            this.setState({ importType: e.key, modalVisiable: true, step: 0 });
+            this.setState({ importType: e.key, isInit: true, modalVisiable: true, step: 0 });
           },
           onCancel() {},
         });
       } else {
-        this.setState({ importType: e.key, modalVisiable: true, step: 0 });
+        this.setState({ importType: e.key, isInit: false, modalVisiable: true, step: 0 });
       }
     };
 
@@ -478,6 +479,7 @@ export default class SalaryFile extends React.Component {
             init={() => {
               this.handleInitModal();
             }}
+            isInit={this.state.isInit}
             params={{}}
             columns={previewColumns}
             step={step}