diff --git a/src/views/mes/moldget/MoldGetForm.vue b/src/views/mes/moldget/MoldGetForm.vue
index e8199491..998dfc43 100644
--- a/src/views/mes/moldget/MoldGetForm.vue
+++ b/src/views/mes/moldget/MoldGetForm.vue
@@ -1,121 +1,111 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-      v-loading="formLoading"
-      :disabled="disabled"
-    >
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldGet.outType')" prop="outType">
-            <el-select
-              v-model="formData.outType"
-              clearable
-              filterable
-              :placeholder="t('MoldManagement.MoldGet.placeholderOutType')"
-              class="!w-1/1"
-              disabled
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+  <div class="mold-get-panel">
+    <div class="mold-get-panel__header">
+      <div class="mold-get-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="mold-get-dialog" v-loading="formLoading">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="110px"
+        :disabled="disabled"
+      >
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldGet.outType')" prop="outType">
+              <el-select
+                v-model="formData.outType"
+                clearable
+                filterable
+                :placeholder="t('MoldManagement.MoldGet.placeholderOutType')"
+                class="!w-1/1"
+                disabled
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldGet.outNo')" prop="no">
+              <el-input
+                disabled
+                v-model="formData.no"
+                :placeholder="t('MoldManagement.MoldGet.placeholderOutNoAuto')"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldGet.outNo')" prop="no">
-            <el-input
-              disabled
-              v-model="formData.no"
-              :placeholder="t('MoldManagement.MoldGet.placeholderOutNoAuto')"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item label="客户" prop="customerId">
-            <el-select
-              v-model="formData.customerId"
-              clearable
-              filterable
-              placeholder="请选择客户"
-              class="!w-1/1"
-            >
-              <el-option
-                v-for="item in customerList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldGet.outTimeSingle')" prop="outTime">
+              <el-date-picker
+                v-model="formData.outTime"
+                type="date"
+                value-format="x"
+                :placeholder="t('MoldManagement.MoldGet.placeholderOutTime')"
+                class="!w-1/1"
               />
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldGet.outTimeSingle')" prop="outTime">
-            <el-date-picker
-              v-model="formData.outTime"
-              type="date"
-              value-format="x"
-              :placeholder="t('MoldManagement.MoldGet.placeholderOutTime')"
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="disabled">
-          <el-form-item :label="t('MoldManagement.MoldReturn.warehouse')" prop="warehouseId">
-            <el-select
-              v-model="formData.warehouseId"
-              clearable
-              filterable
-              :placeholder="t('MoldManagement.MoldReturn.placeholderWarehouse')"
-              class="!w-240px"
-              disabled
-            >
-              <el-option
-                v-for="item in warehouseList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="disabled">
+            <el-form-item :label="t('MoldManagement.MoldReturn.warehouse')" prop="warehouseId">
+              <el-select
+                v-model="formData.warehouseId"
+                clearable
+                filterable
+                :placeholder="t('MoldManagement.MoldReturn.placeholderWarehouse')"
+                class="!w-240px"
+                disabled
+              >
+                <el-option
+                  v-for="item in warehouseList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldGet.attachment')" prop="fileUrl">
+              <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="t('MoldManagement.MoldGet.remarkSingle')" prop="remark">
+              <el-input
+                type="textarea"
+                v-model="formData.remark"
+                :placeholder="t('MoldManagement.MoldGet.placeholderRemark')"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldGet.attachment')" prop="fileUrl">
-            <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item :label="t('MoldManagement.MoldGet.remarkSingle')" prop="remark">
-            <el-input
-              type="textarea"
-              v-model="formData.remark"
-              :placeholder="t('MoldManagement.MoldGet.placeholderRemark')"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!-- 子表的表单 -->
-    <ContentWrap>
-      <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
-        <el-tab-pane :label="t('MoldManagement.MoldGet.itemListTitle')" name="item">
-          <StockOutItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
-    </ContentWrap>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!disabled">
-        {{ t('action.save') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 子表的表单 -->
+      <ContentWrap>
+        <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
+          <el-tab-pane :label="t('MoldManagement.MoldGet.itemListTitle')" name="item">
+            <StockOutItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
+          </el-tab-pane>
+        </el-tabs>
+      </ContentWrap>
+    </div>
+
+    <div class="mold-get-footer">
+      <el-button @click="closeForm">{{ t('common.cancel') }}</el-button>
+      <el-button v-if="!disabled" @click="submitForm" type="primary" :disabled="formLoading">
+        {{ t('common.ok') }}
       </el-button>
-      <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
-    </template>
-  </Dialog>
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
 import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
@@ -131,7 +121,6 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
@@ -179,7 +168,6 @@ const getTodayTimestamp = () => new Date().setHours(0, 0, 0, 0)
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
@@ -204,8 +192,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()
@@ -252,7 +244,7 @@ const submitForm = async () => {
       await StockOutApi.updateStockOut(data)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
+    closeForm()
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -275,3 +267,57 @@ const resetForm = () => {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.mold-get-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.mold-get-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.mold-get-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.mold-get-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.mold-get-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-get-panel__header {
+    padding: 14px 16px;
+  }
+
+  .mold-get-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .mold-get-footer {
+    padding: 16px;
+  }
+}
+</style>
diff --git a/src/views/mes/moldget/index.vue b/src/views/mes/moldget/index.vue
index e5ab245b..ad033595 100644
--- a/src/views/mes/moldget/index.vue
+++ b/src/views/mes/moldget/index.vue
@@ -1,6 +1,8 @@
 <template>
 
-  <ContentWrap>
+  <div class="mold-get-page">
+    <template v-if="!formVisible">
+      <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
@@ -260,9 +262,11 @@
       @pagination="getList"
     />
   </ContentWrap>
+    </template>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <MoldGetForm ref="formRef" @success="getList" />
+    <!-- 表单：添加/修改 -->
+    <MoldGetForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -340,8 +344,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/moldreturn/MoldReturnForm.vue b/src/views/mes/moldreturn/MoldReturnForm.vue
index 04503e9a..a6a7383e 100644
--- a/src/views/mes/moldreturn/MoldReturnForm.vue
+++ b/src/views/mes/moldreturn/MoldReturnForm.vue
@@ -1,103 +1,111 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-      v-loading="formLoading"
-      :disabled="disabled"
-    >
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldReturn.inType')" prop="inType">
-            <el-select
-              v-model="formData.inType"
-              clearable
-              filterable
-              :placeholder="t('MoldManagement.MoldReturn.placeholderInType')"
-              class="!w-1/1"
-              disabled
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+  <div class="mold-return-panel">
+    <div class="mold-return-panel__header">
+      <div class="mold-return-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="mold-return-dialog" v-loading="formLoading">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="110px"
+        :disabled="disabled"
+      >
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldReturn.inType')" prop="inType">
+              <el-select
+                v-model="formData.inType"
+                clearable
+                filterable
+                :placeholder="t('MoldManagement.MoldReturn.placeholderInType')"
+                class="!w-1/1"
+                disabled
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldReturn.inNo')" prop="no">
+              <el-input
+                disabled
+                v-model="formData.no"
+                :placeholder="t('MoldManagement.MoldReturn.placeholderInNoAuto')"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldReturn.inNo')" prop="no">
-            <el-input
-              disabled
-              v-model="formData.no"
-              :placeholder="t('MoldManagement.MoldReturn.placeholderInNoAuto')"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldReturn.inTimeSingle')" prop="inTime">
-            <el-date-picker
-              v-model="formData.inTime"
-              type="date"
-              value-format="x"
-              :placeholder="t('MoldManagement.MoldReturn.placeholderInTime')"
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="disabled">
-          <el-form-item :label="t('MoldManagement.MoldReturn.warehouse')" prop="warehouseId">
-            <el-select
-              v-model="formData.warehouseId"
-              clearable
-              filterable
-              :placeholder="t('MoldManagement.MoldReturn.placeholderWarehouse')"
-              class="!w-240px"
-              disabled
-            >
-              <el-option
-                v-for="item in warehouseList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldReturn.inTimeSingle')" prop="inTime">
+              <el-date-picker
+                v-model="formData.inTime"
+                type="date"
+                value-format="x"
+                :placeholder="t('MoldManagement.MoldReturn.placeholderInTime')"
+                class="!w-1/1"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="t('MoldManagement.MoldReturn.attachment')" prop="fileUrl">
-            <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
-          </el-form-item>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="disabled">
+            <el-form-item :label="t('MoldManagement.MoldReturn.warehouse')" prop="warehouseId">
+              <el-select
+                v-model="formData.warehouseId"
+                clearable
+                filterable
+                :placeholder="t('MoldManagement.MoldReturn.placeholderWarehouse')"
+                class="!w-240px"
+                disabled
+              >
+                <el-option
+                  v-for="item in warehouseList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
-          <el-col :span="24">
-          <el-form-item :label="t('MoldManagement.MoldReturn.remarkSingle')" prop="remark">
-            <el-input
-              type="textarea"
-              v-model="formData.remark"
-              :placeholder="t('MoldManagement.MoldReturn.placeholderRemark')"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!-- 子表的表单 -->
-    <ContentWrap>
-      <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
-        <el-tab-pane :label="t('MoldManagement.MoldReturn.itemListTitle')" name="item">
-          <StockInItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
-    </ContentWrap>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!disabled">
-        {{ t('action.save') }}
+          <el-col :span="8">
+            <el-form-item :label="t('MoldManagement.MoldReturn.attachment')" prop="fileUrl">
+              <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="24">
+            <el-form-item :label="t('MoldManagement.MoldReturn.remarkSingle')" prop="remark">
+              <el-input
+                type="textarea"
+                v-model="formData.remark"
+                :placeholder="t('MoldManagement.MoldReturn.placeholderRemark')"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 子表的表单 -->
+      <ContentWrap>
+        <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
+          <el-tab-pane :label="t('MoldManagement.MoldReturn.itemListTitle')" name="item">
+            <StockInItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
+          </el-tab-pane>
+        </el-tabs>
+      </ContentWrap>
+    </div>
+
+    <div class="mold-return-footer">
+      <el-button @click="closeForm">{{ t('common.cancel') }}</el-button>
+      <el-button v-if="!disabled" @click="submitForm" type="primary" :disabled="formLoading">
+        {{ t('common.ok') }}
       </el-button>
-      <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
-    </template>
-  </Dialog>
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
 import { StockInApi, StockInVO } from '@/api/erp/stock/in'
@@ -112,7 +120,6 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
@@ -160,7 +167,6 @@ const getTodayTimestamp = () => new Date().setHours(0, 0, 0, 0)
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
@@ -185,8 +191,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()
@@ -233,7 +243,7 @@ const submitForm = async () => {
       await StockInApi.updateStockIn(data)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
+    closeForm()
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -256,3 +266,57 @@ const resetForm = () => {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.mold-return-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.mold-return-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.mold-return-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.mold-return-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.mold-return-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-return-panel__header {
+    padding: 14px 16px;
+  }
+
+  .mold-return-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .mold-return-footer {
+    padding: 16px;
+  }
+}
+</style>
diff --git a/src/views/mes/moldreturn/index.vue b/src/views/mes/moldreturn/index.vue
index 77993fb8..114ad4b2 100644
--- a/src/views/mes/moldreturn/index.vue
+++ b/src/views/mes/moldreturn/index.vue
@@ -1,5 +1,8 @@
 <template>
-  <ContentWrap>
+
+  <div class="mold-return-page">
+    <template v-if="!formVisible">
+      <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
@@ -257,9 +260,11 @@
       @pagination="getList"
     />
   </ContentWrap>
+    </template>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <MoldReturnForm ref="formRef" @success="getList" />
+    <!-- 表单：添加/修改 -->
+    <MoldReturnForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -335,8 +340,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)
 }
 
 /** 删除按钮操作 */