diff --git a/src/components/Form/src/jeecg/components/JPopup.vue b/src/components/Form/src/jeecg/components/JPopup.vue
index b881dd3..9ecefe0 100644
--- a/src/components/Form/src/jeecg/components/JPopup.vue
+++ b/src/components/Form/src/jeecg/components/JPopup.vue
@@ -21,6 +21,7 @@
       :groupId="uniqGroupId"
       :param="param"
       @ok="callBack"
+      :getContainer="getContainer"
     ></JPopupOnlReportModal>
   </div>
 </template>
@@ -50,6 +51,7 @@
       groupId: propTypes.string.def(''),
       formElRef: propTypes.object,
       setFieldsValue: propTypes.func,
+      getContainer: propTypes.func,
       fieldConfig: {
         type: Array,
         default: () => [],
diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts
index b73df76..10366a3 100644
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { getAutoScrollContainer } from '/@/utils/common/compUtils';
 
 export const columns: BasicColumn[] = [
   {
@@ -83,6 +84,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       showTime: true,
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      getPopupContainer: getAutoScrollContainer,
     },
   },
   {
@@ -92,6 +94,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       showTime: true,
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      getPopupContainer: getAutoScrollContainer,
     },
   },
   {