From 78688a73586f17eaa69b0e8dc78a01de9c3a2fba Mon Sep 17 00:00:00 2001
From: zhongwenkai <3478244299@qq.com>
Date: Wed, 10 Jun 2026 10:33:47 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=A8=A1=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E4=B8=8A=E4=B8=8B=E6=A8=A1=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/moldoperate.js                    |    4 +-
 src/components/common/PermissionMenuPage.vue  |    1 +
 src/locales/en-US.js                          |   31 +-
 src/locales/index.js                          |    2 +
 src/locales/zh-CN.js                          |   31 +-
 src/pages.json                                |   23 +-
 .../pages/moldoperate/deviceSelect.vue        |  366 +++++
 .../pages/moldoperate/dismount.vue            |  733 ++++++++++
 .../pages/moldoperate/index.vue               | 1214 +++++++----------
 .../pages/moldoperate/moldSelect.vue          |  351 +++++
 src/utils/permissionMenu.js                   |   43 +-
 src/utils/request.ts                          |    7 +-
 12 files changed, 2045 insertions(+), 761 deletions(-)
 create mode 100644 src/pages_function/pages/moldoperate/deviceSelect.vue
 create mode 100644 src/pages_function/pages/moldoperate/dismount.vue
 create mode 100644 src/pages_function/pages/moldoperate/moldSelect.vue

diff --git a/src/api/mes/moldoperate.js b/src/api/mes/moldoperate.js
index 8ecd716..5ed7229 100644
--- a/src/api/mes/moldoperate.js
+++ b/src/api/mes/moldoperate.js
@@ -50,8 +50,8 @@ export function getLowerMoldList(id) {
 
 export function getDeviceLedgerList(params = {}) {
   return request({
-    url: '/admin-api/mes/device-ledger/list',
+    url: '/admin-api/mes/device-ledger/page',
     method: 'get',
-    params
+    params: { pageNo: params.pageNo || 1, pageSize: params.pageSize || 100, ...params }
   })
 }
diff --git a/src/components/common/PermissionMenuPage.vue b/src/components/common/PermissionMenuPage.vue
index b468d99..8e1b115 100644
--- a/src/components/common/PermissionMenuPage.vue
+++ b/src/components/common/PermissionMenuPage.vue
@@ -211,6 +211,7 @@ function getUviewIconName(icon) {
 
 function handleClick(menu) {
   const url = resolveMenuUrl(menu)
+  console.log('[PermissionMenu] 点击菜单:', menu?.name, '| _splitKey:', menu?._splitKey, '| 路由:', url)
   if (url) {
     uni.navigateTo({ url })
     return
diff --git a/src/locales/en-US.js b/src/locales/en-US.js
index 89dcbf1..79f8846 100644
--- a/src/locales/en-US.js
+++ b/src/locales/en-US.js
@@ -183,6 +183,7 @@ export default {
     search: 'Search',
     reset: 'Reset',
     cancel: 'Cancel',
+    confirm: 'Confirm',
     save: 'Save',
     loading: 'Loading...',
     loadingMore: 'Loading more...',
@@ -339,7 +340,35 @@ export default {
     validatorMoldRequired: 'Select at least one mold for mounting',
     validatorLowerMoldRequired: 'Select at least one mold for dismounting',
     loadEditFailed: 'Failed to load edit data',
-    confirmDelete: 'Confirm delete this mold operate record?'
+    confirmDelete: 'Confirm delete this mold operate record?',
+    scanDevice: 'Scan Device',
+    selectDevice: 'Select Device',
+    selectedDevice: 'Selected Device',
+    deviceCode: 'Device Code',
+    productionLine: 'Production Line',
+    currentMold: 'Current Mold',
+    deviceStatus: 'Device Status',
+    statusRunning: 'Running',
+    statusStop: 'Stopped',
+    statusFault: 'Fault',
+    selectMountMold: 'Select Mold to Mount',
+    product: 'Product',
+    status: 'Status',
+    pendingMount: 'Pending Mount',
+    confirmMount: 'Confirm Mount',
+    clickSelectMold: 'Click to select mold',
+    noDeviceData: 'No device data',
+    deviceNotFound: 'Device not found',
+    deviceInfo: 'Device Info',
+    currentMoldInfo: 'Current Mold on Machine',
+    mountTime: 'Mount Time',
+    useCount: 'Usage Count',
+    countUnit: '',
+    changeMountTarget: 'Change Mount Target',
+    changeTarget: 'Change Dismount Target',
+    confirmDismount: 'Confirm Dismount',
+    clickSelectDeviceFirst: 'Please select a device first',
+    noMoldOnDevice: 'No mold on this device'
   },
   moldInspectionItems: {
     moduleName: 'Inspection Items',
diff --git a/src/locales/index.js b/src/locales/index.js
index 7d2c852..0f309b8 100644
--- a/src/locales/index.js
+++ b/src/locales/index.js
@@ -106,6 +106,8 @@ const literalMap = {
   '模具入库': 'moldReturn.moduleName',
   '模具入库详情': 'moldReturn.detailTitle',
   '上下模': 'moldOperate.moduleName',
+  '上模': 'moldOperate.tabUp',
+  '下模': 'moldOperate.tabDown',
   '上下模详情': 'moldOperate.detailTitle',
   '点检项库': 'moldInspectionItems.moduleName',
   '点检项库详情': 'moldInspectionItems.detailTitle',
diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index 55b3315..3dcec29 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -183,6 +183,7 @@ export default {
     search: '查询',
     reset: '重置',
     cancel: '取消',
+    confirm: '确认',
     save: '保存',
     loading: '加载中...',
     loadingMore: '正在加载更多...',
@@ -339,7 +340,35 @@ export default {
     validatorMoldRequired: '请至少选择一个上模模具',
     validatorLowerMoldRequired: '请至少选择一个下模模具',
     loadEditFailed: '加载编辑数据失败',
-    confirmDelete: '确认删除该上下模记录吗？'
+    confirmDelete: '确认删除该上下模记录吗？',
+    scanDevice: '扫设备码',
+    selectDevice: '选择设备',
+    selectedDevice: '已选设备',
+    deviceCode: '设备编码',
+    productionLine: '所属产线',
+    currentMold: '当前在机模具',
+    deviceStatus: '设备状态',
+    statusRunning: '运行中',
+    statusStop: '已停止',
+    statusFault: '故障',
+    selectMountMold: '选择待上模模具',
+    product: '产品',
+    status: '状态',
+    pendingMount: '待上模',
+    confirmMount: '确认上模',
+    clickSelectMold: '点击选择模具',
+    noDeviceData: '暂无设备数据',
+    deviceNotFound: '未找到对应设备',
+    deviceInfo: '设备信息',
+    currentMoldInfo: '当前在机模具',
+    mountTime: '上模时间',
+    useCount: '使用次数',
+    countUnit: '次',
+    changeMountTarget: '更换上模对象',
+    changeTarget: '更换下模对象',
+    confirmDismount: '确认下模',
+    clickSelectDeviceFirst: '请先选择设备',
+    noMoldOnDevice: '该设备暂无在机模具'
   },
   moldInspectionItems: {
     moduleName: '点检项库',
diff --git a/src/pages.json b/src/pages.json
index 36ea8fe..d7a1c5f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -578,7 +578,7 @@
         {
           "path": "moldoperate/index",
           "style": {
-            "navigationBarTitleText": "上下模",
+            "navigationBarTitleText": "上模",
             "navigationStyle": "custom"
           }
         },
@@ -589,6 +589,27 @@
             "navigationStyle": "custom"
           }
         },
+        {
+          "path": "moldoperate/dismount",
+          "style": {
+            "navigationBarTitleText": "下模",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "moldoperate/deviceSelect",
+          "style": {
+            "navigationBarTitleText": "选择设备",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "moldoperate/moldSelect",
+          "style": {
+            "navigationBarTitleText": "选择待上模模具",
+            "navigationStyle": "custom"
+          }
+        },
         {
           "path": "moldRepair/index",
           "style": {
diff --git a/src/pages_function/pages/moldoperate/deviceSelect.vue b/src/pages_function/pages/moldoperate/deviceSelect.vue
new file mode 100644
index 0000000..8ff61e4
--- /dev/null
+++ b/src/pages_function/pages/moldoperate/deviceSelect.vue
@@ -0,0 +1,366 @@
+<template>
+  <view class="page-container">
+    <NavBar :title="t('moldOperate.selectDevice')" />
+
+    <!-- 搜索区 -->
+    <view class="search-bar">
+      <view class="search-input-wrap">
+        <text class="search-icon iconfont icon-search"></text>
+        <input class="search-input" v-model="searchText" :placeholder="t('equipmentLedger.placeholderDeviceName')" @input="onSearch" placeholder-class="search-placeholder" />
+        <text v-if="searchText" class="search-clear" @click="clearSearch">✕</text>
+      </view>
+    </view>
+
+    <!-- 设备列表 -->
+    <scroll-view scroll-y class="device-list" v-if="filteredList.length > 0">
+      <view
+        v-for="device in filteredList"
+        :key="device.id"
+        class="device-card"
+        :class="{ active: selectedId === device.id }"
+        @click="selectedId = device.id"
+      >
+        <view class="device-card-header">
+          <text class="device-name">{{ textValue(device.deviceName) }}</text>
+          <view class="device-status-tag" :class="getStatusClass(device.deviceStatus)">
+            {{ getStatusLabel(device) }}
+          </view>
+        </view>
+        <view class="device-card-body">
+          <view class="device-info-row">
+            <text class="info-label">{{ t('moldOperate.deviceCode') }}</text>
+            <text class="info-value">{{ textValue(device.deviceCode) }}</text>
+          </view>
+          <view class="device-info-row">
+            <text class="info-label">{{ t('moldOperate.productionLine') }}</text>
+            <text class="info-value">{{ textValue(device.workshopName) }}</text>
+          </view>
+          <view class="device-info-row">
+            <text class="info-label">{{ t('moldOperate.currentMold') }}</text>
+            <text class="info-value">{{ getCurrentMold(device) }}</text>
+          </view>
+          <view class="device-info-row">
+            <text class="info-label">{{ t('moldOperate.deviceStatus') }}</text>
+            <text class="info-value">{{ getStatusLabel(device) }}</text>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 空状态 -->
+    <view v-else class="empty-wrap">
+      <text v-if="loading" class="empty-text">{{ t('functionCommon.loading') }}</text>
+      <text v-else class="empty-text">{{ t('moldOperate.noDeviceData') }}</text>
+    </view>
+
+    <!-- 底部确认按钮 -->
+    <view class="bottom-actions">
+      <view class="bottom-btn confirm-btn" @click="handleConfirm">
+        {{ t('functionCommon.confirm') }}
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { useI18n } from 'vue-i18n'
+import NavBar from '@/components/common/NavBar.vue'
+import { getDeviceLedgerList } from '@/api/mes/moldoperate'
+
+const { t } = useI18n()
+
+const deviceList = ref([])
+const selectedId = ref(null)
+const searchText = ref('')
+const loading = ref(false)
+
+function textValue(v) {
+  if (v === 0) return '0'
+  if (v == null) return '-'
+  const s = String(v).trim()
+  return s || '-'
+}
+
+function getStatusClass(status) {
+  const s = Number(status)
+  if (s === 0) return 'running-tag'
+  if (s === 1) return 'stop-tag'
+  if (s >= 2) return 'fault-tag'
+  return ''
+}
+
+function getStatusLabel(device) {
+  const status = Number(device.deviceStatus)
+  const map = {
+    0: t('moldOperate.statusRunning'),
+    1: t('moldOperate.statusStop'),
+    2: t('moldOperate.statusFault'),
+    3: t('moldOperate.statusFault')
+  }
+  return map[status] || textValue(device.deviceStatus) || '-'
+}
+
+// 当前在机模具 - 优先从持久化存储读取（实时），否则 fallback 设备台账字段
+function getCurrentMold(device) {
+  const deviceId = device?.id
+  const deviceCode = device?.deviceCode
+
+  // 1. 优先读新版 _mountedMoldInfoMap（按 deviceId 索引，再用 deviceCode fallback）
+  try {
+    const map = uni.getStorageSync('_mountedMoldInfoMap') || {}
+    // 先按 id 匹配
+    const key = String(deviceId)
+    let info = deviceId != null ? map[key] : null
+    // 再按 deviceCode 匹配（兼容 id 可能不一致的情况）
+    if (!info && deviceCode) {
+      const found = Object.values(map).find((item) => item?.deviceCode === deviceCode)
+      if (found) info = found
+    }
+
+    // 调试日志：只在首次加载时输出一次
+    if (!getCurrentMold._logged) {
+      getCurrentMold._logged = true
+      console.log('[deviceSelect] === 调试信息 ===')
+      console.log('[deviceSelect] storage map keys:', Object.keys(map))
+      console.log('[deviceSelect] storage map values:', map)
+      console.log('[deviceSelect] 当前设备 deviceId:', deviceId, 'type:', typeof deviceId, 'key:', key)
+      console.log('[deviceSelect] 当前设备 deviceCode:', deviceCode)
+      console.log('[deviceSelect] id匹配结果:', info ? '命中' : '未命中')
+      if (!info) {
+        console.log('[deviceSelect] 尝试 deviceCode fallback...')
+        for (const [k, v] of Object.entries(map)) {
+          console.log('[deviceSelect]   storage[', k, '].deviceCode =', v?.deviceCode, 'vs 设备 code =', deviceCode, '匹配:', v?.deviceCode === deviceCode)
+        }
+      }
+      // fallback 检查
+      const saved = uni.getStorageSync('_mountedMoldInfo') || null
+      console.log('[deviceSelect] 旧版 _mountedMoldInfo:', saved)
+      console.log('[deviceSelect] 设备台账字段 currentMold:', device?.currentMold, 'moldName:', device?.moldName, 'moldId:', device?.moldId)
+    }
+
+    if (info?.mold) {
+      return info.mold.name || info.mold.moldName || '-'
+    }
+  } catch (e) {
+    console.warn('[deviceSelect] read _mountedMoldInfoMap error', e)
+  }
+
+  // 2. 兼容旧版 _mountedMoldInfo
+  let saved = null
+  try { saved = uni.getStorageSync('_mountedMoldInfo') || null } catch {}
+  if (saved) {
+    const idMatch = deviceId != null && String(saved.deviceId) === String(deviceId)
+    const codeMatch = deviceCode && saved.deviceCode === deviceCode
+    if (idMatch || codeMatch) {
+      return saved.mold?.name || saved.mold?.moldName || '-'
+    }
+  }
+
+  // 3. fallback 设备台账静态字段
+  const staticMold = textValue(device.currentMold || device.moldName || device.moldId)
+  return staticMold === '-' ? t('moldOperate.noMoldOnDevice') : staticMold
+}
+
+const filteredList = computed(() => {
+  const keyword = searchText.value.trim().toLowerCase()
+  if (!keyword) return deviceList.value
+  return deviceList.value.filter((d) => {
+    return (d.deviceName || '').toLowerCase().includes(keyword) ||
+           (d.deviceCode || '').toLowerCase().includes(keyword) ||
+           (d.workshopName || '').toLowerCase().includes(keyword)
+  })
+})
+
+function onSearch() {}
+
+function clearSearch() {
+  searchText.value = ''
+}
+
+async function loadDevices() {
+  loading.value = true
+  try {
+    const res = await getDeviceLedgerList({ pageNo: 1, pageSize: 100 })
+    const root = res && res.data !== undefined ? res.data : res
+    deviceList.value = Array.isArray(root)
+      ? root
+      : Array.isArray(root?.list) ? root.list
+      : Array.isArray(root?.rows) ? root.rows
+      : Array.isArray(root?.records) ? root.records
+      : []
+  } catch (e) {
+    console.error('loadDevices error', e)
+  } finally {
+    loading.value = false
+  }
+}
+
+function handleConfirm() {
+  if (!selectedId.value) {
+    uni.showToast({ title: t('moldOperate.validatorDeviceRequired'), icon: 'none' })
+    return
+  }
+  const device = deviceList.value.find((d) => d.id === selectedId.value)
+  // 存入 globalData 后再返回，目标页 onShow 中读取
+  getApp().globalData._deviceSelectResult = device || null
+  uni.navigateBack()
+}
+
+onShow(async () => {
+  await loadDevices()
+})
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+  min-height: 100vh;
+  background: #f5f6f8;
+  padding-bottom: 140rpx;
+}
+
+/* 搜索栏 */
+.search-bar {
+  padding: 16rpx 24rpx;
+  background: #fff;
+}
+
+.search-input-wrap {
+  display: flex;
+  align-items: center;
+  height: 72rpx;
+  padding: 0 16rpx;
+  background: #f5f6f8;
+  border-radius: 36rpx;
+}
+
+.search-icon {
+  font-size: 32rpx;
+  color: #999;
+  margin-right: 12rpx;
+}
+
+.search-input {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.search-placeholder {
+  color: #bbb;
+}
+
+.search-clear {
+  font-size: 28rpx;
+  color: #999;
+  padding: 8rpx;
+}
+
+/* 设备列表 */
+.device-list {
+  padding: 16rpx 24rpx;
+}
+
+.device-card {
+  background: #fff;
+  border-radius: 14rpx;
+  padding: 24rpx;
+  margin-bottom: 16rpx;
+  border: 2rpx solid transparent;
+
+  &.active {
+    border-color: #2563eb;
+    background: #f0f5ff;
+  }
+}
+
+.device-card-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 16rpx;
+}
+
+.device-name {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: #1a1a1a;
+}
+
+.device-status-tag {
+  padding: 4rpx 16rpx;
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  font-weight: 500;
+
+  &.running-tag { color: #059669; background: #ecfdf5; border: 1rpx solid #a7f3d0; }
+  &.stop-tag { color: #d97706; background: #fffbeb; border: 1rpx solid #fde68a; }
+  &.fault-tag { color: #dc2626; background: #fef2f2; border: 1rpx solid #fecaca; }
+}
+
+.device-card-body {
+  border-top: 1rpx solid #f0f0f0;
+  padding-top: 16rpx;
+}
+
+.device-info-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.info-label {
+  width: 140rpx;
+  font-size: 24rpx;
+  color: #999;
+  flex-shrink: 0;
+}
+
+.info-value {
+  font-size: 26rpx;
+  color: #333;
+}
+
+/* 空状态 */
+.empty-wrap {
+  padding: 120rpx 0;
+  text-align: center;
+}
+
+.empty-text {
+  font-size: 28rpx;
+  color: #999;
+}
+
+/* 底部确认按钮 */
+.bottom-actions {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
+  z-index: 99;
+}
+
+.bottom-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  text-align: center;
+  border-radius: 12rpx;
+  font-size: 30rpx;
+  font-weight: 600;
+}
+
+.confirm-btn {
+  background: #2563eb;
+  color: #fff;
+}
+</style>
diff --git a/src/pages_function/pages/moldoperate/dismount.vue b/src/pages_function/pages/moldoperate/dismount.vue
new file mode 100644
index 0000000..e802b79
--- /dev/null
+++ b/src/pages_function/pages/moldoperate/dismount.vue
@@ -0,0 +1,733 @@
+<template>
+  <view class="page-container">
+    <NavBar :title="t('moldOperate.tabDown')" />
+
+    <!-- 操作按钮区 -->
+    <view class="action-row">
+      <view class="action-btn scan-btn" @click="handleScan">
+        <view class="btn-icon-wrap">
+          <text class="iconfont icon-scan btn-icon"></text>
+        </view>
+        <text class="btn-text">{{ t('moldOperate.scanDevice') }}</text>
+      </view>
+      <view class="action-btn select-btn" @click="openDevicePicker">
+        <view class="btn-icon-wrap">
+          <text class="iconfont icon-device btn-icon"></text>
+        </view>
+        <text class="btn-text">{{ t('moldOperate.selectDevice') }}</text>
+      </view>
+    </view>
+
+    <!-- 设备信息卡片 -->
+    <view class="section-card">
+      <view class="section-title-bar">
+        <view class="section-bar-line"></view>
+        <text class="section-title">{{ t('moldOperate.deviceInfo') }}</text>
+      </view>
+      <view class="card-body-grid">
+        <view class="grid-row">
+          <view class="grid-cell">
+            <text class="grid-label">{{ t('moldOperate.deviceName') }}</text>
+            <text class="grid-value">{{ textValue(selectedDevice.deviceName) }}</text>
+          </view>
+          <view class="grid-cell">
+            <text class="grid-label">{{ t('moldOperate.deviceCode') }}</text>
+            <text class="grid-value">{{ textValue(selectedDevice.deviceCode) }}</text>
+          </view>
+        </view>
+        <view class="grid-row">
+          <view class="grid-cell">
+            <text class="grid-label">{{ t('moldOperate.productionLine') }}</text>
+            <text class="grid-value">{{ textValue(selectedDevice.workshopName) }}</text>
+          </view>
+          <view class="grid-cell">
+            <text class="grid-label">{{ t('moldOperate.deviceStatus') }}</text>
+            <view class="status-tag" :class="deviceStatusClass">{{ deviceStatusLabel }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 当前在机模具 -->
+    <view class="section-card">
+      <view class="section-title-bar">
+        <view class="section-bar-line"></view>
+        <text class="section-title">{{ t('moldOperate.currentMoldInfo') }}</text>
+      </view>
+
+      <template v-if="selectedMold && selectedMold.id">
+        <view class="card-body-grid">
+          <view class="grid-row">
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.moldName') }}</text>
+              <text class="grid-value highlight">{{ textValue(selectedMold.moldName) }}</text>
+            </view>
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.moldCode') }}</text>
+              <text class="grid-value">{{ textValue(selectedMold.moldCode) }}</text>
+            </view>
+          </view>
+          <view class="grid-row">
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.product') }}</text>
+              <text class="grid-value">{{ textValue(selectedMold.productName) }}</text>
+            </view>
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.mountTime') }}</text>
+              <text class="grid-value">{{ textValue(selectedMold.mountTime) }}</text>
+            </view>
+          </view>
+          <view class="grid-row">
+            <view class="grid-cell full-width">
+              <text class="grid-label">{{ t('moldOperate.useCount') }}</text>
+              <text class="grid-value highlight">{{ formatUseCount(selectedMold.useCount) }}</text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 更换下模对象按钮 -->
+        <view class="change-target-btn" @click="openLowerMoldPicker">
+          <text class="change-icon">&#8644;</text>
+          <text class="change-text">{{ t('moldOperate.changeTarget') }}</text>
+        </view>
+      </template>
+
+      <!-- 已选设备但无在机模具 -->
+      <view v-else-if="selectedDevice.id && moldsLoaded" class="empty-mold-hint">
+        <text class="empty-mold-text empty-gray">{{ t('moldOperate.noMoldOnDevice') }}</text>
+      </view>
+
+      <!-- 未选设备 -->
+      <view v-else class="empty-mold-hint" @click="handleSelectDeviceFirst">
+        <text class="empty-mold-text">+ {{ t('moldOperate.clickSelectDeviceFirst') }}</text>
+      </view>
+    </view>
+
+    <!-- 底部操作栏 -->
+    <view class="bottom-actions">
+      <view class="bottom-btn confirm-btn" @click="handleConfirm">{{ t('moldOperate.confirmDismount') }}</view>
+    </view>
+
+    <!-- 在机模具选择弹框（更换下模对象） -->
+    <uni-popup ref="lowerMoldPickerRef" type="bottom">
+      <view class="picker-popup">
+        <view class="picker-header">
+          <text class="picker-close-left" @click="closeLowerMoldPicker">{{ t('functionCommon.cancel') }}</text>
+          <text class="picker-title">{{ t('moldOperate.currentMoldInfo') }}</text>
+          <text class="picker-close-right" @click="confirmLowerMoldSelection">{{ t('functionCommon.confirm') }}</text>
+        </view>
+        <scroll-view scroll-y class="picker-scroll">
+          <view v-for="m in lowerMoldOptions" :key="m.id || m.moldId"
+                class="picker-item" :class="{ active: tempSelectedMoldId === String(m.id || m.moldId) }"
+                @click="tempSelectedMoldId = String(m.id || m.moldId)">
+            <view class="picker-item-content">
+              <text class="picker-item-name">{{ textValue(m.moldName || m.name) }}</text>
+              <text class="picker-item-code">{{ textValue(m.moldCode || m.code) }}</text>
+            </view>
+            <text class="picker-check-icon" v-if="tempSelectedMoldId === String(m.id || m.moldId)">&#10003;</text>
+          </view>
+          <view v-if="lowerMoldLoading" class="picker-hint">{{ t('functionCommon.loading') }}</view>
+          <view v-else-if="!lowerMoldOptions.length" class="picker-empty">{{ t('moldOperate.noMoldOnDevice') }}</view>
+        </scroll-view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script setup>
+import { computed, reactive, ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { useI18n } from 'vue-i18n'
+import NavBar from '@/components/common/NavBar.vue'
+import { getLowerMoldList, getDeviceLedgerList, createMoldOperate } from '@/api/mes/moldoperate'
+
+const { t } = useI18n()
+
+// ---- 设备相关 ----
+const selectedDevice = ref({})
+const deviceOptions = ref([])
+
+// ---- 模具相关 ----
+const selectedMold = ref({})
+const lowerMoldPickerRef = ref(null)
+const lowerMoldOptions = ref([])
+const lowerMoldLoading = ref(false)
+const moldsLoaded = ref(false)
+const tempSelectedMoldId = ref(null)
+
+// ---- 工具函数 ----
+function textValue(v) {
+  if (v === 0) return '0'
+  if (v == null) return '-'
+  const s = String(v).trim()
+  return s || '-'
+}
+
+function formatUseCount(count) {
+  if (count == null) return '-'
+  const num = Number(count)
+  if (isNaN(num)) return String(count)
+  return num.toLocaleString() + ' ' + t('moldOperate.countUnit')
+}
+
+function formatTime(time) {
+  if (!time) return '-'
+  if (typeof time === 'string') {
+    if (time.includes('-') || time.includes('T')) {
+      return time.replace(/T/, ' ').substring(0, 19)
+    }
+    const ts = Number(time)
+    if (!isNaN(ts) && ts > 1e10) return new Date(ts).toLocaleString()
+    else if (!isNaN(ts) && ts > 1e7) return new Date(ts * 1000).toLocaleString()
+    return time
+  }
+  if (typeof time === 'number') {
+    if (time > 1e10) return new Date(time).toLocaleString()
+    if (time > 1e7) return new Date(time * 1000).toLocaleString()
+    return String(time)
+  }
+  return '-'
+}
+
+const deviceStatusClass = computed(() => {
+  const status = Number(selectedDevice.value?.deviceStatus)
+  if (status === 0) return 'running-tag'
+  if (status === 1) return 'stop-tag'
+  if (status >= 2) return 'fault-tag'
+  return ''
+})
+
+const deviceStatusLabel = computed(() => {
+  const status = Number(selectedDevice.value?.deviceStatus)
+  const map = {
+    0: t('moldOperate.statusRunning'),
+    1: t('moldOperate.statusStop'),
+    2: t('moldOperate.statusFault'),
+    3: t('moldOperate.statusFault')
+  }
+  return map[status] || textValue(selectedDevice.value?.deviceStatus) || '-'
+})
+
+// ---- 数据加载 ----
+async function loadDevices() {
+  try {
+    const res = await getDeviceLedgerList({ pageNo: 1, pageSize: 100 })
+    const root = res && res.data !== undefined ? res.data : res
+    const data = Array.isArray(root)
+      ? root
+      : Array.isArray(root?.list) ? root.list
+      : Array.isArray(root?.rows) ? root.rows
+      : []
+    deviceOptions.value = data.map((d) => ({
+      value: d.id,
+      label: `${d.deviceCode || ''} ${d.deviceName || ''}`.trim(),
+      raw: d
+    }))
+  } catch (e) {
+    console.error('loadDevices error', e)
+  }
+}
+
+// 通用递归数组提取
+function findArr(obj, d = 0) {
+  if (!obj || typeof obj !== 'object' || d > 3) return []
+  if (Array.isArray(obj)) return obj
+  for (const k of ['list', 'rows', 'records', 'items', 'data']) {
+    if (Array.isArray(obj[k])) return obj[k]
+  }
+  for (const v of Object.values(obj)) {
+    const found = findArr(v, d + 1)
+    if (found.length) return found
+  }
+  return []
+}
+
+async function loadLowerMolds(deviceId) {
+  lowerMoldLoading.value = true
+  try {
+    // ====== 策略1：优先从持久化存储读取（按设备ID索引，不会互覆盖）======
+    let map = {}
+    try { map = uni.getStorageSync('_mountedMoldInfoMap') || {} } catch {}
+    const savedInfo = map[String(deviceId)] || null
+
+    console.log('[下模] 持久化在机模具信息 =', savedInfo ? JSON.stringify(savedInfo) : 'null', 'deviceId=', deviceId)
+
+    if (savedInfo && savedInfo.mold) {
+      console.log('[下模] 命中持久化数据, deviceId=', deviceId)
+      const m = savedInfo.mold
+      lowerMoldOptions.value = [{
+        id: m.id,
+        moldId: m.id,
+        moldName: m.name || m.moldName || '-',
+        moldCode: m.code || m.moldCode || '-',
+        productName: m.productName || '-',
+        mountTime: formatTime(savedInfo.mountTime),
+        useCount: '-'
+      }]
+      console.log('[下模] 使用持久化数据 =', JSON.stringify(lowerMoldOptions.value[0]))
+      return
+    }
+    console.log('[下模] 未命中持久化数据，进入接口查询')
+
+    // ====== 策略2：fallback - 调用在机模具接口 ======
+    let list = []
+    try {
+      const res = await getLowerMoldList(deviceId)
+      const root = (res && res.data !== undefined) ? res.data : res
+      list = findArr(root)
+    } catch (apiErr) {
+      console.warn('[下模] getLowerMoldList 接口异常', apiErr)
+    }
+
+    lowerMoldOptions.value = list
+    console.log('[下模] loadLowerMolds 返回 list.length =', list.length)
+  } catch (e) {
+    console.error('loadLowerMolds error', e)
+  } finally {
+    lowerMoldLoading.value = false
+  }
+}
+
+// ---- 扫描设备码 ----
+function handleScan() {
+  uni.scanCode({
+    onlyFromCamera: false,
+    scanType: ['qrCode', 'barCode'],
+    success(res) {
+      const code = res.result?.trim()
+      if (!code) return
+      const matched = deviceOptions.value.find((d) =>
+        d.raw.deviceCode === code || String(d.raw.code) === code || d.label.includes(code)
+      )
+      if (matched) {
+        selectDevice(matched.raw)
+      } else {
+        uni.showToast({ title: t('moldOperate.deviceNotFound'), icon: 'none' })
+      }
+    },
+    fail(err) {
+      if (err.errMsg && !err.errMsg.includes('cancel')) {
+        console.warn('scan failed:', err)
+      }
+    }
+  })
+}
+
+// ---- 设备选择 ----
+function selectDevice(device) {
+  selectedDevice.value = device || {}
+  moldsLoaded.value = false
+  selectedMold.value = {}
+  if (device?.id) {
+    loadLowerMolds(device.id).then(() => {
+      moldsLoaded.value = true
+      if (lowerMoldOptions.value.length > 0) {
+        const first = lowerMoldOptions.value[0]
+        selectedMold.value = {
+          id: first.id || first.moldId,
+          moldName: first.moldName || first.name,
+          moldCode: first.moldCode || first.code,
+          productName: first.productName || '-',
+          mountTime: first.mountTime || '-',
+          useCount: first.useCount ?? '-'
+        }
+      }
+    })
+  }
+}
+function openDevicePicker() {
+  uni.navigateTo({ url: '/pages_function/pages/moldoperate/deviceSelect' })
+}
+
+
+
+// ---- 在机模具选择（更换下模对象）----
+function openLowerMoldPicker() {
+  if (!selectedDevice.value?.id) {
+    uni.showToast({ title: t('moldOperate.validatorDeviceRequired'), icon: 'none' })
+    return
+  }
+  tempSelectedMoldId.value = selectedMold.value ? String(selectedMold.value.id || selectedMold.value.moldId) : null
+  loadLowerMolds(selectedDevice.value.id).then(() => {
+    lowerMoldPickerRef.value?.open()
+  })
+}
+
+function confirmLowerMoldSelection() {
+  const mold = lowerMoldOptions.value.find(
+    (m) => String(m.id || m.moldId) === tempSelectedMoldId.value
+  )
+  if (mold) {
+    selectedMold.value = {
+      id: mold.id || mold.moldId,
+      moldName: mold.moldName || mold.name,
+      moldCode: mold.moldCode || mold.code,
+      productName: mold.productName || '-',
+      mountTime: mold.mountTime || '-',
+      useCount: mold.useCount ?? '-'
+    }
+  }
+  lowerMoldPickerRef.value?.close()
+}
+
+function closeLowerMoldPicker() { lowerMoldPickerRef.value?.close() }
+
+function handleSelectDeviceFirst() {
+  openDevicePicker()
+}
+
+// ---- 提交 ----
+function validForm() {
+  if (!selectedDevice.value?.id) {
+    uni.showToast({ title: t('moldOperate.validatorDeviceRequired'), icon: 'none' })
+    return false
+  }
+  if (!selectedMold.value?.id) {
+    uni.showToast({ title: t('moldOperate.validatorLowerMoldRequired'), icon: 'none' })
+    return false
+  }
+  return true
+}
+
+async function handleConfirm() {
+  if (!validForm()) return
+  try {
+    const payload = {
+      operateType: '2',
+      deviceId: String(selectedDevice.value.id),
+      moldId: String(selectedMold.value.id)
+    }
+    console.log('[下模] 提交参数 =', JSON.stringify(payload))
+    await createMoldOperate(payload)
+    uni.showToast({ title: t('functionCommon.createSuccess'), icon: 'success' })
+    // 下模成功后清除该设备的持久化数据
+    if (selectedDevice.value?.id) {
+      try {
+        const map = uni.getStorageSync('_mountedMoldInfoMap') || {}
+        delete map[String(selectedDevice.value.id)]
+        uni.setStorageSync('_mountedMoldInfoMap', map)
+      } catch {}
+    }
+    // 重置表单
+    selectedDevice.value = {}
+    selectedMold.value = {}
+    lowerMoldOptions.value = []
+  } catch (e) {
+    console.error('[下模] 保存失败 =', e)
+    const errMsg = e?.msg || (typeof e === 'string' ? e : e?.message) || '系统异常'
+    uni.showToast({ title: t('functionCommon.saveFailed') + ': ' + errMsg, icon: 'none', duration: 3000 })
+  }
+}
+
+onShow(async () => {
+  await Promise.allSettled([loadDevices()])
+  // 从 globalData 读取设备选择页回传的设备
+  const device = getApp().globalData._deviceSelectResult
+  if (device) {
+    getApp().globalData._deviceSelectResult = null
+    selectDevice(device)
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+  min-height: 100vh;
+  background: #f5f6f8;
+  padding-bottom: 140rpx;
+}
+
+/* ====== 操作按钮区 ====== */
+.action-row {
+  display: flex;
+  gap: 20rpx;
+  padding: 20rpx 24rpx;
+}
+
+.action-btn {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 12rpx;
+  height: 96rpx;
+  border-radius: 12rpx;
+  background: #2563eb;
+  color: #fff;
+  font-size: 28rpx;
+  font-weight: 600;
+
+  .btn-icon-wrap {
+    width: 44rpx;
+    height: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .btn-icon {
+    font-size: 36rpx;
+    color: #fff;
+  }
+
+  .btn-text {
+    font-size: 28rpx;
+  }
+}
+
+/* ====== 卡片通用样式 ====== */
+.section-card {
+  margin: 16rpx 24rpx;
+  background: #ffffff;
+  border-radius: 14rpx;
+  overflow: hidden;
+}
+
+.section-title-bar {
+  display: flex;
+  align-items: center;
+  gap: 10rpx;
+  padding: 22rpx 24rpx 0;
+}
+
+.section-bar-line {
+  width: 6rpx;
+  height: 32rpx;
+  border-radius: 3rpx;
+  background: #2563eb;
+}
+
+.section-title {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: #1a1a1a;
+}
+
+.card-body-grid {
+  padding: 20rpx 24rpx 28rpx;
+}
+
+/* ====== 网格布局 ====== */
+.grid-row {
+  display: flex;
+  gap: 20rpx;
+  margin-top: 18rpx;
+
+  &:first-child {
+    margin-top: 0;
+  }
+}
+
+.grid-cell {
+  flex: 1;
+  min-width: 0;
+
+  &.full-width {
+    flex-basis: 100%;
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+  }
+}
+
+.grid-label {
+  display: block;
+  font-size: 24rpx;
+  color: #999;
+  margin-bottom: 6rpx;
+}
+
+.grid-value {
+  display: block;
+  font-size: 27rpx;
+  color: #333;
+  word-break: break-all;
+
+  &.highlight {
+    color: #2563eb;
+    font-weight: 600;
+  }
+}
+
+/* ====== 状态标签 ====== */
+.status-tag {
+  display: inline-flex;
+  align-items: center;
+  padding: 6rpx 18rpx;
+  border-radius: 6rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+
+  &.running-tag {
+    color: #059669;
+    background: #ecfdf5;
+    border: 1rpx solid #a7f3d0;
+  }
+
+  &.stop-tag {
+    color: #d97706;
+    background: #fffbeb;
+    border: 1rpx solid #fde68a;
+  }
+
+  &.fault-tag {
+    color: #dc2626;
+    background: #fef2f2;
+    border: 1rpx solid #fecaca;
+  }
+
+  &.pending-tag {
+    color: #2563eb;
+    background: #eff6ff;
+    border: 1rpx solid #bfdbfe;
+  }
+}
+
+/* ====== 更换下模对象按钮 ====== */
+.change-target-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8rpx;
+  margin: 0 24rpx 24rpx;
+  padding: 20rpx 0;
+  border: 1rpx dashed #ccc;
+  border-radius: 10rpx;
+
+  .change-icon {
+    font-size: 28rpx;
+    color: #666;
+  }
+
+  .change-text {
+    font-size: 26rpx;
+    color: #666;
+  }
+
+  &:active {
+    background: #fafafa;
+  }
+}
+
+/* ====== 空提示 ====== */
+.empty-mold-hint {
+  padding: 40rpx 24rpx;
+  text-align: center;
+}
+
+.empty-mold-text {
+  font-size: 28rpx;
+  color: #2563eb;
+}
+
+/* ====== 底部操作栏 ====== */
+.bottom-actions {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
+  z-index: 99;
+}
+
+.bottom-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  text-align: center;
+  border-radius: 12rpx;
+  font-size: 30rpx;
+  font-weight: 600;
+}
+
+.confirm-btn {
+  background: #2563eb;
+  color: #fff;
+}
+
+/* ====== 弹窗通用 ====== */
+.picker-popup {
+  background: #fff;
+  border-radius: 24rpx 24rpx 0 0;
+  max-height: 75vh;
+}
+
+.picker-header {
+  height: 96rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.picker-close-left,
+.picker-close-right {
+  font-size: 28rpx;
+  color: #2563eb;
+  padding: 8rpx 0;
+}
+
+.picker-title {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: #1a1a1a;
+}
+
+.picker-scroll {
+  max-height: calc(75vh - 96rpx);
+  padding: 12rpx 0 32rpx;
+}
+
+.picker-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 0 24rpx 12rpx;
+  padding: 22rpx 20rpx;
+  border-radius: 12rpx;
+  background: #f8fafc;
+
+  &.active {
+    background: #eff6ff;
+    border: 1rpx solid #bfdbfe;
+  }
+}
+
+.picker-item-content {
+  flex: 1;
+  min-width: 0;
+}
+
+.picker-item-name {
+  display: block;
+  font-size: 28rpx;
+  color: #1a1a1a;
+  font-weight: 500;
+}
+
+.picker-item-code {
+  display: block;
+  font-size: 23rpx;
+  color: #999;
+  margin-top: 4rpx;
+}
+
+.picker-check-icon {
+  font-size: 30rpx;
+  color: #2563eb;
+  font-weight: 700;
+  margin-left: 16rpx;
+  flex-shrink: 0;
+}
+
+.picker-empty,
+.picker-hint {
+  text-align: center;
+  color: #999;
+  padding: 60rpx 0;
+  font-size: 26rpx;
+}
+</style>
diff --git a/src/pages_function/pages/moldoperate/index.vue b/src/pages_function/pages/moldoperate/index.vue
index 217aca3..fbf033c 100644
--- a/src/pages_function/pages/moldoperate/index.vue
+++ b/src/pages_function/pages/moldoperate/index.vue
@@ -1,922 +1,630 @@
 <template>
   <view class="page-container">
-    <NavBar :title="t('moldOperate.moduleName')" :subTitle="t('moldOperate.subTitle')" />
-
-    <!-- 操作类型切换 -->
-    <view class="operate-tabs">
-      <view class="operate-tab" :class="{ active: query.operateType === '1' }" @click="switchOperateType('1')">{{
-        t('moldOperate.tabUp') }}</view>
-      <view class="operate-tab" :class="{ active: query.operateType === '2' }" @click="switchOperateType('2')">{{
-        t('moldOperate.tabDown') }}</view>
+    <!-- 顶部导航栏 -->
+    <view class="custom-nav">
+      <view class="nav-back" @click="goBack">
+        <text class="back-icon">&lt;</text>
+      </view>
+      <text class="nav-title">{{ t('moldOperate.tabUp') }}</text>
+      <view class="nav-placeholder"></view>
     </view>
 
-    <!-- 列表查询区 -->
-    <view class="search-card">
-      <view class="search-row">
-        <view class="search-input-wrap">
-          <text class="iconfont icon-search search-icon"></text>
-          <input v-model="query.remark" class="search-input" :placeholder="t('moldOperate.searchRemark')"
-            @confirm="handleSearch" />
+    <!-- ========== 上模 ========== -->
+    <!-- 操作按钮区 -->
+      <view class="action-row">
+        <view class="action-btn scan-btn" @click="handleScan">
+          <view class="btn-icon-wrap">
+            <text class="iconfont icon-scan btn-icon"></text>
+          </view>
+          <text class="btn-text">{{ t('moldOperate.scanDevice') }}</text>
+        </view>
+        <view class="action-btn select-btn" @click="openDevicePicker">
+          <view class="btn-icon-wrap">
+            <text class="iconfont icon-device btn-icon"></text>
+          </view>
+          <text class="btn-text">{{ t('moldOperate.selectDevice') }}</text>
         </view>
-        <view class="search-btn" @click="handleSearch">{{ t('functionCommon.search') }}</view>
-      </view>
-      <view class="filter-row">
-        <picker mode="selector" :range="moldFilterOptions" range-key="name" :value="moldIndex"
-          @change="onMoldFilterChange">
-          <view class="filter-item">{{ moldFilterLabel }}</view>
-        </picker>
       </view>
-    </view>
 
-    <!-- 列表区 -->
-    <scroll-view scroll-y class="list-scroll" :scroll-top="scrollTop" @scroll="onScroll" @scrolltolower="loadMore"
-      :lower-threshold="80">
-      <view class="list-wrap">
-        <view v-for="item in list" :key="item.id" class="type-card" @click="openDetail(item)">
-          <view class="card-header">
-            <view class="header-left">
-              <text class="type-name">{{ textValue(item.moldName) }}</text>
-              <text class="type-code">{{ t('moldOperate.deviceName') }}: {{ textValue(item.deviceName) }}</text>
+      <!-- 已选设备卡片 -->
+      <view class="section-card">
+        <view class="section-title-bar">
+          <view class="section-bar-line"></view>
+          <text class="section-title">{{ t('moldOperate.selectedDevice') }}</text>
+        </view>
+        <view class="card-body-grid">
+          <view class="grid-row">
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.deviceName') }}</text>
+              <text class="grid-value">{{ textValue(selectedDevice.deviceName) }}</text>
+            </view>
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.deviceCode') }}</text>
+              <text class="grid-value">{{ textValue(selectedDevice.deviceCode) }}</text>
             </view>
-            <view class="type-chip">{{ typeLabel(item.operateType) }}</view>
           </view>
-          <view class="card-body">
-            <view class="row">
-              <text class="label">{{ t('moldOperate.creatorName') }}</text>
-              <text class="value">{{ textValue(item.creatorName) }}</text>
+          <view class="grid-row">
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.productionLine') }}</text>
+              <text class="grid-value">{{ textValue(selectedDevice.workshopName) }}</text>
             </view>
-            <view class="row">
-              <text class="label">{{ t('moldOperate.createTime') }}</text>
-              <text class="value">{{ dateTimeLabel(item.createTime) }}</text>
+            <view class="grid-cell">
+              <text class="grid-label">{{ t('moldOperate.currentMold') }}</text>
+              <text class="grid-value highlight">{{ currentMoldDisplay }}</text>
             </view>
           </view>
-          <view class="card-actions">
-            <view class="action-btn edit-btn" @click.stop="openEdit(item)">
-              <uni-icons type="compose" size="18" color="#ffffff"></uni-icons>
-            </view>
-            <view class="action-btn delete-btn" @click.stop="removeItem(item)">
-              <uni-icons type="trash" size="18" color="#ffffff"></uni-icons>
+          <view class="grid-row">
+            <view class="grid-cell full-width">
+              <text class="grid-label">{{ t('moldOperate.deviceStatus') }}</text>
+              <view class="status-tag" :class="deviceStatusClass">{{ deviceStatusLabel }}</view>
             </view>
           </view>
         </view>
-        <view v-if="loading && pageNo === 1" class="hint">{{ t('functionCommon.loading') }}</view>
-        <view v-else-if="!list.length" class="hint">{{ t('moldOperate.empty') }}</view>
-        <view v-else-if="loadingMore" class="hint">{{ t('functionCommon.loadingMore') }}</view>
-        <view v-else-if="finished" class="hint">{{ t('functionCommon.noMoreData') }}</view>
       </view>
-    </scroll-view>
 
-    <!-- 悬浮新增按钮 -->
-    <view class="fab-btn" @click="openCreate">
-      <uni-icons type="plusempty" size="30" color="#fff"></uni-icons>
-    </view>
-    <!-- 返回顶部按钮 -->
-    <view v-if="showGoTop" class="go-top-btn" @click="goTop">
-      <uni-icons type="arrow-up" size="20" color="#1a3a5c"></uni-icons>
-    </view>
-
-    <!-- 新增/编辑弹框 -->
-    <uni-popup ref="formPopupRef" type="bottom">
-      <view class="form-popup">
-        <view class="popup-header">
-          <text class="popup-title">{{ formMode === 'create' ? t('moldOperate.createTitle') : t('moldOperate.editTitle')
-            }}</text>
-          <text class="popup-close" @click="closeForm">×</text>
+      <!-- 选择待上模模具 -->
+      <view class="section-card">
+        <view class="section-title-bar">
+          <view class="section-bar-line"></view>
+          <text class="section-title">{{ t('moldOperate.selectMountMold') }}</text>
         </view>
-        <scroll-view scroll-y class="popup-scroll">
-          <view class="form-item">
-            <text class="form-label"><text class="required">*</text>{{ t('moldOperate.operateType') }}</text>
-            <view class="radio-row">
-              <view class="radio-item" :class="{ active: String(formData.operateType) === '1' }"
-                @click="changeFormOperateType('1')">{{ t('moldOperate.tabUp') }}</view>
-              <view class="radio-item" :class="{ active: String(formData.operateType) === '2' }"
-                @click="changeFormOperateType('2')">{{ t('moldOperate.tabDown') }}</view>
-            </view>
-          </view>
 
-          <view class="form-item">
-            <text class="form-label"><text class="required">*</text>{{ t('moldOperate.device') }}</text>
-            <picker mode="selector" :range="deviceOptions" range-key="label" :value="formDeviceIndex"
-              @change="onFormDeviceChange">
-              <view class="picker-view">{{ formDeviceLabel || t('moldOperate.placeholderDevice') }}</view>
-            </picker>
-          </view>
-
-          <view class="form-item">
-            <text class="form-label"><text class="required">*</text>{{ String(formData.operateType) === '2' ?
-              t('moldOperate.lowerMold') : t('moldOperate.mold') }}</text>
-            <view class="sub-action block" @click="openMoldPicker">{{ t('moldOperate.selectMold') }}</view>
-          </view>
-          <view v-if="!selectedMolds.length" class="item-empty">{{ t('moldOperate.noSelectedMold') }}</view>
-          <view v-for="(mold, index) in selectedMolds" :key="mold.id" class="selected-item">
-            <view>
-              <view class="selected-name">{{ textValue(mold.name || mold.moldName) }}</view>
-              <view class="selected-code">{{ textValue(mold.code || mold.moldCode) }}</view>
+        <template v-if="selectedMountMolds.length > 0">
+          <view v-for="(mold, index) in selectedMountMolds" :key="mold.id || index" class="card-body-grid">
+            <view class="grid-row">
+              <view class="grid-cell">
+                <text class="grid-label">{{ t('moldOperate.moldName') }}</text>
+                <text class="grid-value highlight">{{ textValue(mold.name || mold.moldName) }}</text>
+              </view>
+              <view class="grid-cell">
+                <text class="grid-label">{{ t('moldOperate.moldCode') }}</text>
+                <text class="grid-value">{{ textValue(mold.code || mold.moldCode) }}</text>
+              </view>
+            </view>
+            <view class="grid-row">
+              <view class="grid-cell">
+                <text class="grid-label">{{ t('moldOperate.product') }}</text>
+                <text class="grid-value">{{ textValue(mold.productName) }}</text>
+              </view>
+              <view class="grid-cell">
+                <text class="grid-label">{{ t('moldOperate.status') }}</text>
+                <view :class="['status-tag', getMoldStatusClass(mold.status)]">{{ getMoldStatusText(mold.status) }}</view>
+              </view>
             </view>
-            <text class="item-remove" @click="removeSelectedMold(index)">×</text>
           </view>
 
-          <view class="form-item">
-            <text class="form-label">{{ t('moldOperate.remark') }}</text>
-            <textarea v-model="formData.remark" class="form-textarea" :placeholder="t('moldOperate.placeholderRemark')"
-              maxlength="200" />
+          <!-- 更换上模对象按钮 -->
+          <view class="change-target-btn" @click="openMountMoldPicker">
+            <text class="change-icon">&#8644;</text>
+            <text class="change-text">{{ t('moldOperate.changeMountTarget') }}</text>
           </view>
-        </scroll-view>
-        <view class="popup-footer">
-          <view class="footer-btn cancel" @click="closeForm">{{ t('functionCommon.cancel') }}</view>
-          <view class="footer-btn confirm" @click="submitForm">{{ t('functionCommon.save') }}</view>
+        </template>
+        <view v-else class="empty-mold-hint" @click="openMountMoldPicker">
+          <text class="empty-mold-text">+ {{ t('moldOperate.clickSelectMold') }}</text>
         </view>
       </view>
-    </uni-popup>
-
-    <!-- 模具选择弹框 -->
-    <uni-popup ref="moldPickerRef" type="bottom">
-      <view class="picker-popup">
-        <view class="picker-header">
-          <text class="picker-title">{{ t('moldOperate.selectMold') }}</text>
-          <text class="picker-close" @click="closeMoldPicker">×</text>
-        </view>
-        <scroll-view scroll-y class="picker-scroll">
-          <view v-for="m in pickerSourceList" :key="m.id" class="picker-item" @click="toggleMold(m)">
-            <view>
-              <view class="picker-item-name">{{ textValue(m.name || m.moldName) }}</view>
-              <view class="picker-item-code">{{ textValue(m.code || m.moldCode) }}</view>
-            </view>
-            <text class="picker-check">{{ selectedMoldIdSet.has(String(m.id)) ? '✓' : '' }}</text>
-          </view>
-          <view v-if="pickerLoading" class="picker-hint">{{ t('functionCommon.loading') }}</view>
-          <view v-else-if="!pickerSourceList.length" class="picker-hint">{{ t('moldOperate.noMoldData') }}</view>
-        </scroll-view>
+
+      <!-- 底部操作栏 - 上模 -->
+      <view class="bottom-actions">
+        <view class="bottom-btn confirm-btn" @click="handleConfirmMount">{{ t('moldOperate.confirmMount') }}</view>
+        <view class="bottom-btn cancel-btn" @click="handleCancel">{{ t('functionCommon.cancel') }}</view>
       </view>
-    </uni-popup>
+
   </view>
 </template>
 
 <script setup>
-import { computed, reactive, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
-import NavBar from '@/components/common/NavBar.vue'
-import { getMoldList, getInTransitMoldAllList } from '@/api/mes/mold'
-import { getMoldOperatePage, getMoldOperateDetail, createMoldOperate, updateMoldOperate, deleteMoldOperate, getLowerMoldList, getDeviceLedgerList } from '@/api/mes/moldoperate'
+import { getDeviceLedgerList, createMoldOperate } from '@/api/mes/moldoperate'
 
 const { t } = useI18n()
 
-const list = ref([])
-const loading = ref(false)
-const loadingMore = ref(false)
-const finished = ref(false)
-const pageNo = ref(1)
-const pageSize = ref(10)
-const scrollTop = ref(0)
-const showGoTop = ref(false)
-
-const query = reactive({
-  operateType: '1',
-  moldId: undefined,
-  remark: ''
-})
-const moldFilterOptions = ref([{ id: undefined, name: '' }])
-const moldIndex = ref(0)
-const moldFilterLabel = computed(() => moldFilterOptions.value[moldIndex.value]?.name || t('moldOperate.allMold'))
-
-const formPopupRef = ref(null)
-const moldPickerRef = ref(null)
-const formMode = ref('create')
-const formData = reactive({
-  id: undefined,
-  operateType: '1',
-  deviceId: undefined,
-  moldId: '',
-  lowerMoldId: '',
-  remark: ''
-})
-const selectedMolds = ref([])
-const selectedMoldIdSet = computed(() => new Set(selectedMolds.value.map((m) => String(m.id))))
-
-const deviceOptions = ref([])
-const formDeviceIndex = computed(() => {
-  const idx = deviceOptions.value.findIndex((d) => Number(d.value) === Number(formData.deviceId))
-  return idx < 0 ? 0 : idx
-})
-const formDeviceLabel = computed(() => deviceOptions.value.find((d) => Number(d.value) === Number(formData.deviceId))?.label || '')
-
-const upperMoldOptions = ref([])
-const lowerMoldOptions = ref([])
-const pickerLoading = ref(false)
-const pickerSourceList = computed(() => (String(formData.operateType) === '2' ? lowerMoldOptions.value : upperMoldOptions.value))
-
+// ---- 工具函数 ----
 function textValue(v) {
   if (v === 0) return '0'
-  if (v === null || v === undefined) return '-'
+  if (v == null) return '-'
   const s = String(v).trim()
   return s || '-'
 }
-function dateTimeLabel(v) {
-  if (!v) return '-'
-  const d = new Date(Number(v))
-  if (Number.isNaN(d.getTime())) return textValue(v)
-  const p = (n) => String(n).padStart(2, '0')
-  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`
-}
-function normalizePageData(res) {
-  const root = res && res.data !== undefined ? res.data : res
-  const l = root?.list || root?.rows || root?.records || root?.data?.list || []
-  const total = root?.total ?? root?.data?.total ?? (Array.isArray(l) ? l.length : 0)
-  return { list: Array.isArray(l) ? l : [], total: Number(total || 0) }
-}
-function typeLabel(type) {
-  return String(type) === '2' ? t('moldOperate.tabDown') : t('moldOperate.tabUp')
-}
 
-async function fetchList(reset = true) {
-  if (reset) {
-    pageNo.value = 1
-    finished.value = false
-  }
-  if (pageNo.value === 1) loading.value = true
-  else loadingMore.value = true
+// ==================== 共享: 设备列表 ====================
+const deviceOptions = ref([])
+
+async function loadDevices() {
   try {
-    const params = {
-      pageNo: pageNo.value,
-      pageSize: pageSize.value,
-      operateType: query.operateType,
-      moldId: query.moldId,
-      remark: query.remark || undefined
-    }
-    const res = await getMoldOperatePage(params)
-    const page = normalizePageData(res)
-    if (reset) list.value = page.list
-    else list.value = [...list.value, ...page.list]
-    finished.value = list.value.length >= page.total || page.list.length < pageSize.value
+    const res = await getDeviceLedgerList({ pageNo: 1, pageSize: 100 })
+    const root = res && res.data !== undefined ? res.data : res
+    const data = Array.isArray(root)
+      ? root
+      : Array.isArray(root?.list) ? root.list
+      : Array.isArray(root?.rows) ? root.rows
+      : Array.isArray(root?.records) ? root.records
+      : []
+    deviceOptions.value = data.map((d) => ({
+      value: d.id,
+      label: `${d.deviceCode || ''} ${d.deviceName || ''}`.trim(),
+      raw: d
+    }))
   } catch (e) {
-    if (!reset) pageNo.value = Math.max(1, pageNo.value - 1)
-    uni.showToast({ title: t('functionCommon.loadFailed'), icon: 'none' })
-  } finally {
-    loading.value = false
-    loadingMore.value = false
+    console.error('loadDevices error', e)
   }
 }
 
-async function loadMoldFilter() {
-  const res = await getMoldList({})
-  const root = res && res.data !== undefined ? res.data : res
-  const data = Array.isArray(root) ? root : Array.isArray(root?.list) ? root.list : []
-  moldFilterOptions.value = [{ id: undefined, name: t('moldOperate.allMold') }, ...data]
-}
-async function loadDevices() {
-  const res = await getDeviceLedgerList({})
-  const root = res && res.data !== undefined ? res.data : res
-  const data = Array.isArray(root) ? root : Array.isArray(root?.list) ? root.list : []
-  deviceOptions.value = data.map((d) => ({
-    value: d.id,
-    label: `${d.deviceCode || ''} ${d.deviceName || ''}`.trim()
-  }))
-}
-async function loadUpperMoldOptions() {
-  const res = await getInTransitMoldAllList()
-  const root = res && res.data !== undefined ? res.data : res
-  upperMoldOptions.value = Array.isArray(root) ? root : []
-}
-async function loadLowerMoldOptions() {
-  if (!formData.deviceId) {
-    lowerMoldOptions.value = []
-    return
-  }
-  const res = await getLowerMoldList(formData.deviceId)
-  const root = res && res.data !== undefined ? res.data : res
-  lowerMoldOptions.value = Array.isArray(root) ? root : []
-}
-
-function switchOperateType(type) {
-  query.operateType = type
-  fetchList(true)
-}
-function handleSearch() { fetchList(true) }
-function onMoldFilterChange(e) {
-  const idx = Number(e?.detail?.value || 0)
-  moldIndex.value = idx
-  const option = moldFilterOptions.value[idx]
-  query.moldId = option ? option.id : undefined
-  fetchList(true)
-}
-function onScroll(e) {
-  const top = Number(e?.detail?.scrollTop || 0)
-  showGoTop.value = top > 600
-}
-function goTop() { scrollTop.value = 0 }
-async function loadMore() {
-  if (loading.value || loadingMore.value || finished.value) return
-  pageNo.value += 1
-  await fetchList(false)
-}
-
-function resetFormData() {
-  formData.id = undefined
-  formData.operateType = query.operateType || '1'
-  formData.deviceId = undefined
-  formData.moldId = ''
-  formData.lowerMoldId = ''
-  formData.remark = ''
-  selectedMolds.value = []
-}
-function openCreate() {
-  formMode.value = 'create'
-  resetFormData()
-  formPopupRef.value?.open()
-}
-async function openEdit(row) {
-  if (!row?.id) {
-    uni.showToast({ title: t('functionCommon.noIdEdit'), icon: 'none' })
-    return
+// ==================== 上模模块 ====================
+const selectedDevice = ref({})
+
+const selectedMountMolds = ref([])
+const tempSelectedDeviceId = ref(null)
+
+// 设备状态 - 上模
+const deviceStatusClass = computed(() => {
+  const status = Number(selectedDevice.value?.deviceStatus)
+  if (status === 0) return 'running-tag'
+  if (status === 1) return 'stop-tag'
+  if (status >= 2) return 'fault-tag'
+  return ''
+})
+
+const deviceStatusLabel = computed(() => {
+  const status = Number(selectedDevice.value?.deviceStatus)
+  const map = {
+    0: t('moldOperate.statusRunning'),
+    1: t('moldOperate.statusStop'),
+    2: t('moldOperate.statusFault'),
+    3: t('moldOperate.statusFault')
   }
-  formMode.value = 'update'
-  resetFormData()
+  return map[status] || textValue(selectedDevice.value?.deviceStatus) || '-'
+})
+
+const MOLD_STATUS_MAP = { 0: '在机', 1: '待用', 2: '维修', 3: '报废' }
+function getMoldStatusText(s) { return MOLD_STATUS_MAP[s] || textValue(s) }
+function getMoldStatusClass(s) {
+  if (s === 0) return 'inuse-tag'
+  if (s === 2) return 'repair-tag'
+  if (s === 3) return 'scrap-tag'
+  return 'standby-tag'
+}
+
+// ---- 持久化在机模具信息（按设备ID索引，避免多设备覆盖）----
+const MOUNTED_MOLD_KEY = '_mountedMoldInfoMap'
+function getMountedMoldMap() {
   try {
-    const res = await getMoldOperateDetail(row.id)
-    const detail = res?.data || {}
-    formData.id = detail.id
-    formData.operateType = String(detail.operateType || '1')
-    formData.deviceId = detail.deviceId
-    formData.remark = detail.remark || ''
-    await refreshPickerByType()
-    const selectedIds = String(formData.operateType) === '2' ? parseIdList(detail.lowerMoldId) : parseIdList(detail.moldId)
-    selectedMolds.value = pickerSourceList.value.filter((m) => selectedIds.includes(Number(m.id)))
-    formPopupRef.value?.open()
+    const data = uni.getStorageSync(MOUNTED_MOLD_KEY) || {}
+    return data
   } catch (e) {
-    uni.showToast({ title: t('moldOperate.loadEditFailed'), icon: 'none' })
+    console.warn('[上模] getMountedMoldMap 异常', e)
+    return {}
   }
 }
-function parseIdList(raw) {
-  if (Array.isArray(raw)) return raw.map((x) => Number(x)).filter((x) => !Number.isNaN(x))
-  return String(raw || '').split(',').map((x) => Number(x)).filter((x) => !Number.isNaN(x))
-}
-function closeForm() { formPopupRef.value?.close() }
-
-async function changeFormOperateType(type) {
-  formData.operateType = type
-  selectedMolds.value = []
-  await refreshPickerByType()
+function getMountedMoldByDevice(deviceId) {
+  if (!deviceId) return null
+  const map = getMountedMoldMap()
+  const key = String(deviceId)
+  return map[key] || null
 }
-async function refreshPickerByType() {
-  pickerLoading.value = true
+function saveMountedMoldInfo(info) {
+  if (!info || !info.deviceId) return
   try {
-    if (String(formData.operateType) === '2') {
-      await loadLowerMoldOptions()
-    } else {
-      await loadUpperMoldOptions()
-    }
-  } finally {
-    pickerLoading.value = false
+    const map = getMountedMoldMap()
+    map[String(info.deviceId)] = info
+    uni.setStorageSync(MOUNTED_MOLD_KEY, map)
+    console.log('[上模] saveMountedMoldInfo 写入成功, deviceId=', info.deviceId, 'map keys=', Object.keys(map))
+  } catch (e) {
+    console.warn('[上模] saveMountedMoldInfo 异常', e)
   }
 }
-async function onFormDeviceChange(e) {
-  const idx = Number(e?.detail?.value || 0)
-  const option = deviceOptions.value[idx]
-  formData.deviceId = option ? option.value : undefined
-  if (String(formData.operateType) === '2') {
-    selectedMolds.value = []
-    await refreshPickerByType()
+function clearMountedMoldInfo(deviceId) {
+  if (!deviceId) {
+    try { uni.removeStorageSync(MOUNTED_MOLD_KEY) } catch {}
+    return
   }
+  try {
+    const map = getMountedMoldMap()
+    delete map[String(deviceId)]
+    uni.setStorageSync(MOUNTED_MOLD_KEY, map)
+  } catch {}
+}
+
+// 当前在机模具 - 优先从持久化存储获取（实时），否则用设备台账静态字段
+const currentMoldDisplay = computed(() => {
+  if (!selectedDevice.value?.id) return '-'
+  const saved = getMountedMoldByDevice(selectedDevice.value.id)
+  if (saved) {
+    console.log('[上模] currentMoldDisplay 命中持久化, deviceId=', selectedDevice.value.id, 'mold=', saved.mold?.name || saved.mold?.moldName)
+    return saved.mold?.name || saved.mold?.moldName || '-'
+  }
+  return textValue(selectedDevice.value.currentMold)
+})
+
+function selectDevice(device) {
+  selectedDevice.value = device || {}
+  tempSelectedDeviceId.value = device ? device.id : null
+  selectedMountMolds.value = []
 }
 
-async function openMoldPicker() {
-  if (!formData.deviceId) {
-    uni.showToast({ title: t('moldOperate.validatorDeviceRequired'), icon: 'none' })
-    return
-  }
-  await refreshPickerByType()
-  moldPickerRef.value?.open()
+function openDevicePicker() {
+  uni.navigateTo({ url: '/pages_function/pages/moldoperate/deviceSelect' })
 }
-function closeMoldPicker() { moldPickerRef.value?.close() }
-function toggleMold(mold) {
-  const id = String(mold.id)
-  const idx = selectedMolds.value.findIndex((i) => String(i.id) === id)
-  if (idx >= 0) {
-    selectedMolds.value.splice(idx, 1)
+
+
+
+function openMountMoldPicker() {
+  if (!selectedDevice.value?.id) {
+    uni.showToast({ title: t('moldOperate.validatorDeviceRequired'), icon: 'none' })
     return
   }
-  selectedMolds.value.push({
-    id: mold.id,
-    name: mold.name || mold.moldName,
-    code: mold.code || mold.moldCode
-  })
+  // 把已选模具 ID 传过去做回显
+  getApp().globalData._moldSelectPreSelected = selectedMountMolds.value.map((m) => String(m.id))
+  uni.navigateTo({ url: '/pages_function/pages/moldoperate/moldSelect' })
 }
-function removeSelectedMold(index) { selectedMolds.value.splice(index, 1) }
 
-function validForm() {
-  if (!formData.operateType) {
-    uni.showToast({ title: t('moldOperate.validatorOperateTypeRequired'), icon: 'none' })
-    return false
-  }
-  if (!formData.deviceId) {
+function validFormMount() {
+  if (!selectedDevice.value?.id) {
     uni.showToast({ title: t('moldOperate.validatorDeviceRequired'), icon: 'none' })
     return false
   }
-  if (!selectedMolds.value.length) {
-    uni.showToast({ title: String(formData.operateType) === '2' ? t('moldOperate.validatorLowerMoldRequired') : t('moldOperate.validatorMoldRequired'), icon: 'none' })
+  if (!selectedMountMolds.value.length) {
+    uni.showToast({ title: t('moldOperate.validatorMoldRequired'), icon: 'none' })
     return false
   }
   return true
 }
-async function submitForm() {
-  if (!validForm()) return
-  const selectedIds = selectedMolds.value.map((m) => m.id)
-  const payload = {
-    id: formData.id,
-    operateType: Number(formData.operateType),
-    deviceId: formData.deviceId,
-    remark: formData.remark || undefined
-  }
-  if (String(formData.operateType) === '2') {
-    const allIds = lowerMoldOptions.value.map((m) => m.id)
-    const selectedSet = new Set(selectedIds.map((id) => String(id)))
-    payload.lowerMoldId = selectedIds.join(',')
-    payload.moldId = allIds.filter((id) => !selectedSet.has(String(id))).join(',')
-  } else {
-    payload.moldId = selectedIds.join(',')
-  }
+
+async function handleConfirmMount() {
+  if (!validFormMount()) return
   try {
-    if (formMode.value === 'create') {
-      await createMoldOperate(payload)
-      uni.showToast({ title: t('functionCommon.createSuccess'), icon: 'success' })
-    } else {
-      await updateMoldOperate(payload)
-      uni.showToast({ title: t('functionCommon.updateSuccess'), icon: 'success' })
+    const moldIds = selectedMountMolds.value.map((m) => m.id)
+    const payload = {
+      operateType: '1',
+      deviceId: String(selectedDevice.value.id),
+      moldId: moldIds.length === 1 ? String(moldIds[0]) : moldIds.map(String).join(',')
+    }
+    console.log('=== 上模提交参数 ===', JSON.stringify(payload))
+    console.log('=== deviceId type:', typeof payload.deviceId, 'value:', payload.deviceId)
+    console.log('=== moldId type:', typeof payload.moldId, 'value:', payload.moldId)
+    const res = await createMoldOperate(payload)
+    console.log('=== 上模返回 ===', JSON.stringify(res))
+    uni.showToast({ title: t('functionCommon.createSuccess'), icon: 'success' })
+    
+    // 上模成功后持久化保存，供下模/设备选择页读取
+    if (selectedMountMolds.value.length > 0) {
+      const info = {
+        deviceId: selectedDevice.value.id,
+        deviceCode: selectedDevice.value.deviceCode,
+        deviceName: selectedDevice.value.deviceName,
+        mold: selectedMountMolds.value[0],
+        mountTime: new Date().toLocaleString()
+      }
+      saveMountedMoldInfo(info)
+      // 同步到 globalData（兼容旧逻辑）
+      getApp().globalData._mountedMoldInfo = info
+      getApp().globalData._mountedMoldInfoMap = getMountedMoldMap()
+      console.log('=== 已保存在机模具信息 ===', JSON.stringify(info))
     }
-    closeForm()
-    fetchList(true)
+    
+    selectedDevice.value = {}
+    selectedMountMolds.value = []
   } catch (e) {
-    uni.showToast({ title: t('functionCommon.saveFailed'), icon: 'none' })
+    console.error('=== 上模失败 ===', e)
+    const errMsg = e?.msg || (typeof e === 'string' ? e : e?.message) || '系统异常'
+    console.error('=== 错误详情 ===', errMsg)
+    uni.showToast({ title: t('functionCommon.saveFailed') + ': ' + errMsg, icon: 'none', duration: 3000 })
   }
 }
 
-function openDetail(item) {
-  if (!item?.id) {
-    uni.showToast({ title: t('functionCommon.noIdView'), icon: 'none' })
-    return
-  }
-  uni.navigateTo({
-    url: `/pages_function/pages/moldoperate/detail?id=${encodeURIComponent(String(item.id))}`
-  })
-}
-function removeItem(item) {
-  if (!item?.id) {
-    uni.showToast({ title: t('functionCommon.noIdDelete'), icon: 'none' })
-    return
-  }
-  uni.showModal({
-    title: t('functionCommon.confirmDelete'),
-    content: t('moldOperate.confirmDelete'),
-    success: async ({ confirm }) => {
-      if (!confirm) return
-      try {
-        await deleteMoldOperate(item.id)
-        uni.showToast({ title: t('functionCommon.deleteSuccess'), icon: 'success' })
-        fetchList(true)
-      } catch (e) {
-        uni.showToast({ title: t('functionCommon.deleteFailed'), icon: 'none' })
+// ==================== 共享: 扫码 / 取消 / 返回 ====================
+function handleScan() {
+  uni.scanCode({
+    onlyFromCamera: false,
+    scanType: ['qrCode', 'barCode'],
+    success(res) {
+      const code = res.result?.trim()
+      if (!code) return
+      const matched = deviceOptions.value.find((d) =>
+        d.raw.deviceCode === code || String(d.raw.code) === code || d.label.includes(code)
+      )
+      if (matched) {
+        selectDevice(matched.raw)
+      } else {
+        uni.showToast({ title: t('moldOperate.deviceNotFound'), icon: 'none' })
+      }
+    },
+    fail(err) {
+      if (err.errMsg && !err.errMsg.includes('cancel')) {
+        console.warn('scan failed:', err)
       }
     }
   })
 }
 
+function handleCancel() {
+  selectedDevice.value = {}
+  selectedMountMolds.value = []
+}
+
+function goBack() {
+  uni.navigateBack({ fail: () => uni.switchTab({ url: '/pages/index/index' }) })
+}
+
 onShow(async () => {
-  await Promise.allSettled([loadMoldFilter(), loadDevices(), loadUpperMoldOptions()])
-  await fetchList(true)
+  await Promise.allSettled([loadDevices()])
+  // 从 globalData 读取设备选择页回传的设备
+  const device = getApp().globalData._deviceSelectResult
+  if (device) {
+    getApp().globalData._deviceSelectResult = null
+    selectDevice(device)
+  }
+  // 从 globalData 读取模具选择页回传的模具列表
+  const molds = getApp().globalData._moldSelectResult
+  if (molds) {
+    getApp().globalData._moldSelectResult = null
+    selectedMountMolds.value = molds
+  }
 })
 </script>
 
 <style lang="scss" scoped>
 .page-container {
   min-height: 100vh;
-  background: #f0f2f5;
+  background: #f5f6f8;
+  padding-bottom: 140rpx;
 }
 
-.operate-tabs {
-  margin: 14rpx 24rpx 0;
+/* ====== 自定义导航栏 ====== */
+.custom-nav {
   display: flex;
-  background: #fff;
-  border-radius: 12rpx;
-  padding: 8rpx;
-}
+  align-items: center;
+  justify-content: space-between;
+  height: 88rpx;
+  padding: 0 24rpx;
+  background: #1a365d;
+  color: #fff;
 
-.operate-tab {
-  flex: 1;
-  text-align: center;
-  padding: 14rpx 0;
-  border-radius: 8rpx;
-  color: #606266;
-}
+  .nav-back {
+    width: 60rpx;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 
-.operate-tab.active {
-  background: #1a3a5c;
-  color: #fff;
-  font-weight: 600;
-}
+  .back-icon {
+    font-size: 36rpx;
+    font-weight: bold;
+  }
 
-.search-card {
-  margin: 14rpx 24rpx 18rpx;
-  padding: 20rpx;
-  border-radius: 16rpx;
-  background: #fff;
-}
+  .nav-title {
+    font-size: 34rpx;
+    font-weight: 600;
+  }
 
-.search-row {
-  display: flex;
-  gap: 16rpx;
+  .nav-placeholder {
+    width: 60rpx;
+  }
 }
 
-.search-input-wrap {
-  flex: 1;
+/* ====== 操作按钮区 ====== */
+.action-row {
   display: flex;
-  align-items: center;
-  background: #f5f7fa;
-  border-radius: 40rpx;
-  padding: 0 20rpx;
-}
-
-.search-icon {
-  color: #909399;
+  gap: 20rpx;
+  padding: 20rpx 24rpx;
 }
 
-.search-input {
+.action-btn {
   flex: 1;
-  height: 72rpx;
-  margin-left: 12rpx;
-}
-
-.search-btn {
-  min-width: 120rpx;
-  height: 72rpx;
-  border-radius: 36rpx;
-  background: #1a3a5c;
-  color: #fff;
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 26rpx;
-}
-
-.filter-row {
-  margin-top: 16rpx;
-  display: flex;
-  gap: 14rpx;
-}
+  gap: 12rpx;
+  height: 96rpx;
+  border-radius: 12rpx;
+  background: #2563eb;
+  color: #fff;
+  font-size: 28rpx;
+  font-weight: 600;
 
-.filter-item {
-  min-width: 220rpx;
-  padding: 12rpx 18rpx;
-  border-radius: 10rpx;
-  background: #f5f7fa;
-  color: #303133;
-  font-size: 24rpx;
-}
+  .btn-icon-wrap {
+    width: 44rpx;
+    height: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 
-.list-scroll {
-  height: calc(100vh - 420rpx);
-}
+  .btn-icon {
+    font-size: 36rpx;
+    color: #fff;
+  }
 
-.list-wrap {
-  padding: 0 24rpx 130rpx;
+  .btn-text {
+    font-size: 28rpx;
+  }
 }
 
-.type-card {
+/* ====== 卡片通用样式 ====== */
+.section-card {
+  margin: 16rpx 24rpx;
   background: #ffffff;
-  border-radius: 18rpx;
-  padding: 24rpx;
-  margin-bottom: 18rpx;
-  box-shadow: 0 4rpx 18rpx rgba(0, 0, 0, 0.05);
+  border-radius: 14rpx;
+  overflow: hidden;
 }
 
-.card-header {
+.section-title-bar {
   display: flex;
-  justify-content: space-between;
-  gap: 10rpx;
   align-items: center;
-  padding-bottom: 18rpx;
-  border-bottom: 1rpx solid #edf0f3;
+  gap: 10rpx;
+  padding: 22rpx 24rpx 0;
 }
 
-.header-left {
-  display: flex;
-  flex-direction: column;
-  gap: 8rpx;
+.section-bar-line {
+  width: 6rpx;
+  height: 32rpx;
+  border-radius: 3rpx;
+  background: #2563eb;
 }
 
-.type-name {
-  font-size: 32rpx;
+.section-title {
+  font-size: 30rpx;
   font-weight: 700;
-  color: #1f2d3d;
-}
-
-.type-code {
-  font-size: 24rpx;
-  color: #8a9099;
+  color: #1a1a1a;
 }
 
-.type-chip {
-  padding: 6rpx 16rpx;
-  border-radius: 20rpx;
-  font-size: 22rpx;
-  color: #096dd9;
-  background: rgba(24, 144, 255, 0.12);
+.card-body-grid {
+  padding: 20rpx 24rpx 28rpx;
 }
 
-.card-body {
-  padding-top: 16rpx;
-}
-
-.row {
+/* ====== 网格布局 ====== */
+.grid-row {
   display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 12rpx;
-}
-
-.label {
-  font-size: 26rpx;
-  color: #8a9099;
-}
-   
-.value {
-  font-size: 27rpx;
-  color: #30363d;
-  max-width: 62%;
-  text-align: right;
-}
+  gap: 20rpx;
+  margin-top: 18rpx;
 
-.card-actions {
-  margin-top: 24rpx;
-  display: flex;
-  justify-content: flex-end;
-  gap: 14rpx;
+  &:first-child {
+    margin-top: 0;
+  }
 }
 
-.action-btn {
-  width: 60rpx;
-  height: 60rpx;
-  border-radius: 12rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+.grid-cell {
+  flex: 1;
+  min-width: 0;
 
-.edit-btn {
-  background: #1a3a5c;
+  &.full-width {
+    flex-basis: 100%;
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+  }
 }
 
-.delete-btn {
-  background: #e34d59;
+.grid-label {
+  display: block;
+  font-size: 24rpx;
+  color: #999;
+  margin-bottom: 6rpx;
 }
 
-.hint {
-  text-align: center;
-  color: #909399;
-  padding: 24rpx 0;
-}
+.grid-value {
+  display: block;
+  font-size: 27rpx;
+  color: #333;
+  word-break: break-all;
 
-.fab-btn {
-  position: fixed;
-  right: 34rpx;
-  bottom: 120rpx;
-  width: 96rpx;
-  height: 96rpx;
-  border-radius: 50%;
-  background: linear-gradient(135deg, #1a3a5c 0%, #2d5a87 100%);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-shadow: 0 10rpx 30rpx rgba(26, 58, 92, 0.3);
-  z-index: 20;
+  &.highlight {
+    color: #2563eb;
+    font-weight: 600;
+  }
 }
 
-.go-top-btn {
-  position: fixed;
-  right: 34rpx;
-  bottom: 240rpx;
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 50%;
-  background: #fff;
-  box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.12);
-  display: flex;
+/* ====== 状态标签 ====== */
+.status-tag {
+  display: inline-flex;
   align-items: center;
-  justify-content: center;
-}
+  padding: 6rpx 18rpx;
+  border-radius: 6rpx;
+  font-size: 24rpx;
+  font-weight: 500;
 
-.form-popup {
-  background: #fff;
-  border-radius: 22rpx 22rpx 0 0;
-  max-height: 88vh;
+  &.running-tag {
+    color: #059669; background: #ecfdf5; border: 1rpx solid #a7f3d0;
+  }
+  &.stop-tag {
+    color: #d97706; background: #fffbeb; border: 1rpx solid #fde68a;
+  }
+  &.fault-tag {
+    color: #dc2626; background: #fef2f2; border: 1rpx solid #fecaca;
+  }
+  // 模具状态
+  &.inuse-tag {
+    color: #059669; background: #ecfdf5; border: 1rpx solid #a7f3d0;
+  }
+  &.standby-tag {
+    color: #2563eb; background: #eff6ff; border: 1rpx solid #bfdbfe;
+  }
+  &.repair-tag {
+    color: #d97706; background: #fffbeb; border: 1rpx solid #fde68a;
+  }
+  &.scrap-tag {
+    color: #dc2626; background: #fef2f2; border: 1rpx solid #fecaca;
+  }
 }
 
-.popup-header {
-  height: 96rpx;
+/* ====== 更换下模对象按钮 ====== */
+.change-target-btn {
   display: flex;
   align-items: center;
   justify-content: center;
-  position: relative;
-  border-bottom: 1rpx solid #f0f0f0;
-}
-
-.popup-title {
-  font-size: 30rpx;
-  font-weight: 700;
-}
-
-.popup-close {
-  position: absolute;
-  right: 28rpx;
-  top: 20rpx;
-  font-size: 44rpx;
-  color: #909399;
-}
-
-.popup-scroll {
-  max-height: calc(88vh - 180rpx);
-  padding: 20rpx 26rpx;
-}
-
-.form-item {
-  margin-bottom: 18rpx;
-}
-
-.form-label {
-  font-size: 24rpx;
-  color: #606266;
-  margin-bottom: 8rpx;
-  display: block;
-}
-
-.required {
-  color: #f56c6c;
-  margin-right: 6rpx;
-}
-
-.radio-row {
-  display: flex;
-  gap: 12rpx;
-}
-
-.radio-item {
-  flex: 1;
-  text-align: center;
-  padding: 18rpx 0;
+  gap: 8rpx;
+  margin: 0 24rpx 24rpx;
+  padding: 20rpx 0;
+  border: 1rpx dashed #ccc;
   border-radius: 10rpx;
-  background: #f5f7fa;
-  color: #606266;
-}
-
-.radio-item.active {
-  background: rgba(26, 58, 92, 0.12);
-  color: #1a3a5c;
-  font-weight: 600;
-}
-
-.picker-view {
-  min-height: 72rpx;
-  border-radius: 12rpx;
-  background: #f5f7fa;
-  padding: 0 18rpx;
-  display: flex;
-  align-items: center;
-}
 
-.sub-action {
-  color: #1a3a5c;
-  font-size: 24rpx;
-}
+  &:active { background: #fafafa; }
 
-.sub-action.block {
-  background: #f5f7fa;
-  border-radius: 10rpx;
-  padding: 18rpx;
-  text-align: center;
+  .change-icon { font-size: 28rpx; color: #666; }
+  .change-text { font-size: 26rpx; color: #666; }
 }
 
-.item-empty {
-  padding: 20rpx;
-  color: #909399;
+/* ====== 空提示 ====== */
+.empty-mold-hint {
+  padding: 40rpx 24rpx;
   text-align: center;
 }
 
-.selected-item {
-  margin-top: 10rpx;
-  border-radius: 12rpx;
-  background: #f8fafc;
-  padding: 14rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
+.empty-mold-text {
+  font-size: 28rpx;
+  color: #2563eb;
 
-.selected-name {
-  color: #303133;
-  font-size: 24rpx;
-}
+  &.loading-text {
+    color: #999;
+  }
 
-.selected-code {
-  color: #909399;
-  font-size: 22rpx;
-  margin-top: 4rpx;
+  &.empty-gray {
+    color: #bbb;
+  }
 }
 
-.item-remove {
-  color: #f56c6c;
-  font-size: 34rpx;
-}
+/* ====== 底部操作栏 ====== */
+.bottom-actions {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  gap: 20rpx;
+  padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
+  z-index: 99;
 
-.form-textarea {
-  width: 100%;
-  min-height: 120rpx;
-  border-radius: 12rpx;
-  background: #f5f7fa;
-  padding: 14rpx 18rpx;
+  &.single-btn {
+    gap: 0;
+  }
 }
 
-.popup-footer {
+.bottom-btn {
   height: 88rpx;
-  display: flex;
+  line-height: 88rpx;
+  text-align: center;
+  border-radius: 12rpx;
+  font-size: 30rpx;
+  font-weight: 600;
 }
 
-.footer-btn {
+.confirm-btn {
   flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 28rpx;
-}
-
-.cancel {
-  background: #f5f7fa;
-  color: #606266;
-}
-
-.confirm {
-  background: #1a3a5c;
+  background: #2563eb;
   color: #fff;
 }
 
-.picker-popup {
+.cancel-btn {
+  flex: 1;
   background: #fff;
-  border-radius: 22rpx 22rpx 0 0;
-  height: 70vh;
+  color: #666;
+  border: 1rpx solid #ddd;
 }
 
-.picker-header {
-  height: 90rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-}
 
-.picker-title {
-  font-size: 28rpx;
-  font-weight: 700;
-}
-
-.picker-close {
-  position: absolute;
-  right: 24rpx;
-  top: 18rpx;
-  font-size: 42rpx;
-}
-
-.picker-scroll {
-  height: calc(70vh - 90rpx);
-}
-
-.picker-item {
-  margin: 0 24rpx 12rpx;
-  padding: 16rpx;
-  border-radius: 12rpx;
-  background: #f8fafc;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.picker-item-name {
-  color: #303133;
-  font-size: 26rpx;
-}
-
-.picker-item-code {
-  color: #909399;
-  font-size: 22rpx;
-  margin-top: 6rpx;
-}
-
-.picker-check {
-  color: #1a3a5c;
-  font-size: 34rpx;
-}
-
-.picker-hint {
-  text-align: center;
-  color: #909399;
-  padding: 16rpx 0 22rpx;
-}
 </style>
diff --git a/src/pages_function/pages/moldoperate/moldSelect.vue b/src/pages_function/pages/moldoperate/moldSelect.vue
new file mode 100644
index 0000000..f7692e1
--- /dev/null
+++ b/src/pages_function/pages/moldoperate/moldSelect.vue
@@ -0,0 +1,351 @@
+<template>
+  <view class="page-container">
+    <NavBar :title="t('moldOperate.selectMountMold')" />
+
+    <!-- 搜索区 -->
+    <view class="search-bar">
+      <view class="search-input-wrap">
+        <text class="search-icon iconfont icon-search"></text>
+        <input class="search-input" v-model="searchText" :placeholder="t('moldOperate.searchName')" @input="onSearch" placeholder-class="search-placeholder" />
+        <text v-if="searchText" class="search-clear" @click="clearSearch">✕</text>
+      </view>
+    </view>
+
+    <!-- 模具列表 -->
+    <scroll-view scroll-y class="mold-list" v-if="filteredList.length > 0">
+      <view
+        v-for="mold in filteredList"
+        :key="mold.id"
+        class="mold-card"
+        :class="{ active: selectedIds.has(String(mold.id)) }"
+        @click="toggleMold(mold)"
+      >
+        <view class="mold-card-header">
+          <text class="mold-name">{{ textValue(mold.name) }}</text>
+          <text class="mold-check-icon" v-if="selectedIds.has(String(mold.id))">&#10003;</text>
+        </view>
+        <view class="mold-card-body">
+          <view class="info-row">
+            <text class="info-label">{{ t('moldOperate.moldCode') }}</text>
+            <text class="info-value">{{ textValue(mold.code) }}</text>
+          </view>
+          <view class="info-row">
+            <text class="info-label">产品型号</text>
+            <text class="info-value">{{ textValue(mold.productName) }}</text>
+          </view>
+          <view class="info-row">
+            <text class="info-label">{{ t('moldOperate.status') }}</text>
+            <view :class="['status-tag', getStatusClass(mold.status)]">{{ getStatusText(mold.status) }}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 空状态 -->
+    <view v-else class="empty-wrap">
+      <text v-if="loading" class="empty-text">{{ t('functionCommon.loading') }}</text>
+      <text v-else class="empty-text">{{ t('moldOperate.noMoldData') }}</text>
+    </view>
+
+    <!-- 底部确认按钮 -->
+    <view class="bottom-actions">
+      <view class="bottom-btn confirm-btn" @click="handleConfirm">
+        {{ t('functionCommon.confirm') }}{{ selectedIds.size > 0 ? `(${selectedIds.size})` : '' }}
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { useI18n } from 'vue-i18n'
+import NavBar from '@/components/common/NavBar.vue'
+import { getMoldBrandPage } from '@/api/mes/mold'
+
+const { t } = useI18n()
+
+const moldList = ref([])
+const selectedIds = ref(new Set())
+const searchText = ref('')
+const loading = ref(false)
+
+function textValue(v) {
+  if (v === 0) return '0'
+  if (v == null) return '-'
+  const s = String(v).trim()
+  return s || '-'
+}
+
+const STATUS_MAP = { 0: '在机', 1: '待用', 2: '维修', 3: '报废' }
+function getStatusText(s) { return STATUS_MAP[s] || textValue(s) }
+function getStatusClass(s) {
+  if (s === 0) return 'in-use-tag'
+  if (s === 2) return 'repairing-tag'
+  if (s === 3) return 'scrapped-tag'
+  return 'standby-tag'
+}
+
+const filteredList = computed(() => {
+  const keyword = searchText.value.trim().toLowerCase()
+  if (!keyword) return moldList.value
+  return moldList.value.filter((m) => {
+    return (m.name || '').toLowerCase().includes(keyword) ||
+           (m.code || '').toLowerCase().includes(keyword) ||
+           (m.productName || '').toLowerCase().includes(keyword)
+  })
+})
+
+function onSearch() {}
+
+function clearSearch() {
+  searchText.value = ''
+}
+
+async function loadMolds() {
+  loading.value = true
+  try {
+    const res = await getMoldBrandPage({ pageNo: 1, pageSize: 100 })
+    const root = (res && res.data !== undefined) ? res.data : res
+    // 递归查找任意嵌套的 list/rows/records
+    function findList(obj, depth = 0) {
+      if (!obj || typeof obj !== 'object' || depth > 3) return []
+      if (Array.isArray(obj)) return obj
+      for (const key of ['list', 'rows', 'records', 'items', 'data']) {
+        if (Array.isArray(obj[key])) return obj[key]
+      }
+      for (const val of Object.values(obj)) {
+        const found = findList(val, depth + 1)
+        if (found.length) return found
+      }
+      return []
+    }
+    moldList.value = findList(root)
+    // 保留一行关键日志用于排查
+    if (!moldList.value.length) console.error('moldSelect: 未找到模具数据', root)
+  } catch (e) {
+    console.error('loadMolds error', e)
+  } finally {
+    loading.value = false
+  }
+}
+
+function toggleMold(mold) {
+  const id = String(mold.id)
+  const set = new Set(selectedIds.value)
+  if (set.has(id)) {
+    set.delete(id)
+  } else {
+    // 上模每次只上一个模具，限制单选
+    set.clear()
+    set.add(id)
+  }
+  selectedIds.value = set
+}
+
+function handleConfirm() {
+  if (selectedIds.value.size === 0) {
+    uni.showToast({ title: t('moldOperate.validatorMoldRequired'), icon: 'none' })
+    return
+  }
+  const selected = moldList.value.filter((m) => selectedIds.value.has(String(m.id)))
+    .map((m) => ({
+      id: m.id,
+      name: m.name,
+      code: m.code,
+      productName: m.productName || '-',
+      status: m.status
+    }))
+  getApp().globalData._moldSelectResult = selected
+  uni.navigateBack()
+}
+
+onShow(async () => {
+  // 从 index.vue 传来的已选模具（编辑模式回显）
+  const preSelected = getApp().globalData._moldSelectPreSelected
+  if (preSelected && Array.isArray(preSelected)) {
+    selectedIds.value = new Set(preSelected.map((id) => String(id)))
+    getApp().globalData._moldSelectPreSelected = null
+  } else {
+    selectedIds.value = new Set()
+  }
+  await loadMolds()
+})
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+  min-height: 100vh;
+  background: #f5f6f8;
+  padding-bottom: 140rpx;
+}
+
+/* 搜索栏 */
+.search-bar {
+  padding: 16rpx 24rpx;
+  background: #fff;
+}
+
+.search-input-wrap {
+  display: flex;
+  align-items: center;
+  height: 72rpx;
+  padding: 0 16rpx;
+  background: #f5f6f8;
+  border-radius: 36rpx;
+}
+
+.search-icon {
+  font-size: 32rpx;
+  color: #999;
+  margin-right: 12rpx;
+}
+
+.search-input {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.search-placeholder {
+  color: #bbb;
+}
+
+.search-clear {
+  font-size: 28rpx;
+  color: #999;
+  padding: 8rpx;
+}
+
+/* 模具列表 */
+.mold-list {
+  padding: 16rpx 24rpx;
+}
+
+.mold-card {
+  background: #fff;
+  border-radius: 14rpx;
+  padding: 24rpx;
+  margin-bottom: 16rpx;
+  border: 2rpx solid transparent;
+
+  &.active {
+    border-color: #2563eb;
+    background: #f0f5ff;
+  }
+}
+
+.mold-card-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 16rpx;
+}
+
+.mold-name {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: #1a1a1a;
+}
+
+.mold-check-icon {
+  font-size: 32rpx;
+  color: #2563eb;
+  font-weight: 700;
+  flex-shrink: 0;
+  width: 40rpx;
+  height: 40rpx;
+  line-height: 36rpx;
+  text-align: center;
+  border: 2rpx solid #2563eb;
+  border-radius: 50%;
+}
+
+.mold-card-body {
+  border-top: 1rpx solid #f0f0f0;
+  padding-top: 16rpx;
+}
+
+.info-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.info-label {
+  width: 140rpx;
+  font-size: 24rpx;
+  color: #999;
+  flex-shrink: 0;
+}
+
+.info-value {
+  font-size: 26rpx;
+  color: #333;
+}
+
+/* 状态标签 */
+.status-tag {
+  display: inline-flex;
+  align-items: center;
+  padding: 4rpx 16rpx;
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  font-weight: 500;
+
+  &.standby-tag {
+    color: #2563eb; background: #eff6ff; border: 1rpx solid #bfdbfe;
+  }
+  &.in-use-tag {
+    color: #059669; background: #ecfdf5; border: 1rpx solid #a7f3d0;
+  }
+  &.repairing-tag {
+    color: #d97706; background: #fffbeb; border: 1rpx solid #fde68a;
+  }
+  &.scrapped-tag {
+    color: #dc2626; background: #fef2f2; border: 1rpx solid #fecaca;
+  }
+}
+
+/* 空状态 */
+.empty-wrap {
+  padding: 120rpx 0;
+  text-align: center;
+}
+
+.empty-text {
+  font-size: 28rpx;
+  color: #999;
+}
+
+/* 底部确认按钮 */
+.bottom-actions {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
+  z-index: 99;
+}
+
+.bottom-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  text-align: center;
+  border-radius: 12rpx;
+  font-size: 30rpx;
+  font-weight: 600;
+}
+
+.confirm-btn {
+  background: #2563eb;
+  color: #fff;
+}
+</style>
diff --git a/src/utils/permissionMenu.js b/src/utils/permissionMenu.js
index a4e6847..b4a7d31 100644
--- a/src/utils/permissionMenu.js
+++ b/src/utils/permissionMenu.js
@@ -73,6 +73,8 @@ const MENU_ROUTE_MAP = {
   moldget: '/pages_function/pages/moldget/index',
   moldreturn: '/pages_function/pages/moldreturn/index',
   moldoperate: '/pages_function/pages/moldoperate/index',
+  moldmount: '/pages_function/pages/moldoperate/index',
+  molddismount: '/pages_function/pages/moldoperate/dismount',
   mold: '/pages_function/pages/mold/index',
   equipment: '/pages_function/pages/equipment/index',
   spare: '/pages_function/pages/spare/index',
@@ -228,6 +230,32 @@ export function findTabMenuByPage(menus, pagePath) {
   return dynamicMenus.find((menu) => normalizePagePath(resolveMenuUrl(menu)) === targetPath) || null
 }
 
+// 上下模拆分映射
+const MOLD_OPERATE_SPLIT_MAP = {
+  '上下模': [
+    { name: '上模', key: 'moldmount' },
+    { name: '下模', key: 'molddismount' }
+  ],
+  moldoperate: [
+    { name: '上模', key: 'moldmount' },
+    { name: '下模', key: 'molddismount' }
+  ]
+}
+
+function splitMoldOperateEntry(entry) {
+  const keys = [String(entry.name || '').trim(), normalizeMenuKey(entry.component || ''), normalizeMenuKey(entry.enName || '')]
+  for (const k of keys) {
+    if (MOLD_OPERATE_SPLIT_MAP[k]) {
+      return MOLD_OPERATE_SPLIT_MAP[k].map((item) => ({
+        ...entry,
+        name: item.name,
+        _splitKey: item.key
+      }))
+    }
+  }
+  return null
+}
+
 export function buildPageModules(tabMenu) {
   return toArray(tabMenu?.children)
     .map((module) => {
@@ -236,12 +264,18 @@ export function buildPageModules(tabMenu) {
       if (hasNestedEntries) {
         return {
           ...module,
-          children: directChildren.flatMap((child) => toArray(child.children))
+          children: directChildren.flatMap((child) => toArray(child.children).flatMap((entry) => {
+            const splitted = splitMoldOperateEntry(entry)
+            return splitted || [entry]
+          }))
         }
       }
       return {
         ...module,
-        children: directChildren
+        children: directChildren.flatMap((entry) => {
+          const splitted = splitMoldOperateEntry(entry)
+          return splitted || [entry]
+        })
       }
     })
     .filter((module) => (module.children || []).length > 0)
@@ -252,6 +286,11 @@ export function resolveMenuUrl(menu) {
     return '/pages/index'
   }
 
+  // 拆分后的上下模子项，优先用 _splitKey 匹配（必须在 directRoute 之前）
+  if (menu?._splitKey && MENU_ROUTE_MAP[menu._splitKey]) {
+    return MENU_ROUTE_MAP[menu._splitKey]
+  }
+
   const directRoute = getDirectRoute(menu?.path) || getDirectRoute(menu?.component)
   if (directRoute) {
     return directRoute
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 2e621db..425503b 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -21,6 +21,10 @@ const request = <T>(config: RequestConfig): Promise<ResponseData<T>> => {
   if (getToken() && !isToken) {
     config.header['Authorization'] = 'Bearer ' + getToken()
   }
+  // POST/PUT 请求明确设置 Content-Type 为 application/json
+  if ((config.method === 'POST' || config.method === 'PUT') && config.data) {
+    config.header['Content-Type'] = 'application/json'
+  }
   // get请求映射params参数
   if (config.params) {
     let url = config.url + '?' + tansParams(config.params)
@@ -65,7 +69,8 @@ const request = <T>(config: RequestConfig): Promise<ResponseData<T>> => {
         return
       } else if (code === 500) {
         toast(msg)
-        reject('500')
+        // 将完整的 data 对象 reject，便于调用方拿到后端错误信息
+        reject(data)
         return
       } else if (code !== 200) {
         toast(msg)