diff --git a/src/api/mes/pro/andon/record/index.ts b/src/api/mes/pro/andon/record/index.ts
index 074bb03c1..88a040126 100644
--- a/src/api/mes/pro/andon/record/index.ts
+++ b/src/api/mes/pro/andon/record/index.ts
@@ -3,6 +3,7 @@ import request from '@/config/axios'
 // MES 安灯记录 VO
 export interface ProAndonRecordVO {
   id: number // 编号
+  configId: number // 安灯配置编号
   workstationId: number // 工作站编号
   workstationCode: string // 工作站编码
   workstationName: string // 工作站名称
diff --git a/src/views/mes/pro/andon/config/AndonConfigForm.vue b/src/views/mes/pro/andon/config/AndonConfigForm.vue
index a5dfd8722..3fd73c291 100644
--- a/src/views/mes/pro/andon/config/AndonConfigForm.vue
+++ b/src/views/mes/pro/andon/config/AndonConfigForm.vue
@@ -37,14 +37,12 @@
           <dict-tag v-else :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="scope.row.level" />
         </template>
       </el-table-column>
-      <el-table-column label="处置人" align="center" width="150">
+      <el-table-column label="处置人" align="center" width="200">
         <template #default="scope">
-          <!-- TODO @AI：user-select -->
-          <el-input
+          <UserSelect
             v-if="scope.row.editing"
             v-model="scope.row.handlerUserId"
-            placeholder="请输入用户编号"
-            type="number"
+            placeholder="请选择处置人"
           />
           <span v-else>{{ scope.row.handlerUserNickname || scope.row.handlerUserId || '-' }}</span>
         </template>
@@ -94,17 +92,18 @@
 <script setup lang="ts">
 import { ProAndonConfigApi, ProAndonConfigVO } from '@/api/mes/pro/andon/config'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { MesProAndonLevelEnum } from '@/views/mes/utils/constants'
+import UserSelect from '@/views/system/user/components/UserSelect.vue'
 
-// TODO @AI：参考别的模块，增加下注释；
-
+/** 安灯呼叫配置弹窗（内联编辑表格） */
 defineOptions({ name: 'AndonConfigDialog' })
 
 const message = useMessage()
 const { t } = useI18n()
 
-const dialogVisible = ref(false)
-const loading = ref(false)
-const list = ref<any[]>([])
+const dialogVisible = ref(false) // 弹窗的是否展示
+const loading = ref(false) // 列表的加载中
+const list = ref<any[]>([]) // 配置列表
 
 /** 打开弹窗 */
 const open = async () => {
@@ -129,7 +128,7 @@ const handleAdd = () => {
   list.value.unshift({
     id: undefined,
     reason: '',
-    level: 3, // TODO @AI：使用枚举；
+    level: MesProAndonLevelEnum.LEVEL3,
     handlerRoleId: undefined,
     handlerUserId: undefined,
     remark: '',
@@ -155,20 +154,11 @@ const handleSave = async (row: any) => {
     return
   }
   try {
-    // TODO @AI：直接使用 row；后端自己会处理的；
-    const data = {
-      id: row.id,
-      reason: row.reason,
-      level: row.level,
-      handlerRoleId: row.handlerRoleId,
-      handlerUserId: row.handlerUserId,
-      remark: row.remark
-    }
     if (row.isNew) {
-      await ProAndonConfigApi.createAndonConfig(data as any)
+      await ProAndonConfigApi.createAndonConfig(row)
       message.success(t('common.createSuccess'))
     } else {
-      await ProAndonConfigApi.updateAndonConfig(data as any)
+      await ProAndonConfigApi.updateAndonConfig(row)
       message.success(t('common.updateSuccess'))
     }
     await getList()
diff --git a/src/views/mes/pro/andon/config/components/AndonConfigSelect.vue b/src/views/mes/pro/andon/config/components/AndonConfigSelect.vue
new file mode 100644
index 000000000..970303319
--- /dev/null
+++ b/src/views/mes/pro/andon/config/components/AndonConfigSelect.vue
@@ -0,0 +1,83 @@
+<!-- MES 安灯配置选择器：纯下拉，前端过滤（支持 reason），选中后可获取完整配置 -->
+<template>
+  <el-select
+    v-model="selectValue"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :clearable="clearable"
+    filterable
+    :filter-method="handleFilter"
+    class="!w-1/1"
+    @change="handleChange"
+  >
+    <el-option
+      v-for="item in filteredList"
+      :key="item.id"
+      :label="item.reason"
+      :value="item.id"
+    >
+      <div class="flex items-center gap-8px">
+        <span>{{ item.reason }}</span>
+        <dict-tag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="item.level" />
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { ProAndonConfigApi, ProAndonConfigVO } from '@/api/mes/pro/andon/config'
+import { DICT_TYPE } from '@/utils/dict'
+
+defineOptions({ name: 'AndonConfigSelect' })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择呼叫原因'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [item: ProAndonConfigVO | undefined]
+}>()
+
+const allList = ref<ProAndonConfigVO[]>([])
+const filteredList = ref<ProAndonConfigVO[]>([])
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+/** 前端过滤（reason） */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = allList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = allList.value.filter(
+    (item) => item.reason?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (val: number | undefined) => {
+  const item = allList.value.find((o) => o.id === val)
+  emit('change', item)
+}
+
+/** 加载配置列表 */
+onMounted(async () => {
+  allList.value = await ProAndonConfigApi.getAndonConfigList()
+  filteredList.value = allList.value
+})
+</script>
diff --git a/src/views/mes/pro/andon/record/AndonHandleForm.vue b/src/views/mes/pro/andon/record/AndonHandleForm.vue
index 1fa51c5d0..ad94f26a9 100644
--- a/src/views/mes/pro/andon/record/AndonHandleForm.vue
+++ b/src/views/mes/pro/andon/record/AndonHandleForm.vue
@@ -22,19 +22,17 @@
         <dict-tag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="recordInfo.level" />
       </el-form-item>
       <!-- 可编辑字段 -->
-      <!-- TODO @AI：unocss 简化 style -->
       <el-form-item label="处置时间" prop="handleTime">
         <el-date-picker
           v-model="formData.handleTime"
           type="datetime"
           value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="请选择处置时间"
-          style="width: 100%"
+          class="!w-full"
         />
       </el-form-item>
-      <!-- TODO @AI：可选，user-select；只是默认当前人； -->
       <el-form-item label="处置人" prop="handlerUserId">
-        <el-input :model-value="handlerNickname" disabled placeholder="当前用户" />
+        <UserSelect v-model="formData.handlerUserId" />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" type="textarea" placeholder="请输入处置备注" />
@@ -51,41 +49,39 @@
 import { ProAndonRecordApi } from '@/api/mes/pro/andon/record'
 import { DICT_TYPE } from '@/utils/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
+import UserSelect from '@/views/system/user/components/UserSelect.vue'
 import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'AndonHandleForm' })
 
 const message = useMessage()
 
-const dialogVisible = ref(false)
-const formLoading = ref(false)
-const formData = ref<any>({})
-const recordInfo = ref<any>({})
-const handlerNickname = ref('')
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref<any>({}) // 表单数据
+const recordInfo = ref<any>({}) // 呼叫记录信息（只读展示）
 const formRules = reactive({
   handleTime: [{ required: true, message: '处置时间不能为空', trigger: 'change' }],
   handlerUserId: [{ required: true, message: '处置人不能为空', trigger: 'change' }]
 })
-const formRef = ref()
+const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (id: number) => {
   dialogVisible.value = true
+  resetForm()
   formLoading.value = true
-  // TODO @AI：还是老样子，先 reset；参考别的；
   try {
     // 加载记录信息
     recordInfo.value = await ProAndonRecordApi.getAndonRecord(id)
-    // 初始化处置表单
+    // 初始化处置表单，默认当前用户
     const userStore = useUserStoreWithOut()
     formData.value = {
       id: id,
-      // TODO @AI：不需要 format；
       handleTime: formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss'),
       handlerUserId: userStore.getUser?.id,
       remark: undefined
     }
-    handlerNickname.value = userStore.getUser?.nickname || ''
   } finally {
     formLoading.value = false
   }
@@ -106,4 +102,16 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    handleTime: undefined,
+    handlerUserId: undefined,
+    remark: undefined
+  }
+  recordInfo.value = {}
+  formRef.value?.resetFields()
+}
 </script>
diff --git a/src/views/mes/pro/andon/record/AndonRecordForm.vue b/src/views/mes/pro/andon/record/AndonRecordForm.vue
index c9003cadd..6a00a0d8d 100644
--- a/src/views/mes/pro/andon/record/AndonRecordForm.vue
+++ b/src/views/mes/pro/andon/record/AndonRecordForm.vue
@@ -14,36 +14,30 @@
         <MdWorkstationSelect v-model="formData.workstationId" placeholder="请选择工作站" />
       </el-form-item>
       <el-form-item label="发起人" prop="userId">
-        <!-- TODO @AI：可以选择，只是默认当前用户；可以在 user-select 组件里，封装下； -->
-        <el-input v-model="formData.userNickname" disabled placeholder="当前用户" />
+        <UserSelect v-model="formData.userId" />
       </el-form-item>
+      <!-- TODO @芋艿：这里的 select 组件 -->
       <el-form-item label="生产工单" prop="workOrderId">
-        <el-input v-model="formData.workOrderId" placeholder="请输入工单编号（可选）" type="number" />
+        <el-input
+          v-model="formData.workOrderId"
+          placeholder="请输入工单编号（可选）"
+          type="number"
+        />
       </el-form-item>
+      <!-- TODO @芋艿：这里的 select 组件 -->
       <el-form-item label="工序" prop="processId">
         <el-input v-model="formData.processId" placeholder="请输入工序编号（可选）" type="number" />
       </el-form-item>
-      <el-form-item label="呼叫原因" prop="reason">
-        <!-- TODO @AI：unocss 简化 style -->
-        <!-- TODO @AI：是不是做成 select 组件；另外，后端的 reason 存储，是不是增加存储 id？ -->
-        <el-select
-          v-model="selectedConfigId"
-          placeholder="请选择呼叫原因"
-          clearable
-          style="width: 100%"
-          @change="handleConfigChange"
-        >
-          <el-option
-            v-for="config in configList"
-            :key="config.id"
-            :label="config.reason"
-            :value="config.id"
-          />
-        </el-select>
+      <el-form-item label="呼叫原因" prop="configId">
+        <AndonConfigSelect v-model="formData.configId" @change="handleConfigChange" />
       </el-form-item>
       <el-form-item label="级别" prop="level">
-        <!-- TODO @AI：字典展示不出来； -->
-        <dict-tag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="formData.level" />
+        <dict-tag
+          v-if="formData.level"
+          :type="DICT_TYPE.MES_PRO_ANDON_LEVEL"
+          :value="formData.level"
+        />
+        <span v-else class="text-gray-400">由呼叫原因自动带出</span>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
@@ -70,56 +64,45 @@
 
 <script setup lang="ts">
 import { ProAndonRecordApi } from '@/api/mes/pro/andon/record'
-import { ProAndonConfigApi, ProAndonConfigVO } from '@/api/mes/pro/andon/config'
+import { ProAndonConfigVO } from '@/api/mes/pro/andon/config'
 import { DICT_TYPE } from '@/utils/dict'
 import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
+import UserSelect from '@/views/system/user/components/UserSelect.vue'
+import AndonConfigSelect from '../config/components/AndonConfigSelect.vue'
 import { useUserStoreWithOut } from '@/store/modules/user'
 
-// TODO @AI：注释缺少，参考别的 Form.vue
-
+/** 安灯呼叫记录 新增/详情弹窗 */
 defineOptions({ name: 'AndonRecordForm' })
 
 const { t } = useI18n()
 const message = useMessage()
 
-const dialogVisible = ref(false)
-const dialogTitle = ref('')
-const formLoading = ref(false)
-const formType = ref('')
-const formData = ref<any>({})
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；detail - 详情
+const formData = ref<any>({}) // 表单数据
 const formRules = reactive({
   workstationId: [{ required: true, message: '工作站不能为空', trigger: 'change' }],
-  reason: [{ required: true, message: '呼叫原因不能为空', trigger: 'change' }],
+  configId: [{ required: true, message: '呼叫原因不能为空', trigger: 'change' }],
   level: [{ required: true, message: '级别不能为空', trigger: 'change' }]
 })
-const formRef = ref()
-const configList = ref<ProAndonConfigVO[]>([])
-const selectedConfigId = ref<number>() // TODO @AI：应该是在 formData 里的；
+const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
+  dialogTitle.value = type === 'create' ? '新增安灯呼叫' : '安灯呼叫详情'
   formType.value = type
   resetForm()
-  // 加载配置列表
-  configList.value = await ProAndonConfigApi.getAndonConfigList()
   if (type === 'create') {
-    dialogTitle.value = '新增安灯呼叫'
     // 自动填充当前用户
     const userStore = useUserStoreWithOut()
     formData.value.userId = userStore.getUser?.id
-    formData.value.userNickname = userStore.getUser?.nickname
   } else if (type === 'detail') {
-    dialogTitle.value = '安灯呼叫详情'
     formLoading.value = true
     try {
       formData.value = await ProAndonRecordApi.getAndonRecord(id!)
-      // 回显选中的配置
-      // TODO @AI：后端拼接；
-      const config = configList.value.find((c) => c.reason === formData.value.reason)
-      if (config) {
-        selectedConfigId.value = config.id
-      }
     } finally {
       formLoading.value = false
     }
@@ -128,8 +111,7 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open })
 
 /** 选择配置后自动填充原因和级别 */
-const handleConfigChange = (configId: number) => {
-  const config = configList.value.find((c) => c.id === configId)
+const handleConfigChange = (config: ProAndonConfigVO | undefined) => {
   if (config) {
     formData.value.reason = config.reason
     formData.value.level = config.level
@@ -159,14 +141,13 @@ const resetForm = () => {
   formData.value = {
     workstationId: undefined,
     userId: undefined,
-    userNickname: undefined,
     workOrderId: undefined,
     processId: undefined,
+    configId: undefined,
     reason: undefined,
     level: undefined,
     remark: undefined
   }
-  selectedConfigId.value = undefined
   formRef.value?.resetFields()
 }
 </script>
diff --git a/src/views/mes/pro/andon/record/index.vue b/src/views/mes/pro/andon/record/index.vue
index b9b7052dd..b6dcbfb60 100644
--- a/src/views/mes/pro/andon/record/index.vue
+++ b/src/views/mes/pro/andon/record/index.vue
@@ -16,11 +16,12 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO @AI：发起人 select -->
-      <!-- TODO @AI：生产工单 select -->
-      <!-- TODO @AI：工序 select -->
-      <!-- TODO @AI：工序名称 select -->
-      <!-- TODO @AI：处置人 select -->
+      <el-form-item label="发起人" prop="userId">
+        <UserSelect v-model="queryParams.userId" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="处置人" prop="handlerUserId">
+        <UserSelect v-model="queryParams.handlerUserId" class="!w-240px" />
+      </el-form-item>
       <el-form-item label="处理状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
           <el-option
@@ -79,8 +80,8 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="工作站编码" align="center" prop="workstationCode" width="120" />
       <el-table-column label="工作站名称" align="center" prop="workstationName" min-width="120" />
-      <!-- TODO @AI：工单编码 -->
-      <!-- TODO @AI：工序 -->
+      <el-table-column label="工单编码" align="center" prop="workOrderCode" width="140" />
+      <el-table-column label="工序名称" align="center" prop="processName" width="120" />
       <el-table-column label="发起人" align="center" prop="userNickname" width="100" />
       <el-table-column
         label="发起时间"
@@ -89,15 +90,6 @@
         :formatter="dateFormatter"
         width="180"
       />
-      <!-- TODO @AI：发起时间 -->
-      <!-- TODO @AI：呼叫原因 -->
-      <!-- TODO @AI：级别 -->
-      <!-- TODO @AI：处理时间 -->
-      <!-- TODO @AI：处理人 -->
-      <!-- TODO @AI：处置状态 -->
-      <!-- TODO @AI：操作 -->
-      <el-table-column label="工单编码" align="center" prop="workOrderCode" width="140" />
-      <el-table-column label="工序名称" align="center" prop="processName" width="120" />
       <el-table-column label="呼叫原因" align="center" prop="reason" min-width="150" />
       <el-table-column label="级别" align="center" prop="level" width="80">
         <template #default="scope">
@@ -105,14 +97,14 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="处置时间"
+        label="处理时间"
         align="center"
         prop="handleTime"
         :formatter="dateFormatter"
         width="180"
       />
-      <el-table-column label="处置人" align="center" prop="handlerUserNickname" width="100" />
-      <el-table-column label="状态" align="center" prop="status" width="100">
+      <el-table-column label="处理人" align="center" prop="handlerUserNickname" width="100" />
+      <el-table-column label="处置状态" align="center" prop="status" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_PRO_ANDON_STATUS" :value="scope.row.status" />
         </template>
@@ -174,25 +166,27 @@ import AndonConfigDialog from '../config/AndonConfigForm.vue'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { MesProAndonStatusEnum } from '@/views/mes/utils/constants'
 import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
+import UserSelect from '@/views/system/user/components/UserSelect.vue'
 
 defineOptions({ name: 'MesProAndon' })
 
 const message = useMessage()
 const { t } = useI18n()
 
-const loading = ref(true)
-const list = ref<ProAndonRecordVO[]>([])
-const total = ref(0)
+const loading = ref(true) // 列表的加载中
+const list = ref<ProAndonRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   workstationId: undefined,
-  level: undefined,
+  userId: undefined,
+  handlerUserId: undefined,
   status: undefined,
   createTime: undefined
 })
-const queryFormRef = ref()
-const exportLoading = ref(false)
+const queryFormRef = ref() // 搜索的表单 Ref
+const exportLoading = ref(false) // 导出的加载中
 
 /** 查询列表 */
 const getList = async () => {