diff --git a/components/panel/formSlot.vue b/components/panel/formSlot.vue
index 7157e3b..79f3a0c 100644
--- a/components/panel/formSlot.vue
+++ b/components/panel/formSlot.vue
@@ -255,8 +255,8 @@
 				</slot>
 			</g-panel-fixed>
 		</u-popup>
-		<u-popup v-model="deptModal.isShow" mode="bottom" border-radius="16" height="980" :mask-close-able="true" @close="deptModal.isShow = false">
-			<div class="dept-picker-wrap">
+		<u-popup v-model="deptModal.isShow" mode="bottom" border-radius="16" :mask-close-able="true" @close="deptModal.isShow = false">
+			<div class="dept-picker-wras" style="max-height: 60vh;overflow-y: auto;">
 				<div class="g_fs_18 g_c_3 g_flex_row_center g_pt_16 g_pb_16">选择部门</div>
 				<!-- 面包屑导航 -->
 				<div class="dept-breadcrumb g_flex_row_start g_pl_12 g_pr_12 g_pb_8" v-if="deptBreadcrumb.length > 0">
@@ -273,8 +273,8 @@
 					</div>
 				</div>
 				<!-- 部门列表 -->
-				<scroll-view scroll-y="true" class="dept-list-scroll">
-					<div>
+				<div class="dept-list-scroll">
+					<div style="padding: 0 0px 24px 0;">
 						<div
 							class="dept-list-item"
 							v-for="(dept, deptIndex) in currentDeptList"
@@ -303,7 +303,7 @@
 							暂无数据
 						</div>
 					</div>
-				</scroll-view>
+				</div>
 				<!-- 已选部门 -->
 				<div class="dept-selected-wrap" v-if="selectedDeptIds.length > 0">
 					<div class="dept-selected-scroll">
@@ -320,13 +320,13 @@
 						</div>
 					</div>
 				</div>
-				<g-panel-fixed>
+				<!-- <g-panel-fixed>
 					<slot>
 						<div class="g_flex_row_center">
 							<rh-button btnText="确定" type="primary" @clickBtn="submitDept" />
 						</div>
 					</slot>
-				</g-panel-fixed>
+				</g-panel-fixed> -->
 			</div>
 		</u-popup>
 		<!-- 角色选择弹窗 -->
@@ -1044,6 +1044,13 @@ export default {
 	display: flex;
 	flex-direction: column;
 }
+
+.dept-picker-wras {
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+}
+
 .dept-breadcrumb {
 	width: 100%;
 	box-sizing: border-box;
@@ -1052,6 +1059,7 @@ export default {
 .dept-list-scroll {
 	flex: 1;
 	width: 100%;
+	overflow-y: auto;
 	-webkit-overflow-scrolling: touch;
 }
 .dept-list-item {
@@ -1059,6 +1067,11 @@ export default {
 	flex-direction: row;
 	align-items: stretch;
 	height: 56px;
+	&:last-child{
+		.dept-content-area{
+			border-bottom: none;
+		}
+	}
 }
 .dept-checkbox-area {
 	width: 56px;
@@ -1107,6 +1120,10 @@ export default {
 	background-color: #fafafa;
 	border-top: 1px solid #f0f0f0;
 	padding: 12rpx 24rpx;
+	flex-shrink: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	min-height: 72px;
 }
 .dept-selected-scroll {
 	max-height: 160rpx;