current === o.key).editBtns : []}
+ tabDatas={tabs} selectedKey={String(current)}
+ onChange={cur => this.setState({ current: parseInt(cur) })}/>
}
content={
@@ -486,9 +466,7 @@ class LedgerSlide extends Component {
}
}
- {
- this.renderChildren()
- }
+ {_.find(tabs, o => current === o.key).children}
}
onClose={this.handleClose}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
index 2fc10db7..182042bf 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
@@ -1,13 +1,3 @@
-.ledgerOuter {
- .wea-new-top {
- .ant-col-10 {
- & > span:nth-child(2) {
- margin-top: -6px;
- }
- }
- }
-}
-
.ledgerWrapper {
height: 100%;
diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index 4ce6ef7a..6296eac4 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -83,3 +83,27 @@
}
+//薪资账套-工资类型下拉选项样式自定义
+.reportTypeName-box {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .reportTypeName {
+ display: flex;
+ padding: 0 8px;
+ align-items: center;
+ color: #ffcd50;
+ border: 1px solid #ffde8a;
+ background-color: #fff5db;
+ border-radius: 2px;
+ height: 24px;
+ }
+
+ .danger {
+ color: #ff666a !important;
+ border: 1px solid #ffc1c3 !important;
+ background-color: #ffdfe0 !important;
+ }
+}
+