From 51937a5ba82742d98efa1eb434700de60b1beee6 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 27 Mar 2025 16:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=83=A8=EF=BC=8C=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=B2=97=E4=BD=8D=E5=8F=B0=E8=B4=A6=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=A0=B7=E5=BC=8F=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=A1=A8=E5=A4=B4=E5=92=8C=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/company/company.js             |  1 +
 .../components/department/department.js       | 30 ++++++++++---------
 pc4mobx/organization/components/job/Job.js    |  1 +
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index 022557c..124dfd6 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -592,6 +592,7 @@ export default class Company extends React.Component {
                             </div> :
                                 <WeaTable rowKey={record => record.id} ecId={`${this && this.props && this.props.ecId || ''}_WeaTable@pgmg3x`}
                                     loading={loading}
+                                    scroll={{ y: 'calc(100vh - 300px)' }}
                                     dataSource={dataSource} childrenColumnName="children"
                                     columns={this.reRenderColumns(columns)}
                                     rowSelection={rowSelection}
diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index f1e845c..f0f4d44 100644
--- a/pc4mobx/organization/components/department/department.js
+++ b/pc4mobx/organization/components/department/department.js
@@ -704,20 +704,22 @@ export default class Department extends React.Component {
                                 init ? <div className='hrm-new-weatable-spin'>
                                     <Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={init}></Spin>
                                 </div> :
-                                    <WeaTable rowKey={record => record.id} ecId={`${this && this.props && this.props.ecId || ''}_WeaTable@pgmg3x`}
-                                        loading={loading}
-                                        dataSource={dataSource} childrenColumnName="children"
-                                        columns={this.reRenderColumns(columns)}
-                                        rowSelection={rowSelection}
-                                        pagination={pagination}
-                                        onChange={(pagination, filters, sorter) => {
-                                            department.setSortParams(sorter);
-                                            department.setCurrent(pagination.current);
-                                            department.setPageSize(pagination.pageSize);
-                                            department.getTableInfo();
-                                        }}
-                                        indentSize={15}
-                                    />
+                                <WeaTable rowKey={record => record.id} ecId={`${this && this.props && this.props.ecId || ''}_WeaTable@pgmg3x`}
+                                    loading={loading}
+                                    dataSource={dataSource} childrenColumnName="children"
+                                    columns={this.reRenderColumns(columns)}
+                                    scroll={{ y: 'calc(100vh - 300px)' }}
+                                    rowSelection={rowSelection}
+                                    pagination={pagination}
+                                    onChange={(pagination, filters, sorter) => {
+                                        department.setSortParams(sorter);
+                                        department.setCurrent(pagination.current);
+                                        department.setPageSize(pagination.pageSize);
+                                        department.getTableInfo();
+                                    }}
+                                    indentSize={15}
+                            />
+                               
                             }
                         </WeaLeftRightLayout>
                     </WeaTop>
diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js
index 84c72f7..3e784e4 100644
--- a/pc4mobx/organization/components/job/Job.js
+++ b/pc4mobx/organization/components/job/Job.js
@@ -672,6 +672,7 @@ export default class Job extends React.Component {
                                         columns={this.reRenderColumns(columns)}
                                         rowSelection={rowSelection}
                                         pagination={pagination}
+                                        scroll={{ y: 'calc(100vh - 300px)' }}
                                         onChange={(pagination, filters, sorter) => {
                                             job.setSortParams(sorter);
                                             job.setCurrent(pagination.current);