diff --git a/src/components/TableSelectDialog/TableSelectDialog.vue b/src/components/TableSelectDialog/TableSelectDialog.vue
index edc0cfab..59fa63dc 100644
--- a/src/components/TableSelectDialog/TableSelectDialog.vue
+++ b/src/components/TableSelectDialog/TableSelectDialog.vue
@@ -19,13 +19,18 @@
         <el-table-column type="selection" width="55" reserve-selection />
         <el-table-column
           v-for="column in columns"
-          :key="column.prop"
+          :key="column.prop || column.slotName"
           :label="column.label"
-          :prop="column.prop"
+          :prop="column.slotName ? undefined : column.prop"
           :width="column.width"
           :min-width="column.minWidth"
           :align="column.align || 'center'"
-        />
+          :fixed="column.fixed"
+        >
+          <template v-if="column.slotName" #default="scope">
+            <slot :name="column.slotName" :row="scope.row"></slot>
+          </template>
+        </el-table-column>
       </el-table>
       <Pagination
         v-model:page="queryParams.pageNo"
@@ -48,10 +53,12 @@ defineOptions({ name: 'TableSelectDialog' })
 
 type TableColumn = {
   label: string
-  prop: string
+  prop?: string
+  slotName?: string
   width?: string | number
   minWidth?: string | number
   align?: 'left' | 'center' | 'right'
+  fixed?: string | boolean
 }
 
 const props = withDefaults(
diff --git a/src/views/mes/moldoperate/MoldOperateForm.vue b/src/views/mes/moldoperate/MoldOperateForm.vue
index e22ed40e..3d289ec1 100644
--- a/src/views/mes/moldoperate/MoldOperateForm.vue
+++ b/src/views/mes/moldoperate/MoldOperateForm.vue
@@ -18,7 +18,11 @@
                   :placeholder="t('MoldManagement.MoldOperate.placeholderDevice')"
                   @click="openCriticalComponentDialog"   />
       </el-form-item>
-      <el-form-item :label="t('MoldManagement.MoldOperate.mold')" prop="moldId" v-if="formData.operateType != null">
+      <el-form-item :label="t('MoldManagement.MoldOperate.productionLine')" prop="lineId" v-if="formData.operateType != null">
+        <el-input :model-value="displayLineName" readonly />
+      </el-form-item>
+      <!-- 上模：手动选择模具 -->
+      <el-form-item :label="t('MoldManagement.MoldOperate.mold')" prop="moldId" v-if="formData.operateType == 1">
         <el-input
           :model-value="moldDisplayText"
           :placeholder="t('MoldManagement.MoldOperate.placeholderMold')"
@@ -26,8 +30,9 @@
           @click="openMoldSelectDialog"
         />
       </el-form-item>
-      <el-form-item :label="t('MoldManagement.MoldOperate.productionLine')" prop="lineId" v-if="formData.operateType != null">
-        <el-input :model-value="displayLineName" readonly />
+      <!-- 下模：自动带出该设备的在机模具 -->
+      <el-form-item label="在机模具" v-if="formData.operateType == 2">
+        <el-input :model-value="currentDeviceMoldText" readonly />
       </el-form-item>
       <el-form-item :label="t('MoldManagement.MoldOperate.operateTime')" prop="operateTime">
         <el-date-picker
@@ -78,6 +83,16 @@
         </el-form-item>
       </el-form>
     </template>
+    <!-- 操作列：对有在机模具的设备显示下模按钮 -->
+    <template #deviceAction="{ row }">
+      <el-button
+        v-if="row.moldGroup"
+        type="danger"
+        link
+        size="small"
+        @click.stop="openDownMoldDialog(row)"
+      >下模</el-button>
+    </template>
   </TableSelectDialog>
 
   <TableSelectDialog
@@ -105,7 +120,47 @@
         </el-form-item>
       </el-form>
     </template>
+    <!-- 状态列插槽：将数字转为中文 -->
+    <template #moldStatus="{ row }">
+      {{ moldStatusMap[row.status] || row.status }}
+    </template>
   </TableSelectDialog>
+
+  <!-- 下模弹窗 -->
+  <Dialog title="设备下模" v-model="downMoldDialogVisible" width="580px">
+    <el-form ref="downMoldFormRef" :model="downMoldForm" :rules="downMoldFormRules" label-width="100px" v-loading="downMoldLoading">
+      <el-form-item label="设备">
+        <el-input :model-value="downMoldTarget?.deviceName || ''" disabled />
+      </el-form-item>
+      <el-form-item label="在机模具">
+        <div v-if="downMoldTargetMolds.length">
+          <el-tag v-for="mold in downMoldTargetMolds" :key="mold.id" class="mr-5px mb-5px">{{ mold.name }}</el-tag>
+        </div>
+        <span v-else class="text-gray-400">暂无在机模具</span>
+      </el-form-item>
+      <el-form-item label="操作员" prop="operatorId">
+        <el-select v-model="downMoldForm.operatorId" filterable clearable placeholder="请选择操作员" class="!w-full">
+          <el-option v-for="item in operatorOptions" :key="item.id" :label="item.nickname" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="操作时间" prop="operateTime">
+        <el-date-picker
+          v-model="downMoldForm.operateTime"
+          type="datetime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="选择操作时间"
+          class="!w-full"
+        />
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="downMoldForm.remark" type="textarea" :rows="2" placeholder="可选备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="downMoldDialogVisible = false">取 消</el-button>
+      <el-button type="primary" :loading="downMoldLoading" @click="confirmDownMold">确 认</el-button>
+    </template>
+  </Dialog>
 </template>
 <script setup lang="ts">
 import { MoldOperateApi } from '@/api/mes/moldoperate'
@@ -113,6 +168,7 @@ import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
 import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
 import { DeviceLineApi, DeviceLineTreeVO } from '@/api/mes/deviceline'
 import { getSimpleUserList, type UserVO } from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
 import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
 
 /** 模具上下模 表单 */
@@ -120,6 +176,7 @@ defineOptions({ name: 'MoldOperateForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const { user: currentUser } = useUserStore() // 当前登录用户
 
 const deviceLineTree = ref<DeviceLineTreeVO[]>([])
 const displayTopCategory = ref('')
@@ -168,7 +225,6 @@ const validateMoldId = (_rule: any, value: any, callback: (error?: Error) => voi
 const formRules = reactive({
   operateType: [{ required: true, message: t('MoldManagement.MoldOperate.validatorOperateTypeRequired'), trigger: 'blur' }],
   deviceId: [{ required: true, message: t('MoldManagement.MoldOperate.validatorDeviceRequired'), trigger: 'change' }],
-  moldId: [{ required: true, validator: validateMoldId, trigger: 'change' }],
   operateTime: [{ required: true, message: t('MoldManagement.MoldOperate.validatorOperateTimeRequired'), trigger: 'blur' }],
   operatorId: [{ required: true, message: t('MoldManagement.MoldOperate.validatorOperatorRequired'), trigger: 'change' }],
 })
@@ -181,11 +237,12 @@ const open = async (type: string, id?: number) => {
   formType.value = type
   resetForm()
   initSelectedItems()
-  // 新增时默认设置操作时间为当前时间
+  // 新增时默认设置操作时间为当前时间、操作人为当前登录用户
   if (type === 'create') {
     const now = new Date()
     const pad = (n: number) => String(n).padStart(2, '0')
     formData.value.operateTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
+    formData.value.operatorId = currentUser.id
   }
   await ensureLineOptionsLoaded()
   // 修改时，设置数据
@@ -248,7 +305,6 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
 // }
 
 const submitForm = async () => {
-  // 立即开始 loading
   formLoading.value = true
 
   try {
@@ -257,35 +313,62 @@ const submitForm = async () => {
 
     // 2. 组装提交数据
     const raw = formData.value as any
-    const submitData: any = {
-      id: raw.id,
-      operateType: raw.operateType,
-      deviceId: raw.deviceId,
-      moldId: raw.moldId,
-      lineId: raw.lineId,
-      lineName: displayTopCategory.value, // 产线名称，用于列表显示
-      operateTime: raw.operateTime,
-      operatorId: raw.operatorId,
-      remark: raw.remark,
+    const isDown = String(raw.operateType) === '2'
+
+    // 下模校验：设备必须有在机模具
+    if (isDown && !currentDeviceMolds.value.length) {
+      message.warning('该设备暂无在机模具，无法下模')
+      formLoading.value = false
+      return
     }
 
     // 3. 提交数据
     if (formType.value === 'create') {
-      await MoldOperateApi.createMoldOperate(submitData)
+      if (isDown) {
+        // 下模：对每个在机模具创建一条记录
+        const promises = currentDeviceMolds.value.map((mold: any) =>
+          MoldOperateApi.createMoldOperate({
+            operateType: raw.operateType,
+            deviceId: raw.deviceId,
+            moldId: mold.id,
+            lineId: raw.lineId,
+            lineName: displayTopCategory.value,
+            operateTime: raw.operateTime,
+            operatorId: raw.operatorId,
+            remark: raw.remark,
+            id: undefined as any
+          } as any)
+        )
+        await Promise.all(promises)
+      } else {
+        // 上模：单条创建
+        await MoldOperateApi.createMoldOperate({
+          id: raw.id,
+          operateType: raw.operateType,
+          deviceId: raw.deviceId,
+          moldId: raw.moldId,
+          lineId: raw.lineId,
+          lineName: displayTopCategory.value,
+          operateTime: raw.operateTime,
+          operatorId: raw.operatorId,
+          remark: raw.remark,
+        })
+      }
       message.success(t('common.createSuccess'))
     } else {
-      await MoldOperateApi.updateMoldOperate(submitData)
+      await MoldOperateApi.updateMoldOperate(raw)
       message.success(t('common.updateSuccess'))
     }
 
     // 4. 成功处理
+    deviceMoldLoaded.value = false
+    deviceMoldMap.value = new Map()
     dialogVisible.value = false
     emit('success')
 
   } catch (error) {
 
   } finally {
-    // 确保 loading 状态被清除
     formLoading.value = false
   }
 }
@@ -349,25 +432,112 @@ const resetForm = () => {
   displayTopCategory.value = ''
   formRef.value?.resetFields()
 }
-const deviceColumns = [
-  { label: '设备编号', prop: 'deviceCode', minWidth: 140 },
-  { label: '设备名称', prop: 'deviceName', minWidth: 160 },
-  { label: '设备型号', prop: 'deviceModel', minWidth: 140 },
-  { label: '所属车间', prop: 'workshop', minWidth: 140 }
-]
+const deviceColumns = computed(() => {
+  const baseColumns = [
+    { label: '设备编号', prop: 'deviceCode', minWidth: 140 },
+    { label: '设备名称', prop: 'deviceName', minWidth: 160 },
+    { label: '设备型号', prop: 'deviceModel', minWidth: 140 },
+    { label: '所属产线', prop: 'lineName', minWidth: 140 },
+    { label: '模具组', prop: 'moldGroup', minWidth: 180 }
+  ]
+  // 上模时显示操作列（下模按钮），下模时不显示
+  if (String(formData.value.operateType) !== '2') {
+    baseColumns.push({ label: '操作', slotName: 'deviceAction', width: 80, fixed: 'right' })
+  }
+  return baseColumns
+})
+
+// 模具状态映射
+const moldStatusMap: Record<number, string> = {
+  0: '在机',
+  1: '待用',
+}
 
 const moldColumns = [
   { label: '模具编码', prop: 'code', minWidth: 140 },
   { label: '模具名称', prop: 'name', minWidth: 160 },
   { label: '版本', prop: 'version', minWidth: 100 },
-  { label: '状态', prop: 'status', minWidth: 100 }
+  { label: '状态', slotName: 'moldStatus', minWidth: 100 }
 ]
 
-const fetchDeviceLedgerPage = (params: Record<string, any>) => {
-  return DeviceLedgerApi.getDeviceLedgerPage({
+// 模具缓存：deviceName → 模具型号列表（与 APP 端一致，用 deviceName 匹配）
+const deviceMoldMap = ref<Map<string, any[]>>(new Map())
+const deviceMoldLoaded = ref(false)
+
+/** 从产线树中根据 deviceLine id 查找顶级分类（根节点）名称，与外层表单产线显示逻辑一致 */
+const resolveTopCategoryName = (deviceLineId: string | number | undefined): string => {
+  if (deviceLineId == null || deviceLineId === '') return ''
+  if (!deviceLineTree.value.length) return ''
+  const targetId = Number(deviceLineId)
+  const containsId = (nodes: any[] | undefined, id: number): boolean => {
+    if (!nodes) return false
+    return nodes.some((n) => n.id === id || containsId(n.children, id))
+  }
+  for (const root of deviceLineTree.value) {
+    if (root.id === targetId || containsId(root.children, targetId)) {
+      return root.name
+    }
+  }
+  return ''
+}
+
+/** 批量加载设备在机模具，缓存到 deviceMoldMap（deviceName → 模具型号列表），与 APP 端逻辑一致 */
+const loadDeviceMolds = async () => {
+  if (deviceMoldLoaded.value) return
+  try {
+    // 用模具型号分页接口，pageSize 最大 100
+    const res: any = await MoldBrandApi.getMoldBrandPage({ pageSize: 100 })
+    const allMolds = res?.list ?? res?.pageResult?.list ?? []
+    const map = new Map<string, any[]>()
+    if (Array.isArray(allMolds)) {
+      allMolds.forEach((mold: any) => {
+        const deviceName = mold.deviceName
+        if (!deviceName) return
+        if (!map.has(deviceName)) map.set(deviceName, [])
+        map.get(deviceName)!.push(mold)
+      })
+    }
+    deviceMoldMap.value = map
+    deviceMoldLoaded.value = true
+  } catch {
+    deviceMoldMap.value = new Map()
+    deviceMoldLoaded.value = true
+  }
+}
+
+const fetchDeviceLedgerPage = async (params: Record<string, any>) => {
+  const data = await DeviceLedgerApi.getDeviceLedgerPage({
     ...params,
     isScheduled: 1
   })
+  const list = data.list || []
+  const total = data.total || 0
+
+  if (list.length) {
+    // 确保产线树已加载
+    await ensureLineOptionsLoaded()
+    // 确保模具数据已加载
+    await loadDeviceMolds()
+
+    list.forEach((item: any) => {
+      // 所属产线：找根节点名称，与外层产线显示一致
+      item.lineName = resolveTopCategoryName(item.deviceLine) || item.topCategoryName || ''
+
+      // 模具组：用 deviceName 匹配模具型号（与 APP 端逻辑一致）
+      const molds = deviceMoldMap.value.get(item.deviceName) || []
+      item.moldGroup = molds.length
+        ? molds.map((m: any) => m.name || '').filter(Boolean).join('、')
+        : ''
+    })
+
+    // 下模时只展示有在机模具的设备，上模时展示全部
+    if (String(formData.value.operateType) === '2') {
+      const filteredList = list.filter((item: any) => item.moldGroup)
+      return { list: filteredList, total: filteredList.length }
+    }
+  }
+
+  return { list, total }
 }
 
 const fetchMoldBrandPage = async (params: Record<string, any>) => {
@@ -513,8 +683,90 @@ const moldDisplayText = computed(() => {
 
 const displayLineName = computed(() => displayTopCategory.value)
 
+// 当前选中设备的在机模具列表（下模时自动带出）
+const currentDeviceMolds = computed(() => {
+  if (!selectedDeviceRows.value.length) return []
+  const deviceName = selectedDeviceRows.value[0]?.deviceName
+  if (!deviceName) return []
+  return deviceMoldMap.value.get(deviceName) || []
+})
+
+// 在机模具显示文本
+const currentDeviceMoldText = computed(() => {
+  const molds = currentDeviceMolds.value
+  return molds.length ? molds.map((m: any) => m.name).join('、') : ''
+})
+
+// ========== 下模功能 ==========
+const downMoldDialogVisible = ref(false)
+const downMoldLoading = ref(false)
+const downMoldTarget = ref<any>(null)
+const downMoldFormRef = ref()
+const downMoldForm = reactive({
+  moldIds: [] as number[],
+  operatorId: undefined as number | undefined,
+  operateTime: '',
+  remark: ''
+})
+const downMoldFormRules = reactive({
+  operatorId: [{ required: true, message: '请选择操作员', trigger: 'change' }],
+  operateTime: [{ required: true, message: '请选择操作时间', trigger: 'change' }]
+})
 
+// 当前要下模设备上的模具列表
+const downMoldTargetMolds = computed(() => {
+  if (!downMoldTarget.value) return []
+  return deviceMoldMap.value.get(downMoldTarget.value.deviceName) || []
+})
 
+/** 打开下模弹窗 */
+const openDownMoldDialog = (row: any) => {
+  downMoldTarget.value = row
+  const molds = deviceMoldMap.value.get(row.deviceName) || []
+  downMoldForm.moldIds = molds.map((m: any) => m.id)
+  downMoldForm.operatorId = currentUser.id
+  downMoldForm.remark = ''
+  const now = new Date()
+  const pad = (n: number) => String(n).padStart(2, '0')
+  downMoldForm.operateTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
+  downMoldDialogVisible.value = true
+  nextTick(() => downMoldFormRef.value?.clearValidate?.())
+}
+
+/** 确认下模 */
+const confirmDownMold = async () => {
+  await downMoldFormRef.value?.validate()
+  downMoldLoading.value = true
+  try {
+    const target = downMoldTarget.value
+    const promises = downMoldForm.moldIds.map((moldId) =>
+      MoldOperateApi.createMoldOperate({
+        operateType: '2', // 下模
+        deviceId: target.id,
+        moldId,
+        operateTime: downMoldForm.operateTime,
+        operatorId: downMoldForm.operatorId!,
+        remark: downMoldForm.remark,
+        lineId: undefined,
+        lineName: target.lineName || target.topCategoryName || '',
+        id: undefined as any
+      } as any)
+    )
+    await Promise.all(promises)
+    message.success('下模成功')
+    downMoldDialogVisible.value = false
+    // 重置模具缓存，强制重新加载
+    deviceMoldLoaded.value = false
+    deviceMoldMap.value = new Map()
+    // 刷新设备列表（模具组数据会更新）
+    deviceSelectDialogRef.value?.reload?.()
+  } catch (e: any) {
+    const msg = e?.message || e?.data?.msg || '下模失败'
+    message.error(String(msg).substring(0, 50))
+  } finally {
+    downMoldLoading.value = false
+  }
+}
 
 const openCriticalComponentDialog = async () => {
   searchParams.deviceCode=''
@@ -555,3 +807,5 @@ const initSelectedItems = async () => {
   }
 }
 </script>
+
+