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 @@ - + ([]) // 模具列表 +const operatorOptions = ref([]) // 操作人列表 + +/** 操作人 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