From 9c1763dfee77956aeabd6e9a9bf6e1989cf26c1f Mon Sep 17 00:00:00 2001
From: zhongwenkai <3478244299@qq.com>
Date: Tue, 30 Jun 2026 17:56:13 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=B8=8A=E4=B8=8B=E6=A8=A1-=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8B=E6=A8=A1=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E3=80=81=E6=93=8D=E4=BD=9C=E4=BA=BA=E6=98=BE=E7=A4=BA=E5=8F=8A?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/moldoperate/MoldOperateForm.vue |  9 ++++++++-
 src/views/mes/moldoperate/index.vue           | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/moldoperate/MoldOperateForm.vue b/src/views/mes/moldoperate/MoldOperateForm.vue
index ce32590e..125e1ad9 100644
--- a/src/views/mes/moldoperate/MoldOperateForm.vue
+++ b/src/views/mes/moldoperate/MoldOperateForm.vue
@@ -439,7 +439,11 @@ const resetForm = () => {
   displayTopCategory.value = ''
   formRef.value?.resetFields()
 }
-const isDeviceSelectable = (row: any) => String(row?.moldGroup ?? '').trim() === ''
+const isDeviceSelectable = (row: any) => {
+  const isDown = String(formData.value.operateType) === '2'
+  const hasMold = String(row?.moldGroup ?? '').trim() !== ''
+  return isDown ? hasMold : !hasMold
+}
 
 const deviceColumns = computed(() => {
   const baseColumns = [
@@ -780,6 +784,9 @@ const confirmDownMold = async () => {
 const openCriticalComponentDialog = async () => {
   searchParams.deviceCode=''
   searchParams.deviceName=''
+  // 每次打开设备选择弹窗时刷新在机模具缓存，避免 APP 端或其他操作修改状态后缓存仍显示旧数据
+  deviceMoldLoaded.value = false
+  deviceMoldMap.value = new Map()
   const rows = selectedDeviceRows.value.map((item) => ({ ...item, id: Number(item.id) }))
   deviceSelectDialogRef.value?.open(rows)
 }
diff --git a/src/views/mes/moldoperate/index.vue b/src/views/mes/moldoperate/index.vue
index d6ed6693..a4d6b079 100644
--- a/src/views/mes/moldoperate/index.vue
+++ b/src/views/mes/moldoperate/index.vue
@@ -90,7 +90,7 @@
       <el-table-column :label="t('MoldManagement.MoldOperate.moldName')" align="center" prop="moldName" width="500px"  sortable />
       <el-table-column :label="t('MoldManagement.MoldOperate.deviceName')" align="center" prop="deviceName"  sortable />
       <el-table-column :label="t('MoldManagement.MoldOperate.productionLine')" align="center" prop="lineName"  sortable />
-      <el-table-column :label="t('MoldManagement.MoldOperate.creatorName')" align="center" prop="creatorName"  sortable />
+      <el-table-column :label="t('MoldManagement.MoldOperate.operatorName')" align="center" :formatter="operatorNameFormatter"  sortable />
       <el-table-column :label="t('MoldManagement.MoldOperate.remark')" align="center" prop="remark" />
       <el-table-column
         :label="t('MoldManagement.MoldOperate.createTime')"
@@ -137,6 +137,7 @@ import download from '@/utils/download'
 import { MoldOperateApi, MoldOperateVO } from '@/api/mes/moldoperate'
 import MoldOperateForm from './MoldOperateForm.vue'
 import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
+import { getSimpleUserList, type UserVO } from '@/api/system/user'
 
 /** 模具上下模 列表 */
 defineOptions({ name: 'MoldOperate' })
@@ -159,12 +160,23 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const moldList = ref<MoldVO[]>([])  // 模具列表
+const operatorOptions = ref<UserVO[]>([]) // 操作人列表
+
+/** 操作人 id -> 昵称 映射 */
+const operatorNameFormatter = (row: any) => {
+  if (!operatorOptions.value.length) return ''
+  const user = operatorOptions.value.find((u) => u.id === row.operatorId)
+  return user?.nickname || ''
+}
 
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
     moldList.value = await MoldBrandApi.getBrandList()
+    if (!operatorOptions.value.length) {
+      operatorOptions.value = (await getSimpleUserList()) ?? []
+    }
     const data = await MoldOperateApi.getMoldOperatePage(queryParams)
     list.value = data.list
     total.value = data.total