diff --git a/src/views/erp/mold/components/MoldForm.vue b/src/views/erp/mold/components/MoldForm.vue
index 8ab0828d..a77e87a7 100644
--- a/src/views/erp/mold/components/MoldForm.vue
+++ b/src/views/erp/mold/components/MoldForm.vue
@@ -1,12 +1,18 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="120px"
-      v-loading="formLoading"
-    >
+  <div class="mold-panel">
+    <div class="mold-panel__header">
+      <div class="mold-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="mold-dialog" v-loading="formLoading">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="120px"
+      >
       <el-form-item :label="t('MoldManagement.Mold.code')" prop="code">
         <el-row :gutter="10" style="width: 100%">
           <el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
@@ -128,13 +134,14 @@
         <UploadFile v-model="formData.fileUrl" :limit="1" :isShowTip="false"/>
       </el-form-item>
      </el-form>
-    <template #footer>
+    </div>
+    <div class="mold-footer">
+      <el-button @click="closeForm">{{ t('dialog.close') }}</el-button>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">
         {{ t('action.save') }}
       </el-button>
-      <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
-    </template>
-  </Dialog>
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
@@ -146,7 +153,6 @@ const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
@@ -203,7 +209,6 @@ const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number, brandId: number) => {
-  dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
@@ -270,7 +275,7 @@ const handleQrcodeRefreshSuccess = async (data: any) => {
 }
 
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const emit = defineEmits(['success', 'closed']) // 定义 success 和 closed 事件
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
@@ -282,10 +287,11 @@ const submitForm = async () => {
       await MoldBrandApi.createMold(data)
       message.success(t('common.createSuccess'))
     } else {
-      await MoldBrandApi.updateMold(data)
+      const { templateJson, ...updateData } = data
+      await MoldBrandApi.updateMold(updateData)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
+    closeForm()
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -293,6 +299,10 @@ const submitForm = async () => {
   }
 }
 
+const closeForm = () => {
+  emit('closed')
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
@@ -315,5 +325,58 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
 </script>
-<style scoped lang="scss"></style>
+<style lang="scss" scoped>
+.mold-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.mold-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.mold-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.mold-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.mold-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  width: 100%;
+  padding: 16px 20px 20px;
+  border-top: 1px solid #ebeef5;
+}
+
+@media (max-width: 768px) {
+  .mold-panel__header {
+    padding: 14px 16px;
+  }
+
+  .mold-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .mold-footer {
+    padding: 16px;
+  }
+}
+</style>
diff --git a/src/views/erp/moldlist/index.vue b/src/views/erp/moldlist/index.vue
index 49b265bc..594a1be9 100644
--- a/src/views/erp/moldlist/index.vue
+++ b/src/views/erp/moldlist/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="device-ledger-layout">
+  <div v-show="!formVisible" class="device-ledger-layout">
     <ContentWrap class="device-ledger-left">
       <el-tree
 v-loading="typeTreeLoading" :data="brandTreeData" node-key="id" highlight-current :props="typeTreeProps"
@@ -101,9 +101,8 @@ type="success" plain @click="handleExport" :loading="exportLoading"
     </div>
   </div>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <!-- 表单弹窗：添加/修改 -->
-  <MoldForm ref="formRef" @success="getList" />
+  <!-- 表单：添加/修改 -->
+  <MoldForm v-show="formVisible" ref="formRef" @success="getList" @closed="formVisible = false" />
 
   <!-- 表单弹窗：添加/修改 -->
   <MoldRecordForm ref="recordFormRef" @success="getList" />
@@ -223,11 +222,14 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
+const formVisible = ref(false)
+const openForm = async (type: string, id?: number) => {
   if (type == 'create' && !queryParams.brand) {
     message.error('请选择一个模具型号')
     return
   }
+  formVisible.value = true
+  await nextTick()
   formRef.value.open(type, id, queryParams.brand)
 }
 
diff --git a/src/views/iot/feedback/FeedbackForm.vue b/src/views/iot/feedback/FeedbackForm.vue
index 6482e582..cd968fe6 100644
--- a/src/views/iot/feedback/FeedbackForm.vue
+++ b/src/views/iot/feedback/FeedbackForm.vue
@@ -1,28 +1,34 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="标题" prop="title">
-        <el-input v-model="formData.title" placeholder="请输入标题" />
-      </el-form-item>
-      <el-form-item label="标签" prop="tags">
-        <el-input v-model="formData.tags" placeholder="请输入标签" />
-      </el-form-item>
-      <el-form-item label="内容" prop="content">
-        <Editor v-model="formData.content" height="150px" />
-      </el-form-item>
-
-    </el-form>
-    <template #footer>
+  <div class="feedback-panel">
+    <div class="feedback-panel__header">
+      <div class="feedback-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="feedback-dialog" v-loading="formLoading">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="100px"
+      >
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="formData.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="标签" prop="tags">
+          <el-input v-model="formData.tags" placeholder="请输入标签" />
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <Editor v-model="formData.content" height="150px" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="feedback-footer">
+      <el-button @click="closeForm">取 消</el-button>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
 import { FeedbackApi, FeedbackVO } from '@/api/iot/feedback'
@@ -33,7 +39,6 @@ defineOptions({ name: 'FeedbackForm' })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
@@ -50,7 +55,6 @@ const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
@@ -66,8 +70,12 @@ const open = async (type: string, id?: number) => {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+const closeForm = () => {
+  emit('closed')
+}
+
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const emit = defineEmits(['success', 'closed']) // 定义 success 和 closed 事件
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
@@ -82,7 +90,7 @@ const submitForm = async () => {
       await FeedbackApi.updateFeedback(data)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
+    closeForm()
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -101,3 +109,57 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 </script>
+
+<style lang="scss" scoped>
+.feedback-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.feedback-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.feedback-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.feedback-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.feedback-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  width: 100%;
+  padding: 16px 20px 20px;
+  border-top: 1px solid #ebeef5;
+}
+
+@media (max-width: 768px) {
+  .feedback-panel__header {
+    padding: 14px 16px;
+  }
+
+  .feedback-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .feedback-footer {
+    padding: 16px;
+  }
+}
+</style>
diff --git a/src/views/iot/feedback/index.vue b/src/views/iot/feedback/index.vue
index 5c362804..336bf77e 100644
--- a/src/views/iot/feedback/index.vue
+++ b/src/views/iot/feedback/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <ContentWrap>
+  <div class="feedback-page">
+    <template v-if="!formVisible">
+      <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
@@ -105,9 +107,11 @@
       @pagination="getList"
     />
   </ContentWrap>
+    </template>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <FeedbackForm ref="formRef" @success="getList" />
+    <!-- 表单：添加/修改 -->
+    <FeedbackForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -163,8 +167,12 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const formVisible = ref(false)
+
+const openForm = async (type: string, id?: number) => {
+  formVisible.value = true
+  await nextTick()
+  formRef.value?.open(type, id)
 }
 
 /** 删除按钮操作 */
diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue
index 09186e2a..f94726be 100644
--- a/src/views/mes/deviceledger/DeviceLedgerForm.vue
+++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue
@@ -1,13 +1,18 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="920px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-      v-loading="formLoading || fileUploading"
-      element-loading-text="资料上传中，请稍候"
-    >
+  <div class="device-ledger-panel">
+    <div class="device-ledger-panel__header">
+      <div class="device-ledger-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="device-ledger-dialog" v-loading="formLoading || fileUploading" element-loading-text="资料上传中，请稍候">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="110px"
+      >
       <el-row :gutter="16">
         <!-- <el-col :span="24">
           <el-form-item label="资产编号" prop="id">
@@ -238,12 +243,13 @@
           </el-form-item>
         </el-col>
       </el-row>
-    </el-form>
-    <template #footer>
+      </el-form>
+    </div>
+    <div class="device-ledger-footer">
+      <el-button @click="closeForm">{{ t('common.cancel') }}</el-button>
       <el-button @click="submitForm" type="primary" :disabled="formLoading || fileUploading">{{ t('common.ok') }}</el-button>
-      <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
-    </template>
-  </Dialog>
+    </div>
+  </div>
 
   <el-dialog v-model="criticalComponentDialogVisible" :title="t('EquipmentManagement.EquipmentLedger.gjTitle')" width="1200px" class="device-ledger-transfer-dialog"
     append-to-body>
@@ -395,7 +401,6 @@ const total = ref(0)
 const bjTotal = ref(0)
 const selectedIds = ref<number[]>([])
 const bjSelectedIds = ref<number[]>([])
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const fileUploading = ref(false)
@@ -744,7 +749,6 @@ const ensureOptionsLoaded = async () => {
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number, defaultDeviceTypeId?: number, defaultDeviceLineId?: number) => {
-  dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
@@ -992,7 +996,7 @@ const bjToggleSelection = () => {
 }
 
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const emit = defineEmits(['success', 'closed']) // 定义 success 和 closed 事件
 const submitForm = async () => {
   if (fileUploading.value) {
     message.warning('资料上传中，请等待上传完成后再提交')
@@ -1027,7 +1031,7 @@ const submitForm = async () => {
       await DeviceLedgerApi.updateDeviceLedger(data)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
+    closeForm()
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -1108,6 +1112,10 @@ const setBJDefaultSelections = () => {
 
 
 
+const closeForm = () => {
+  emit('closed')
+}
+
 /** 重置表单 */
 const resetForm = () => {
   fileUploading.value = false
@@ -1183,4 +1191,56 @@ const resetForm = () => {
 .no-select-all :deep(.el-table__header-wrapper .el-checkbox) {
   display: none;
 }
+
+.device-ledger-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.device-ledger-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.device-ledger-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.device-ledger-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.device-ledger-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  width: 100%;
+  padding: 16px 20px 20px;
+  border-top: 1px solid #ebeef5;
+}
+
+@media (max-width: 768px) {
+  .device-ledger-panel__header {
+    padding: 14px 16px;
+  }
+
+  .device-ledger-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .device-ledger-footer {
+    padding: 16px;
+  }
+}
 </style>
diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue
index 5d419042..af6e8725 100644
--- a/src/views/mes/deviceledger/index.vue
+++ b/src/views/mes/deviceledger/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="device-ledger-layout">
+  <div class="device-ledger-page">
+    <template v-if="!formVisible">
+      <div class="device-ledger-layout">
     <ContentWrap class="device-ledger-left">
       <div class="tree-header">
         <span class="tree-title">{{ t('EquipmentManagement.EquipmentLedger.lineCategory') }}</span>
@@ -319,10 +321,12 @@
 
       </ContentWrap>
     </div>
-  </div>
+    </div>
+    </template>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <DeviceLedgerForm ref="formRef" @success="getList" />
+    <!-- 表单：添加/修改 -->
+    <DeviceLedgerForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -774,7 +778,10 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
+const formVisible = ref(false)
+const openForm = async (type: string, id?: number) => {
+  formVisible.value = true
+  await nextTick()
   formRef.value.open(type, id, queryParams.deviceType, selectedDeviceLineId.value)
 }
 
diff --git a/src/views/system/menu/MenuForm.vue b/src/views/system/menu/MenuForm.vue
index 5ebfbf57..a02dbfa0 100644
--- a/src/views/system/menu/MenuForm.vue
+++ b/src/views/system/menu/MenuForm.vue
@@ -1,13 +1,19 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="auto"
-      class="system-menu-form"
-    >
+  <div class="system-menu-panel">
+    <div class="system-menu-panel__header">
+      <div class="system-menu-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="system-menu-dialog" v-loading="formLoading">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="auto"
+        class="system-menu-form"
+      >
       <el-form-item :label="t('SystemManagement.Menu.parent')">
         <el-tree-select
           v-model="formData.parentId"
@@ -111,11 +117,12 @@
         </el-radio-group>
       </el-form-item>
     </el-form>
-    <template #footer>
+    </div>
+    <div class="system-menu-footer">
+      <el-button @click="closeForm">{{ t('common.cancel') }}</el-button>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">{{ t('common.ok') }}</el-button>
-      <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
-    </template>
-  </Dialog>
+    </div>
+  </div>
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
@@ -131,7 +138,6 @@ const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
@@ -164,7 +170,6 @@ const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number, parentId?: number, currentClientType?: number) => {
-  dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   clientType.value = currentClientType ?? 1
@@ -187,7 +192,7 @@ const open = async (type: string, id?: number, parentId?: number, currentClientT
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const emit = defineEmits(['success', 'closed']) // 定义 success 和 closed 事件
 const submitForm = async () => {
   // 校验表单
   if (!formRef) return
@@ -219,7 +224,7 @@ const submitForm = async () => {
       await MenuApi.updateMenu(data as unknown as MenuApi.MenuVO)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
+    closeForm()
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -239,6 +244,10 @@ const getTree = async () => {
   menuTree.value.push(menu)
 }
 
+const closeForm = () => {
+  emit('closed')
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
@@ -267,3 +276,57 @@ const isExternal = (path: string) => {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 </script>
+
+<style lang="scss" scoped>
+.system-menu-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.system-menu-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.system-menu-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.system-menu-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.system-menu-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  width: 100%;
+  padding: 16px 20px 20px;
+  border-top: 1px solid #ebeef5;
+}
+
+@media (max-width: 768px) {
+  .system-menu-panel__header {
+    padding: 14px 16px;
+  }
+
+  .system-menu-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .system-menu-footer {
+    padding: 16px;
+  }
+}
+</style>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 681319da..c6e62421 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,4 +1,6 @@
 <template>
+  <div class="system-menu-page">
+    <div v-show="!formVisible">
   <!-- Tabs 切换 Web/APP -->
   <ContentWrap>
     <el-tabs v-model="activeClientType" @tab-change="handleClientTypeChange">
@@ -134,9 +136,11 @@
       </el-table-column>
     </el-table>
   </ContentWrap>
+    </div>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <MenuForm ref="formRef" @success="getList" />
+  <!-- 表单：添加/修改 -->
+  <MenuForm v-show="formVisible" ref="formRef" @success="getList" @closed="formVisible = false" />
+  </div>
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
@@ -195,7 +199,10 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number, parentId?: number) => {
+const formVisible = ref(false)
+const openForm = async (type: string, id?: number, parentId?: number) => {
+  formVisible.value = true
+  await nextTick()
   formRef.value.open(type, id, parentId, activeClientType.value)
 }