diff --git a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js index a5c1a5cc..7ca588a9 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js +++ b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js @@ -63,14 +63,13 @@ class Index extends Component { >
{ - _.map(dataSource, item => ( (
-
{it.id}
-
{it.name}
-
)} + _.map(dataSource, item => (!_.isEmpty(item.valueschanges) ? (
+
{it.id}
+
{it.name}
+
)} height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]} - />)) + /> :
{getLabel(111, "无数据变更记录")}
)) }
diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.less b/pc4mobx/hrmSalary/components/logViewModal/index.less index 0d9e4d57..79d0bee5 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/index.less +++ b/pc4mobx/hrmSalary/components/logViewModal/index.less @@ -9,6 +9,15 @@ width: 100%; height: 100%; + .empty { + width: 100%; + display: flex; + height: 100%; + justify-content: center; + align-items: center; + background: #ffff; + } + .wea-search-group { padding: 0; margin-bottom: 10px; @@ -37,34 +46,41 @@ .transfer-tree { background: #FFF; border: 1px solid #dadada; + padding: 0; - .treeitem { - margin: 0 !important; + & > li:not(:last-child) { + .detailBox .content { + border-bottom: 1px solid #dadada; + } } - } - } - .detailBox { - display: flex; - align-items: center; + & > li { + margin: 0 !important; - .order { - width: 35px; - color: #999; - text-align: center; - } + .detailBox { + display: flex; + align-items: center; - .content { - position: relative; - flex: 1; - min-height: 40px; - color: #000; - display: flex; - align-items: center; - justify-content: flex-start; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + .order { + width: 35px; + color: #999; + text-align: center; + } + + .content { + position: relative; + flex: 1; + min-height: 40px; + color: #000; + display: flex; + align-items: center; + justify-content: flex-start; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + } } } }