diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less index 30f8c2e3..1d24e4df 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less @@ -249,7 +249,7 @@ padding: 0; background: transparent; border: none; - font-size: 20px!important; + font-size: 20px !important; line-height: 20px; } @@ -370,6 +370,16 @@ .incomeDialogContent { height: 100%; - padding: 16px; + padding: 8px 16px; + background: #f6f6f6; + + .wea-input-focus { + margin-bottom: 2px!important; + margin-top: 0!important; + } + + .clearfix { + background: #FFF; + } } } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js index 424f3294..008cd66b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js @@ -71,7 +71,7 @@ class LedgerSalaryItemSelectDialog extends Component { }; return ( this.incomeRef = dom} buttons={[ ]} @@ -109,6 +109,7 @@ class LedgerSalaryItemSelectDialog extends Component { showHeader={false} dataSource={dataSource} loading={loading} pagination={pagination} columns={columns} onRowClick={this.handleRowClick} + scroll={{ y: this.incomeRef ? this.incomeRef.state.height - 106 : 600 }} />