From c6e71bd0695b504cc4993f62d027e387d47a63d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 11 Jan 2024 14:50:28 +0800 Subject: [PATCH] hotfix/2.9.10.2312.02 --- pc4mobx/hrmSalary/components/pcTemplate/index.less | 14 ++++++++++---- pc4mobx/hrmSalary/pages/mySalary/index.less | 8 ++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.less b/pc4mobx/hrmSalary/components/pcTemplate/index.less index 404b8a20..54d2cbdd 100644 --- a/pc4mobx/hrmSalary/components/pcTemplate/index.less +++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less @@ -57,7 +57,7 @@ .body { width: 100%; - margin-top: 32px; + //margin-top: 32px; .comp-img { text-align: center; @@ -83,15 +83,19 @@ .salary-group { margin-bottom: 16px; + padding-bottom: 16px; + background: #FFF; .group-title { font-size: 14px; + padding: 16px 0 0 8px; } .group-list { margin-top: 16px; display: flex; flex-wrap: wrap; + padding: 0 8px; .even { border-left: 1px solid #e5e5e5; @@ -111,9 +115,10 @@ border-right: 1px solid #e5e5e5; .item-name { - flex-basis: 170px; + //flex-basis: 170px; + //width: 170px; + flex: 1; box-sizing: border-box; - width: 170px; padding: 0 16px; height: 100%; background: #fbfbfb; @@ -135,7 +140,8 @@ } .item-count { - flex-basis: 328px; + //flex-basis: 328px; + flex: 1; padding-left: 16px; height: 100%; line-height: 40px; diff --git a/pc4mobx/hrmSalary/pages/mySalary/index.less b/pc4mobx/hrmSalary/pages/mySalary/index.less index 84745bee..258288c9 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/index.less +++ b/pc4mobx/hrmSalary/pages/mySalary/index.less @@ -27,12 +27,20 @@ overflow-y: auto; background: #f6f6f6; + .salary-preview-container { + max-width: 1000px; + margin: 0 auto; + border: 1px solid #e5e5e5; + padding-top: 32px; + } + .space { width: 100%; max-width: 1000px; display: flex; align-items: center; justify-content: flex-end; + margin-bottom: 16px; .ant-btn { margin-right: 16px;