From 9940be40ed8e217517f5a69f087850b0b1cda12e Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Tue, 31 May 2022 19:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less  | 6 +++++-
 .../pages/payroll/templatePreview/phoneTemplate/index.js    | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
index f3168d8c..f736879d 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
@@ -1,5 +1,10 @@
 .templatePreview {
 
+    .contentWrapper {
+        height: 90vh;
+        overflow-y: scroll;
+    }
+    
     .headerWrapper {
         background-color: #0270c1;
         height: 55px;
@@ -29,7 +34,6 @@
     .computerTemplate {
         background-color: rgb(246, 246, 246);
         width: 900px;
-        min-height: 1200px;
         padding-top: 30px;
         padding-bottom: 20px;
         margin: 20px auto;
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
index 7852cbcb..dcb71ed5 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
@@ -59,10 +59,10 @@ export default class PhoneTemplate extends React.Component {
                                 <Row className="contentRow">
                                     {
                                         group.items && group.items.map(item => (
-                                            <Col span={12}>
+                                            <Col span={24}>
                                                 <Row>
-                                                    <Col span={ 6 } className="contentItem">{item.name}</Col>
-                                                    <Col span={ 6 } className="contentItem">{index == 0 ?  item.salaryItemValue : 10000}</Col>
+                                                    <Col span={ 12 } className="contentItem">{item.name}</Col>
+                                                    <Col span={ 12 } className="contentItem">{index == 0 ?  item.salaryItemValue : 10000}</Col>
                                                 </Row>
                                             </Col>
                                         ))