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 { { group.items && group.items.map(item => ( - + - {item.name} - {index == 0 ? item.salaryItemValue : 10000} + {item.name} + {index == 0 ? item.salaryItemValue : 10000} ))