From ebde1a926110b440ee4acf5079dd7c9f264f3a8b Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Thu, 17 Mar 2022 16:22:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/calculateDetail/compareDetail.js    |  2 ++
 .../pages/calculateDetail/salaryDetail.js     | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
index 0f449c15..aecdd764 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
@@ -45,6 +45,8 @@ export default class CompareDetail extends React.Component {
                 <div className="tableWrapper">
                     <Table dataSource={dataSource} columns={mergeDetailColumns}/>
                 </div>
+
+                
             </div>
         )
     }
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
index 3d54261c..f8f8d639 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
@@ -6,6 +6,9 @@ import WarningModal from './warningModal'
 import "./index.less"
 import EditSalaryDetail from './editSalaryDetail' 
 import SlideModalTitle from "../../components/slideModalTitle"
+import ImportModal from '../../components/importModal'
+import { columns } from '../salaryItem/columns'
+
 
 export default class SalaryDetail extends React.Component {
     constructor(props) {
@@ -24,8 +27,35 @@ export default class SalaryDetail extends React.Component {
             })
         }
     }
+
+    renderFormComponent() {
+        return (
+            <div>
+                <span style={{marginRight: "10px"}}>项目1</span>
+                <span style={{marginRight: "10px"}}>项目2</span>
+                <span style={{marginRight: "10px"}}>项目3</span>
+                <i className="icon-coms-tianjia" />
+            </div>
+        )
+    }
+
+    headerSetCompoent() {
+        return (
+            <div style={{display: "inline-block"}}>
+                <WeaCheckbox id="test" content="导出现有数据" />
+                <WeaHelpfulTip
+                    width={200}
+                    title="提示：建议先导出现有最新数据，修改后再导入；\n
+                    若只需要导出部分数据，请先筛选列表"
+                    placement="topLeft"
+                />
+            </div>
+        )
+    }
+
     render() {
         const { slideVisiable } = this.state;
+
         return (
             <div className="salaryDetail">
                 <div className="salaryBarWrapper">
@@ -67,6 +97,7 @@ export default class SalaryDetail extends React.Component {
                     showMask={true}
                     closeMaskOnClick={() => this.setState({slideVisiable: false})} />
                 }
+
             </div>
         )
     }