diff --git a/src/views/mes/moldget/MoldGetForm.vue b/src/views/mes/moldget/MoldGetForm.vue
index 3a2e3070..a27bf881 100644
--- a/src/views/mes/moldget/MoldGetForm.vue
+++ b/src/views/mes/moldget/MoldGetForm.vue
@@ -66,24 +66,25 @@
             />
           </el-form-item>
         </el-col>
-              <el-col :span="8">
-<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"
-        >
-          <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" 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" />
@@ -168,6 +169,12 @@ const options = [
 const subTabsName = ref('item')
 const itemFormRef = ref()
 
+const ensureWarehouseId = () => {
+  if (formData.value.warehouseId !== undefined && formData.value.warehouseId !== null) return
+  const defaultWarehouse = (warehouseList.value ?? []).find((w: any) => w?.defaultStatus)
+  formData.value.warehouseId = defaultWarehouse?.id ?? (warehouseList.value?.[0] as any)?.id
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -191,6 +198,7 @@ const open = async (type: string, id?: number) => {
   // 加载客户列表
   customerList.value = await CustomerApi.getCustomerSimpleList()
     warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  ensureWarehouseId()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -259,7 +267,8 @@ const resetForm = () => {
     remark: undefined,
     fileUrl: undefined,
     items: [],
-    outType: "模具出库"
+    outType: "模具出库",
+    warehouseId: undefined
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/mes/moldreturn/MoldReturnForm.vue b/src/views/mes/moldreturn/MoldReturnForm.vue
index 271b9bc3..ac09da7b 100644
--- a/src/views/mes/moldreturn/MoldReturnForm.vue
+++ b/src/views/mes/moldreturn/MoldReturnForm.vue
@@ -48,24 +48,25 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-<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"
-        >
-          <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" 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.MoldReturn.attachment')" prop="fileUrl">
             <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
@@ -149,6 +150,12 @@ const options = [
 const subTabsName = ref('item')
 const itemFormRef = ref()
 
+const ensureWarehouseId = () => {
+  if (formData.value.warehouseId !== undefined && formData.value.warehouseId !== null) return
+  const defaultWarehouse = (warehouseList.value ?? []).find((w: any) => w?.defaultStatus)
+  formData.value.warehouseId = defaultWarehouse?.id ?? (warehouseList.value?.[0] as any)?.id
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -172,6 +179,7 @@ const open = async (type: string, id?: number) => {
   // 加载客户列表
   customerList.value = await CustomerApi.getCustomerSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  ensureWarehouseId()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗