From 5e2f6bbbbcc262916e8a626b306af22c3a609698 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 30 Oct 2024 10:59:46 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.16.1.2410.01-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/dataAcquisition/cumDeduct/index.js  | 10 +++----
 .../pages/dataAcquisition/dataTables.js       |  2 +-
 .../pages/dataAcquisition/index.less          | 26 ++++---------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 2d7d12f6..9f1e481f 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -244,12 +244,10 @@ class Index extends Component {
         };
         this.handleSaveDeduction(payload);
       } else {
-        f.showErrors();
-        this.forceUpdate();
-        // Modal.warning({
-        //   title: "信息确认",
-        //   content: "必要信息不完整，红色*为必填项！"
-        // });
+        Modal.warning({
+          title: "信息确认",
+          content: "必要信息不完整，红色*为必填项！"
+        });
       }
     });
   };
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index 58acfc56..e1ac75f4 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -199,7 +199,7 @@ class DataTables extends Component {
       }
     });
     let height = 280;
-    if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 108 : 500;
+    if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 124 : 500;
     return (<div style={{ height: height + "px" }}>
       <Spin spinning={loading.query}>
         <iframe
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
index 68f26be8..2e8fb3e1 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
@@ -23,33 +23,17 @@
 }
 
 .addItemsWrapper {
+  padding-bottom: 8px;
+
   .baseForm {
     .wea-form-cell {
       padding-right: 20% !important;
     }
   }
 
-  .wea-search-group {
-    .wea-form-cell-wrapper {
-      border: 1px solid #e5e5e5;
-
-      & > div:last-child {
-        border-bottom: none
-      }
-
-      .wea-form-cell {
-        padding: 4px 16px;
-        border-bottom: 1px solid #e5e5e5;
-
-        .wea-form-item-wrapper {
-          line-height: 30px;
-        }
-
-        .wea-form-item {
-          padding: 0;
-        }
-      }
-    }
+  .tipWrapper {
+    background: #FFF;
+    margin: 0 16px;
   }
 }