From 8f8f2a32e93fce5c98e31fc130c01f12d34b5e40 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, 25 Jan 2024 14:02:34 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detailLogView/index.js         | 13 ++--
 .../components/logViewModal/index.less        | 62 ++++++++++++-------
 2 files changed, 45 insertions(+), 30 deletions(-)

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 {
       >
         <div className="logDialogContent">
           {
-            _.map(dataSource, item => (<WeaTransferList
-              data={item.valueschanges}
-              renderItem={(it) => (<div className="detailBox">
-                <div className="order">{it.id}</div>
-                <div className="content">{it.name}</div>
-              </div>)}
+            _.map(dataSource, item => (!_.isEmpty(item.valueschanges) ? <WeaTransferList
+              data={item.valueschanges} renderItem={(it) => (<div className="detailBox">
+              <div className="order">{it.id}</div>
+              <div className="content">{it.name}</div>
+            </div>)}
               height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]}
-            />))
+            /> : <div className="empty">{getLabel(111, "无数据变更记录")}</div>))
           }
         </div>
       </WeaDialog>
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;
+            }
+          }
+        }
       }
     }
   }