From 1fb586fe4047c2eed7bc352ce02a1ee4787a8bc4 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Wed, 20 Apr 2022 19:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/components/importModal/index.js |   1 -
 .../computerTemplate/background.png           | Bin 0 -> 9843 bytes
 .../templatePreview/computerTemplate/index.js |  20 ++++-
 .../pages/payroll/templatePreview/index.js    |   5 ++
 .../pages/payroll/templatePreview/index.less  |  70 +++++++++++++++++-
 .../templatePreview/phoneTemplate/index.js    |  40 ++++++++++
 pc4mobx/hrmSalary/pages/salaryFile/index.js   |  14 ++--
 pc4mobx/hrmSalary/stores/salaryFile.js        |  17 +++--
 8 files changed, 152 insertions(+), 15 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/background.png
 create mode 100644 pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js

diff --git a/pc4mobx/hrmSalary/components/importModal/index.js b/pc4mobx/hrmSalary/components/importModal/index.js
index 2df45373..3d8e2bcf 100644
--- a/pc4mobx/hrmSalary/components/importModal/index.js
+++ b/pc4mobx/hrmSalary/components/importModal/index.js
@@ -90,7 +90,6 @@ export default class ImportModal extends React.Component {
                     onPreviewDate={() => this.handlePreviewDate()}
                     dataSource={slideDataSource}
                     columns={this.props.columns}
-                    
                     onStep2Next={() => {this.nextStep()}} onStep2Pre={() => {this.preStep()}}/>)
             }
             {
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/background.png b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..49ee940a7debce0ae1a4a6274661a0b21773a83e
GIT binary patch
literal 9843
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
Z_<vAyKvO)$R4f1h002ovPDHLkV1kw<N1Olv

literal 0
HcmV?d00001

diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
index 6c5281a5..9d00cb4f 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
@@ -1,19 +1,35 @@
 import React from 'react'
+import background from './background.png'
+import { Row, Col } from 'antd'
 
 export default class ComputerTemplate extends React.Component {
     
     render() {
+        const { isPC } = this.props;
         return (
             <div className="computerTemplate">
                 <div className="titleWrapper">
                     测试标题
                 </div>
                 <div className="background-wrapper">
-
+                    <img className="background-img" src={background} />
                 </div>
 
                 <div className="sobItemWrapper">
-                    
+                    <div className="sobItem">
+                        <Row className="titleRow">
+                            <Col span={24} className="sobTitle">员工信息</Col>
+                        </Row>
+                        
+                        <Row className="contentRow">
+                            <Col span={ 4 } className="contentItem">个税扣缴义务人</Col>
+                            <Col span={ 4 } className="contentItem">上海泛微</Col>
+                            <Col span={ 4 } className="contentItem">姓名</Col>
+                            <Col span={ 4 } className="contentItem">张三</Col>
+                            <Col span={ 4 } className="contentItem">部门</Col>
+                            <Col span={ 4 } className="contentItem">研发部</Col>
+                        </Row>
+                    </div>
                 </div>
             </div>
         )
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js
index 25a04f85..ed6be8b5 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js
@@ -2,6 +2,8 @@ import React from 'react'
 import phone from './phone_new.png'
 import computer from './computer.png'
 import './index.less'
+import ComputerTemplate from './computerTemplate'
+import PhoneTemplate from './phoneTemplate'
 
 export default class TemplatePreview extends React.Component {
     constructor(props) {
@@ -31,6 +33,9 @@ export default class TemplatePreview extends React.Component {
                 </div>
 
                 <div className="contentWrapper">
+                    {
+                        this.state.selectKey == "0" ? <ComputerTemplate/> : <PhoneTemplate />
+                    }
                     
                 </div>
             </div>
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
index 3d4c23ca..f3168d8c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
@@ -1,4 +1,5 @@
 .templatePreview {
+
     .headerWrapper {
         background-color: #0270c1;
         height: 55px;
@@ -10,7 +11,7 @@
             height: 55px;
             .iconWrapper {
                 display: inline-block;
-                width: 50px;
+                width: 64px;
                 height: 55px;
                 line-height: 75px;
                 text-align: center;
@@ -24,4 +25,71 @@
             }
         }
     }
+
+    .computerTemplate {
+        background-color: rgb(246, 246, 246);
+        width: 900px;
+        min-height: 1200px;
+        padding-top: 30px;
+        padding-bottom: 20px;
+        margin: 20px auto;
+        box-shadow: rgba(214, 214, 214, 0.5) 0px 0px 14px 0px;
+        border: 3px solid #fff;
+        .background-wrapper {
+            height: 200px;
+            margin: 10px;
+        }
+        .background-img {
+            width: 100%;
+            height: 200px;
+        }
+        .titleWrapper {
+            text-align: center;
+            font-size: 18px;
+            font-weight: 700;
+        }
+        .sobItem {
+            margin: 10px;
+            background-color: #FFF;
+            padding: 10px;
+            line-height: 35px;
+            text-align: center;
+            .titleRow {
+                border: 1px solid #f2f2f2;
+                text-align: left;
+                .sobTitle {
+                    padding-left: 10px;
+                }
+            }
+            .contentRow {
+                border-left: 1px solid #f2f2f2;
+                border-bottom: 1px solid #f2f2f2;
+                border-right: 1px solid #f2f2f2;
+            }
+            .contentItem {
+                border-right: 1px solid #f2f2f2;
+                overflow: hidden; 
+                text-overflow: ellipsis; 
+                white-space: nowrap;
+            }
+            .contentItem:last-child {
+                border-right: none;
+            }
+        }
+    }
+
+    .phoneTemplate {
+        width: 330px;
+        padding-top: 0px;
+        border-radius: 20px;
+        .phoneBar {
+            height: 50px;
+            line-height: 50px;
+            font-size: 16px;
+            font-weight: 700;
+            background-color: #fff;
+            text-align: center;
+        }
+    }
+    
 }
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
new file mode 100644
index 00000000..9fdfab88
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
@@ -0,0 +1,40 @@
+import React from 'react'
+import { Row, Col} from 'antd'
+import background from '../computerTemplate/background.png'
+import "../index.less"
+
+export default class PhoneTemplate extends React.Component {
+    render() {
+        return (
+            <div className="computerTemplate phoneTemplate" >
+                <div className="phoneBar">薪酬预览</div>
+                <div className="titleWrapper">
+                    测试标题
+                </div>
+                <div className="background-wrapper">
+                    <img className="background-img" src={background} />
+                </div>
+
+                <div className="sobItemWrapper">
+                    <div className="sobItem">
+                        <Row className="titleRow">
+                            <Col span={24} className="sobTitle">员工信息</Col>
+                        </Row>
+                        
+                        <Row className="contentRow">
+                            <Col span={ 6 } className="contentItem">个税扣缴义务人</Col>
+                            <Col span={ 6 } className="contentItem">上海泛微</Col>
+                            <Col span={ 6 } className="contentItem">姓名</Col>
+                            <Col span={ 6 } className="contentItem">张三</Col>
+                        </Row>
+
+                        <Row className="contentRow">
+                            <Col span={ 6 } className="contentItem">部门</Col>
+                            <Col span={ 6 } className="contentItem">研发部</Col>
+                        </Row>
+                    </div>
+                </div>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/index.js b/pc4mobx/hrmSalary/pages/salaryFile/index.js
index 7bc7df34..c89d9b85 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/index.js
@@ -42,7 +42,8 @@ export default class SalaryFile extends React.Component {
       step: 0,
       recordSlideVisible: false,
       selectedRowKeys: [],
-      showSearchBar: false
+      showSearchBar: false,
+      importResult: {}
     }
   }
 
@@ -82,7 +83,12 @@ export default class SalaryFile extends React.Component {
   handleImportFile(params) {
     const { salaryFileStore: {importSalaryArchive}} = this.props;
     params.importType = this.state.importType
-    importSalaryArchive(params)
+    importSalaryArchive(params).then(data => {
+      data.errorData = data.errorNotice
+      this.setState({
+        importResult: data
+      })
+    })
   }
 
 
@@ -298,7 +304,7 @@ export default class SalaryFile extends React.Component {
             step={step}
             setStep={this.setStep.bind(this)}
             slideDataSource={previewDataSource}
-            importResult={{}}
+            importResult={this.state.importResult}
             onFinish={() => {this.handleImportFinish()}}
             previewImport={(params) => {
               this.handlePreviewImport(params)
@@ -310,8 +316,6 @@ export default class SalaryFile extends React.Component {
             onCancel={() => { this.setState({modalVisiable: false})}} 
           />
         }
-        
-        
         {
           this.state.changeSalaryVisible && <ChangeSalaryModal 
             currentId={currentId}
diff --git a/pc4mobx/hrmSalary/stores/salaryFile.js b/pc4mobx/hrmSalary/stores/salaryFile.js
index b42ff9f8..a3cf91f0 100644
--- a/pc4mobx/hrmSalary/stores/salaryFile.js
+++ b/pc4mobx/hrmSalary/stores/salaryFile.js
@@ -128,13 +128,18 @@ export class salaryFileStore {
   // 导入档案
   @action
   importSalaryArchive = (params) => {
-    API.importSalaryArchive(params).then(res => {
-      if(res.status) {
-        message.success("导入成功")
-      } else {
-        message.error(res.errormsg || "接口异常")
-      }
+    return new Promise((resolve, reject) => {
+      API.importSalaryArchive(params).then(res => {
+        if(res.status) {
+          message.success("导入成功")
+          resolve(res.data)
+        } else {
+          message.error(res.errormsg || "接口异常")
+          reject()
+        }
+      })
     })
+    
   }
 
   // 导出档案