diff --git a/app/api/materials/[id]/route.ts b/app/api/materials/[id]/route.ts
index c4efc59..3c25640 100644
--- a/app/api/materials/[id]/route.ts
+++ b/app/api/materials/[id]/route.ts
@@ -341,6 +341,9 @@ export async function GET(
     }
 
     const canBypassVideoPreviewGate = isSystemAdmin(userRole) || userIsSuperAdmin;
+    const canEdit =
+      (material as any).userId === userId ||
+      canBypassVideoPreviewGate;
     if (videoPreviewPolicy.videoPreviewBlocked && !canBypassVideoPreviewGate) {
       return buildVideoPreviewBlockedResponse();
     }
@@ -427,6 +430,7 @@ export async function GET(
       ),
       assets: formattedAssets,
       canDownloadSource: canAccessSource,
+      canEdit,
       user: {
         username: materialWithUser.user?.username || '',
       },
@@ -500,7 +504,9 @@ export async function PUT(
       const formData = await request.formData();
       input = {
         productModel: String(formData.get('productModel') || ''),
-        reportTitle: formData.get('reportTitle') as string | null,
+        ...(formData.has('reportTitle')
+          ? { reportTitle: formData.get('reportTitle') as string | null }
+          : {}),
         categoryName: formData.get('categoryName') as string | null,
         sceneName: formData.get('sceneName') as string | null,
         platformName: formData.get('platformName') as string | null,
@@ -508,14 +514,24 @@ export async function PUT(
         materialType: String(formData.get('materialType') || ''),
         renderer: formData.get('renderer') as string | null,
         authorName: String(formData.get('authorName') || ''),
-        userId: formData.get('userId') as string | null,
-        taskNo: formData.get('taskNo') as string | null,
+        ...(formData.has('userId')
+          ? { userId: formData.get('userId') as string | null }
+          : {}),
+        ...(formData.has('taskNo')
+          ? { taskNo: formData.get('taskNo') as string | null }
+          : {}),
         ...(formData.has('dingtalkApprovalNo')
           ? { dingtalkApprovalNo: formData.get('dingtalkApprovalNo') as string | null }
           : {}),
-        taskDetailSourceType: formData.get('taskDetailSourceType') as string | null,
-        taskDetailRequesterUserId: formData.get('taskDetailRequesterUserId') as string | null,
-        isFullSet: formData.get('isFullSet') as string | null,
+        ...(formData.has('taskDetailSourceType')
+          ? { taskDetailSourceType: formData.get('taskDetailSourceType') as string | null }
+          : {}),
+        ...(formData.has('taskDetailRequesterUserId')
+          ? { taskDetailRequesterUserId: formData.get('taskDetailRequesterUserId') as string | null }
+          : {}),
+        ...(formData.has('isFullSet')
+          ? { isFullSet: formData.get('isFullSet') as string | null }
+          : {}),
       };
       const formPreview = formData.get('previewImage');
       previewImage = isWebFileLike(formPreview) ? formPreview : null;
diff --git a/app/api/materials/update/route.ts b/app/api/materials/update/route.ts
index ec0cd7b..fb2519c 100644
--- a/app/api/materials/update/route.ts
+++ b/app/api/materials/update/route.ts
@@ -22,7 +22,9 @@ export async function PUT(request: NextRequest) {
       id = String(formData.get('id') || '');
       input = {
         productModel: String(formData.get('productModel') || ''),
-        reportTitle: formData.get('reportTitle') as string | null,
+        ...(formData.has('reportTitle')
+          ? { reportTitle: formData.get('reportTitle') as string | null }
+          : {}),
         categoryName: formData.get('categoryName') as string | null,
         sceneName: formData.get('sceneName') as string | null,
         platformName: formData.get('platformName') as string | null,
@@ -30,14 +32,24 @@ export async function PUT(request: NextRequest) {
         materialType: String(formData.get('materialType') || ''),
         renderer: formData.get('renderer') as string | null,
         authorName: String(formData.get('authorName') || ''),
-        userId: formData.get('userId') as string | null,
-        taskNo: formData.get('taskNo') as string | null,
+        ...(formData.has('userId')
+          ? { userId: formData.get('userId') as string | null }
+          : {}),
+        ...(formData.has('taskNo')
+          ? { taskNo: formData.get('taskNo') as string | null }
+          : {}),
         ...(formData.has('dingtalkApprovalNo')
           ? { dingtalkApprovalNo: formData.get('dingtalkApprovalNo') as string | null }
           : {}),
-        taskDetailSourceType: formData.get('taskDetailSourceType') as string | null,
-        taskDetailRequesterUserId: formData.get('taskDetailRequesterUserId') as string | null,
-        isFullSet: formData.get('isFullSet') as string | null,
+        ...(formData.has('taskDetailSourceType')
+          ? { taskDetailSourceType: formData.get('taskDetailSourceType') as string | null }
+          : {}),
+        ...(formData.has('taskDetailRequesterUserId')
+          ? { taskDetailRequesterUserId: formData.get('taskDetailRequesterUserId') as string | null }
+          : {}),
+        ...(formData.has('isFullSet')
+          ? { isFullSet: formData.get('isFullSet') as string | null }
+          : {}),
       };
       const formPreview = formData.get('previewImage');
       previewImage = isWebFileLike(formPreview) ? formPreview : null;
diff --git a/app/api/users/list/route.ts b/app/api/users/list/route.ts
index 9dfe20e..a61e635 100644
--- a/app/api/users/list/route.ts
+++ b/app/api/users/list/route.ts
@@ -11,17 +11,17 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: '请先登录' }, { status: 401 });
     }
 
-    // 只获取激活的用户
+    // 只返回人员选择器实际需要的最小字段，避免向普通登录用户暴露邮箱等信息。
     const users = await prisma.user.findMany({
       where: {
         isActive: true,
         status: 'active',
+        archivedAt: null,
       },
       select: {
         id: true,
         username: true,
         realName: true,
-        email: true,
       },
       orderBy: {
         username: 'asc',
@@ -33,7 +33,6 @@ export async function GET(request: NextRequest) {
       id: user.id,
       username: user.username,
       displayName: user.realName || user.username,
-      email: user.email,
     }));
 
     return NextResponse.json(userList, { status: 200 });
diff --git a/app/edit/[id]/page.tsx b/app/edit/[id]/page.tsx
index 4124e53..412fed7 100644
--- a/app/edit/[id]/page.tsx
+++ b/app/edit/[id]/page.tsx
@@ -1,10 +1,11 @@
 'use client'
 
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useSession } from 'next-auth/react'
 import { useRouter } from 'next/navigation'
 import Header from '@/components/Header'
 import SearchableUserSelect from '@/components/SearchableUserSelect'
+import { useConfirmActionDialog } from '@/components/ConfirmActionDialog'
 import TaskReferenceFields from '@/components/upload/TaskReferenceFields'
 import {
   canManuallyReplacePreview,
@@ -17,12 +18,16 @@ import {
   requiresProductCategoryName,
   requiresRenderer,
 } from '@/lib/material-validation'
+import { isCertificateReportMaterialType } from '@/lib/certificate-report'
+import { TASK_DETAIL_SOURCE_TYPE_OPTIONS } from '@/lib/task-detail-source-type'
 import { getDingtalkApprovalNoError } from '@/lib/dingtalk-approval-no'
+import { parseFetchError } from '@/lib/error-handler'
 
 interface Material {
   id: string
   userId: string
   productModel: string
+  reportTitle?: string | null
   categoryName: string
   sceneName: string
   platformName?: string | null
@@ -36,8 +41,39 @@ interface Material {
   taskStatus?: string | null
   taskFetchedAt?: string | null
   isFullSet?: boolean
+  taskDetailSourceType?: string | null
   taskDetailRequesterUserId?: string | null
   taskDetailRequesterName?: string | null
+  canEdit?: boolean
+}
+
+type UserOption = {
+  id: string
+  username: string
+  displayName: string
+}
+
+type ReferenceKey = 'categories' | 'scenes' | 'platforms' | 'productCategories' | 'users'
+
+const REFERENCE_LABELS: Record<ReferenceKey, string> = {
+  categories: '店铺',
+  scenes: '场景',
+  platforms: '平台',
+  productCategories: '品类',
+  users: '人员',
+}
+
+function createFormSignature(values: Record<string, string | null>) {
+  return JSON.stringify(values)
+}
+
+function mergeUserOptions(primary: UserOption[], fallback: UserOption[]) {
+  const merged = new Map<string, UserOption>()
+  primary.forEach((user) => merged.set(user.id, user))
+  fallback.forEach((user) => {
+    if (user.id && !merged.has(user.id)) merged.set(user.id, user)
+  })
+  return Array.from(merged.values())
 }
 
 export default function EditMaterialPage({ params }: { params: { id: string } }) {
@@ -47,11 +83,15 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
   const [submitting, setSubmitting] = useState(false)
   const [error, setError] = useState('')
   const [success, setSuccess] = useState('')
+  const [referenceLoading, setReferenceLoading] = useState(false)
+  const [referenceFailures, setReferenceFailures] = useState<ReferenceKey[]>([])
+  const [initialFormSignature, setInitialFormSignature] = useState('')
 
   const [material, setMaterial] = useState<Material | null>(null)
   const [previewImage, setPreviewImage] = useState<File | null>(null)
   const [previewUrl, setPreviewUrl] = useState('')
   const [productModel, setProductModel] = useState('')
+  const [reportTitle, setReportTitle] = useState('')
   const [categoryName, setCategoryName] = useState('')
   const [sceneName, setSceneName] = useState('')
   const [platformName, setPlatformName] = useState('')
@@ -67,70 +107,167 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
   const [isFullSet, setIsFullSet] = useState(false)
   const [taskDetailRequesterUserId, setTaskDetailRequesterUserId] = useState('')
   const [taskDetailRequesterName, setTaskDetailRequesterName] = useState('')
+  const [taskDetailSourceType, setTaskDetailSourceType] = useState('')
 
   const [categories, setCategories] = useState<Array<{ id: string; name: string }>>([])
   const [scenes, setScenes] = useState<Array<{ id: string; name: string }>>([])
   const [platforms, setPlatforms] = useState<Array<{ id: string; name: string; count: number }>>([])
   const [productCategories, setProductCategories] = useState<Array<{ id: string; name: string; count: number }>>([])
-  const [users, setUsers] = useState<Array<{ id: string; username: string; displayName: string }>>([])
+  const [users, setUsers] = useState<UserOption[]>([])
+  const previewObjectUrlRef = useRef<string | null>(null)
+  const bypassUnsavedGuardRef = useRef(false)
+  const errorRef = useRef<HTMLDivElement>(null)
 
   const showCategoryScene = requiresCategoryAndScene(materialType)
   const showRenderer = requiresRenderer(materialType)
   const showTaskNo = supportsTaskNo(materialType)
   const showIsFullSet = supportsIsFullSet(materialType)
   const allowPreviewReplacement = canManuallyReplacePreview(materialType)
+  const isCertificateReport = isCertificateReportMaterialType(materialType)
   const isFetchedTask = taskStatus === 'fetched'
   const materialTypeOptions = getSelectableMaterialTypeOptions(materialType)
   const canKeepRequesterBlank =
     material?.materialType === '任务-详情' && !material.taskDetailRequesterUserId
+  const { confirmAction, confirmActionDialog } = useConfirmActionDialog()
+  const currentFormSignature = useMemo(() => createFormSignature({
+    previewImage: previewImage
+      ? `${previewImage.name}:${previewImage.size}:${previewImage.lastModified}`
+      : null,
+    productModel,
+    reportTitle,
+    categoryName,
+    sceneName,
+    platformName,
+    productCategoryName,
+    materialType,
+    renderer,
+    authorName,
+    userId,
+    taskNo,
+    dingtalkApprovalNo,
+    taskDetailSourceType,
+    taskDetailRequesterUserId,
+  }), [
+    authorName,
+    categoryName,
+    dingtalkApprovalNo,
+    materialType,
+    platformName,
+    previewImage,
+    productCategoryName,
+    productModel,
+    renderer,
+    reportTitle,
+    sceneName,
+    taskDetailRequesterUserId,
+    taskDetailSourceType,
+    taskNo,
+    userId,
+  ])
+  const hasUnsavedChanges =
+    Boolean(material && initialFormSignature) &&
+    currentFormSignature !== initialFormSignature
+  const hasReferenceFailure = referenceFailures.length > 0
 
-  const loadInitialData = useCallback(async () => {
+  const loadReferenceData = useCallback(async (
+    sourceMaterial: Material,
+    signal?: AbortSignal,
+  ) => {
+    setReferenceLoading(true)
+    setReferenceFailures([])
+
+    const fallbackUsers: UserOption[] = [
+      {
+        id: sourceMaterial.userId,
+        username: sourceMaterial.authorName || '原素材所有者',
+        displayName: sourceMaterial.authorName || '原素材所有者',
+      },
+    ]
+    if (sourceMaterial.taskDetailRequesterUserId) {
+      fallbackUsers.push({
+        id: sourceMaterial.taskDetailRequesterUserId,
+        username: '原需求运营',
+        displayName: sourceMaterial.taskDetailRequesterName || '原需求运营',
+      })
+    }
+
+    const requests: Array<{
+      key: ReferenceKey
+      url: string
+      apply: (payload: any) => void
+    }> = [
+      { key: 'categories', url: '/api/categories', apply: setCategories },
+      { key: 'scenes', url: '/api/scenes', apply: setScenes },
+      { key: 'platforms', url: '/api/platforms', apply: setPlatforms },
+      {
+        key: 'productCategories',
+        url: '/api/product-categories',
+        apply: setProductCategories,
+      },
+      {
+        key: 'users',
+        url: '/api/users/list',
+        apply: (payload) => {
+          const activeUsers = Array.isArray(payload) ? payload : []
+          setUsers(mergeUserOptions(activeUsers, fallbackUsers))
+        },
+      },
+    ]
+
+    const results = await Promise.allSettled(
+      requests.map(async ({ url }) => {
+        const response = await fetch(url, { signal })
+        if (!response.ok) {
+          const parsedError = await parseFetchError(response)
+          throw new Error(parsedError.message)
+        }
+        return response.json()
+      }),
+    )
+
+    if (signal?.aborted) return
+
+    const failures: ReferenceKey[] = []
+    results.forEach((result, index) => {
+      if (result.status === 'fulfilled') {
+        requests[index].apply(result.value)
+      } else {
+        failures.push(requests[index].key)
+        console.error(
+          `[material-edit] 加载${REFERENCE_LABELS[requests[index].key]}选项失败:`,
+          result.reason,
+        )
+      }
+    })
+
+    setReferenceFailures(failures)
+    setReferenceLoading(false)
+  }, [])
+
+  const loadInitialData = useCallback(async (signal: AbortSignal) => {
     try {
       setLoading(true)
+      setError('')
+      setMaterial(null)
 
-      const [materialResponse, categoriesResponse, scenesResponse, platformsResponse, productCategoriesResponse, usersResponse] =
-        await Promise.all([
-          fetch(`/api/materials/${params.id}`),
-          fetch('/api/categories'),
-          fetch('/api/scenes'),
-          fetch('/api/platforms'),
-          fetch('/api/product-categories'),
-          fetch('/api/users/list'),
-        ])
-
+      const materialResponse = await fetch(`/api/materials/${params.id}`, {
+        signal,
+      })
       if (!materialResponse.ok) {
-        throw new Error('获取素材信息失败')
+        const parsedError = await parseFetchError(materialResponse)
+        throw new Error(parsedError.message)
       }
 
-      const data = await materialResponse.json()
-      const currentUserId = (session?.user as any)?.id
-      const currentUserRole = (session?.user as any)?.role
-
-      let isUserSuperAdmin = false
-      try {
-        const superAdminCheck = await fetch('/api/admin/check-super-admin')
-        if (superAdminCheck.ok) {
-          const superAdminData = await superAdminCheck.json()
-          isUserSuperAdmin = Boolean(superAdminData.isSuperAdmin)
-        }
-      } catch (checkError) {
-        console.warn('检查超级管理员状态失败:', checkError)
-      }
-
-      if (
-        data.userId !== currentUserId &&
-        currentUserRole !== 'ADMIN' &&
-        currentUserRole !== 'SYSTEM_ADMIN' &&
-        !isUserSuperAdmin
-      ) {
+      const data = await materialResponse.json() as Material
+      if (!data.canEdit) {
         setError('您没有权限编辑此素材')
-        setTimeout(() => router.push('/'), 1500)
         return
       }
 
       setMaterial(data)
       setPreviewUrl(data.previewUrl || '')
       setProductModel(data.productModel || '')
+      setReportTitle(data.reportTitle || '')
       setCategoryName(data.categoryName || '')
       setSceneName(data.sceneName || '')
       setPlatformName(data.platformName || '')
@@ -146,43 +283,48 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
       setIsFullSet(Boolean(data.isFullSet))
       setTaskDetailRequesterUserId(data.taskDetailRequesterUserId || '')
       setTaskDetailRequesterName(data.taskDetailRequesterName || '')
+      setTaskDetailSourceType(data.taskDetailSourceType || '')
+      setUsers(mergeUserOptions([], [
+        {
+          id: data.userId,
+          username: data.authorName || '原素材所有者',
+          displayName: data.authorName || '原素材所有者',
+        },
+        ...(data.taskDetailRequesterUserId
+          ? [{
+              id: data.taskDetailRequesterUserId,
+              username: '原需求运营',
+              displayName: data.taskDetailRequesterName || '原需求运营',
+            }]
+          : []),
+      ]))
+      setInitialFormSignature(createFormSignature({
+        previewImage: null,
+        productModel: data.productModel || '',
+        reportTitle: data.reportTitle || '',
+        categoryName: data.categoryName || '',
+        sceneName: data.sceneName || '',
+        platformName: data.platformName || '',
+        productCategoryName: data.productCategoryName || '',
+        materialType: data.materialType || '',
+        renderer: data.renderer || '',
+        authorName: data.authorName || '',
+        userId: data.userId || '',
+        taskNo: data.taskNo || '',
+        dingtalkApprovalNo: data.dingtalkApprovalNo || '',
+        taskDetailSourceType: data.taskDetailSourceType || '',
+        taskDetailRequesterUserId: data.taskDetailRequesterUserId || '',
+      }))
 
-      if (categoriesResponse.ok) {
-        setCategories(await categoriesResponse.json())
-      }
-      if (scenesResponse.ok) {
-        setScenes(await scenesResponse.json())
-      }
-      if (platformsResponse.ok) {
-        setPlatforms(await platformsResponse.json())
-      }
-      if (productCategoriesResponse.ok) {
-        setProductCategories(await productCategoriesResponse.json())
-      }
-      if (usersResponse.ok) {
-        const activeUsers = await usersResponse.json()
-        const normalizedUsers = Array.isArray(activeUsers) ? activeUsers : []
-        if (
-          data.taskDetailRequesterUserId &&
-          !normalizedUsers.some((user) => user.id === data.taskDetailRequesterUserId)
-        ) {
-          normalizedUsers.push({
-            id: data.taskDetailRequesterUserId,
-            username: '已停用',
-            displayName: data.taskDetailRequesterName || '原需求运营',
-          })
-        }
-        setUsers(normalizedUsers)
-      }
+      void loadReferenceData(data, signal)
     } catch (loadError: any) {
+      if (signal.aborted) return
       console.error('加载编辑页失败:', loadError)
-      const { parseApiError } = await import('@/lib/error-handler')
-      const { message } = parseApiError(loadError)
-      setError(message)
+      setError(loadError instanceof Error ? loadError.message : '素材信息加载失败')
     } finally {
-      setLoading(false)
+      if (!signal.aborted) setLoading(false)
     }
-  }, [params.id, router, session])
+  }, [loadReferenceData, params.id])
 
   useEffect(() => {
     if (status === 'unauthenticated') {
@@ -191,10 +333,92 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
     }
 
     if (status === 'authenticated') {
-      void loadInitialData()
+      const controller = new AbortController()
+      void loadInitialData(controller.signal)
+      return () => controller.abort()
     }
   }, [status, router, loadInitialData])
 
+  useEffect(() => () => {
+    if (previewObjectUrlRef.current) {
+      URL.revokeObjectURL(previewObjectUrlRef.current)
+      previewObjectUrlRef.current = null
+    }
+  }, [])
+
+  useEffect(() => {
+    if (!hasUnsavedChanges) return
+
+    const handleBeforeUnload = (event: BeforeUnloadEvent) => {
+      if (bypassUnsavedGuardRef.current) return
+      event.preventDefault()
+      event.returnValue = ''
+    }
+    window.addEventListener('beforeunload', handleBeforeUnload)
+    return () => window.removeEventListener('beforeunload', handleBeforeUnload)
+  }, [hasUnsavedChanges])
+
+  useEffect(() => {
+    if (!error) return
+    errorRef.current?.focus()
+    errorRef.current?.scrollIntoView({ block: 'center', behavior: 'smooth' })
+  }, [error])
+
+  const confirmDiscardChanges = useCallback(async () => {
+    if (!hasUnsavedChanges) return true
+    const { confirmed } = await confirmAction({
+      title: '放弃未保存的修改？',
+      description: '本次修改不会保留。',
+      confirmLabel: '放弃修改',
+      cancelLabel: '继续编辑',
+      tone: 'danger',
+    })
+    return confirmed
+  }, [confirmAction, hasUnsavedChanges])
+
+  useEffect(() => {
+    if (!hasUnsavedChanges) return
+
+    const handleAnchorNavigation = (event: MouseEvent) => {
+      if (
+        event.defaultPrevented ||
+        event.button !== 0 ||
+        event.metaKey ||
+        event.ctrlKey ||
+        event.shiftKey ||
+        event.altKey
+      ) {
+        return
+      }
+
+      const target = event.target
+      if (!(target instanceof Element)) return
+      const anchor = target.closest<HTMLAnchorElement>('a[href]')
+      if (!anchor || anchor.target === '_blank' || anchor.hasAttribute('download')) return
+
+      const destination = new URL(anchor.href, window.location.href)
+      const isSameDocumentHash =
+        destination.pathname === window.location.pathname &&
+        destination.search === window.location.search &&
+        Boolean(destination.hash)
+      if (destination.href === window.location.href || isSameDocumentHash) return
+
+      event.preventDefault()
+      void confirmDiscardChanges().then((confirmed) => {
+        if (!confirmed) return
+        bypassUnsavedGuardRef.current = true
+        if (destination.origin === window.location.origin) {
+          router.push(`${destination.pathname}${destination.search}${destination.hash}`)
+        } else {
+          window.location.assign(destination.href)
+        }
+      })
+    }
+
+    document.addEventListener('click', handleAnchorNavigation, true)
+    return () => document.removeEventListener('click', handleAnchorNavigation, true)
+  }, [confirmDiscardChanges, hasUnsavedChanges, router])
+
   const handlePreviewChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const file = event.target.files?.[0]
     if (!file) {
@@ -206,21 +430,56 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
       return
     }
 
+    if (previewObjectUrlRef.current) {
+      URL.revokeObjectURL(previewObjectUrlRef.current)
+    }
+    const objectUrl = URL.createObjectURL(file)
+    previewObjectUrlRef.current = objectUrl
     setPreviewImage(file)
-    setPreviewUrl(URL.createObjectURL(file))
+    setPreviewUrl(objectUrl)
     setError('')
   }
 
+  const handleCancel = async () => {
+    if (!await confirmDiscardChanges()) return
+    bypassUnsavedGuardRef.current = true
+    router.back()
+  }
+
+  const handleRetryReferenceData = () => {
+    if (material) void loadReferenceData(material)
+  }
+
   const handleSubmit = async (event: React.FormEvent) => {
     event.preventDefault()
     setError('')
     setSuccess('')
 
-    if (!productModel || !materialType || !authorName) {
+    if (referenceLoading) {
+      setError('选项仍在加载，请稍后再保存')
+      return
+    }
+
+    if (hasReferenceFailure) {
+      setError('部分选项加载失败，请重新加载后再保存')
+      return
+    }
+
+    if (!materialType || !authorName) {
       setError('请填写所有必填字段')
       return
     }
 
+    if (isCertificateReport) {
+      if (!productModel.trim() && !reportTitle.trim()) {
+        setError('SPU 和报告名称 / 检测对象至少填写一个')
+        return
+      }
+    } else if (!productModel.trim()) {
+      setError('请填写产品型号')
+      return
+    }
+
     if (showCategoryScene && (!categoryName || !sceneName)) {
       setError('请填写店铺和场景')
       return
@@ -250,7 +509,11 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
     }
 
     if (isFetchedTask) {
-      const confirmed = window.confirm('这条任务素材已经被外部系统获取过，继续保存可能影响对方使用，确认继续吗？')
+      const { confirmed } = await confirmAction({
+        title: '保存已被获取的任务素材？',
+        description: '外部系统已经读取过这条记录，本次修改可能影响后续使用。',
+        confirmLabel: '继续保存',
+      })
       if (!confirmed) {
         return
       }
@@ -261,6 +524,7 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
     try {
       const formData = new FormData()
       formData.append('productModel', productModel)
+      formData.append('reportTitle', reportTitle)
       formData.append('categoryName', categoryName)
       formData.append('sceneName', sceneName)
       formData.append('platformName', platformName)
@@ -271,6 +535,10 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
       formData.append('userId', userId)
       formData.append('taskNo', showTaskNo ? taskNo : '')
       formData.append('dingtalkApprovalNo', showTaskNo ? dingtalkApprovalNo : '')
+      formData.append(
+        'taskDetailSourceType',
+        materialType === '任务-详情' ? taskDetailSourceType : '',
+      )
       formData.append(
         'taskDetailRequesterUserId',
         materialType === '任务-详情' ? taskDetailRequesterUserId : '',
@@ -285,11 +553,13 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
         body: formData,
       })
 
-      const data = await response.json()
       if (!response.ok) {
-        throw new Error(data.error || '更新失败')
+        const parsedError = await parseFetchError(response)
+        throw new Error(parsedError.message)
       }
 
+      bypassUnsavedGuardRef.current = true
+      setInitialFormSignature(currentFormSignature)
       setSuccess('素材信息更新成功')
       setTimeout(() => {
         router.push('/')
@@ -306,18 +576,65 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
     return (
       <div className="min-h-screen bg-gray-50 dark:bg-gray-900">
         <Header session={session} />
-        <div className="mx-auto max-w-3xl px-4 py-10">
-          <div className="text-center text-gray-600 dark:text-gray-400">加载中...</div>
+        <div className="mx-auto max-w-3xl px-4 py-6 sm:py-10" aria-busy="true" aria-label="正在加载素材信息">
+          <div className="rounded-2xl bg-white p-4 shadow-lg dark:bg-gray-800 sm:p-8">
+            <div className="h-8 w-36 animate-pulse rounded bg-gray-200 dark:bg-gray-700" />
+            <div className="mt-8 space-y-6">
+              {[1, 2, 3, 4].map((item) => (
+                <div key={item} className="space-y-2">
+                  <div className="h-4 w-20 animate-pulse rounded bg-gray-200 dark:bg-gray-700" />
+                  <div className="h-11 animate-pulse rounded-xl bg-gray-100 dark:bg-gray-700/70" />
+                </div>
+              ))}
+            </div>
+          </div>
         </div>
       </div>
     )
   }
 
+  if (!material) {
+    return (
+      <div className="min-h-screen bg-gray-50 dark:bg-gray-900">
+        <Header session={session} />
+        <main className="mx-auto max-w-xl px-4 py-10">
+          <div
+            ref={errorRef}
+            role="alert"
+            tabIndex={-1}
+            className="rounded-2xl bg-white p-6 shadow-lg outline-none dark:bg-gray-800"
+          >
+            <h1 className="text-xl font-bold text-gray-900 dark:text-white">素材信息加载失败</h1>
+            <p className="mt-2 text-sm text-gray-600 dark:text-gray-300">
+              {error || '当前无法打开这条素材，请重新加载。'}
+            </p>
+            <div className="mt-6 flex flex-col-reverse gap-3 sm:flex-row sm:justify-end">
+              <button
+                type="button"
+                onClick={() => router.push('/')}
+                className="min-h-11 rounded-apple border border-gray-300 px-5 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-200 dark:border-gray-600 dark:text-gray-200 dark:hover:bg-gray-700"
+              >
+                返回素材库
+              </button>
+              <button
+                type="button"
+                onClick={() => window.location.reload()}
+                className="btn-primary min-h-11 px-5"
+              >
+                重新加载
+              </button>
+            </div>
+          </div>
+        </main>
+      </div>
+    )
+  }
+
   return (
     <div className="min-h-screen bg-gray-50 dark:bg-gray-900">
       <Header session={session} />
-      <div className="mx-auto max-w-3xl px-4 py-10">
-        <div className="rounded-2xl bg-white p-8 shadow-lg dark:bg-gray-800">
+      <div className="mx-auto max-w-3xl px-4 py-6 sm:py-10">
+        <div className="rounded-2xl bg-white p-4 shadow-lg dark:bg-gray-800 sm:p-8">
           <h1 className="mb-6 text-2xl font-bold text-gray-900 dark:text-white">编辑素材信息</h1>
 
           {isFetchedTask && (
@@ -334,14 +651,40 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
             </div>
           )}
 
+          {referenceLoading && (
+            <div role="status" className="mb-4 rounded-lg border border-gray-200 bg-gray-50 px-4 py-3 text-sm text-gray-600 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300">
+              正在加载店铺、场景和人员选项…
+            </div>
+          )}
+
+          {hasReferenceFailure && (
+            <div role="alert" className="mb-4 flex flex-col gap-3 rounded-lg border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700 sm:flex-row sm:items-center sm:justify-between">
+              <span>
+                {referenceFailures.map((key) => REFERENCE_LABELS[key]).join('、')}加载失败，当前值已保留。
+              </span>
+              <button
+                type="button"
+                onClick={handleRetryReferenceData}
+                className="min-h-10 shrink-0 rounded border border-red-300 px-4 font-medium hover:bg-red-100 focus:outline-none focus:ring-2 focus:ring-red-200"
+              >
+                重新加载
+              </button>
+            </div>
+          )}
+
           {error && (
-            <div className="mb-4 rounded-lg border border-red-200 bg-red-50 p-4 text-red-600">
+            <div
+              ref={errorRef}
+              role="alert"
+              tabIndex={-1}
+              className="mb-4 rounded-lg border border-red-200 bg-red-50 p-4 text-red-600 outline-none"
+            >
               {error}
             </div>
           )}
 
           {success && (
-            <div className="mb-4 rounded-lg border border-green-200 bg-green-50 p-4 text-green-600">
+            <div role="status" className="mb-4 rounded-lg border border-green-200 bg-green-50 p-4 text-green-600">
               {success}
             </div>
           )}
@@ -349,7 +692,10 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
           <form onSubmit={handleSubmit} className="space-y-6">
             {allowPreviewReplacement && (
               <div>
-                <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+                <label
+                  htmlFor={`edit-material-${params.id}-preview`}
+                  className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+                >
                   预览图
                 </label>
                 <div className="space-y-3">
@@ -362,29 +708,63 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
                       当前没有预览图
                     </div>
                   )}
-                  <input type="file" accept="image/*" onChange={handlePreviewChange} className="block w-full text-sm" />
+                  <input
+                    id={`edit-material-${params.id}-preview`}
+                    type="file"
+                    accept="image/*"
+                    onChange={handlePreviewChange}
+                    className="block w-full text-sm"
+                    disabled={submitting}
+                  />
                 </div>
               </div>
             )}
 
             <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
-                产品型号 *
+              <label
+                htmlFor={`edit-material-${params.id}-product-model`}
+                className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+              >
+                {isCertificateReport ? 'SPU' : '产品型号 *'}
               </label>
               <input
+                id={`edit-material-${params.id}-product-model`}
                 type="text"
                 value={productModel}
                 onChange={(event) => setProductModel(event.target.value)}
                 className="input-apple"
-                required
+                required={!isCertificateReport}
               />
             </div>
 
+            {isCertificateReport && (
+              <div>
+                <label
+                  htmlFor={`edit-material-${params.id}-report-title`}
+                  className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+                >
+                  报告名称 / 检测对象
+                </label>
+                <input
+                  id={`edit-material-${params.id}-report-title`}
+                  type="text"
+                  value={reportTitle}
+                  onChange={(event) => setReportTitle(event.target.value)}
+                  className="input-apple"
+                  placeholder="SPU 和此字段至少填写一个"
+                />
+              </div>
+            )}
+
             <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+              <label
+                htmlFor={`edit-material-${params.id}-type`}
+                className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+              >
                 素材类型 *
               </label>
               <select
+                id={`edit-material-${params.id}-type`}
                 value={materialType}
                 onChange={(event) => setMaterialType(event.target.value)}
                 className="input-apple"
@@ -402,16 +782,30 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
             {showCategoryScene && (
               <>
                 <div>
-                  <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+                  <label
+                    htmlFor={`edit-material-${params.id}-category`}
+                    className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+                  >
                     店铺 *
                   </label>
                   <select
+                    id={`edit-material-${params.id}-category`}
                     value={categoryName}
                     onChange={(event) => setCategoryName(event.target.value)}
                     className="input-apple"
                     required
+                    disabled={
+                      submitting ||
+                      referenceLoading ||
+                      referenceFailures.includes('categories')
+                    }
                   >
-                    <option value="">请选择店铺</option>
+                    <option value="">
+                      {referenceLoading ? '正在加载店铺...' : '请选择店铺'}
+                    </option>
+                    {categoryName && !categories.some((category) => category.name === categoryName) && (
+                      <option value={categoryName}>{categoryName}</option>
+                    )}
                     {categories.map((category) => (
                       <option key={category.id} value={category.name}>
                         {category.name}
@@ -421,16 +815,30 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
                 </div>
 
                 <div>
-                  <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+                  <label
+                    htmlFor={`edit-material-${params.id}-scene`}
+                    className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+                  >
                     场景 *
                   </label>
                   <select
+                    id={`edit-material-${params.id}-scene`}
                     value={sceneName}
                     onChange={(event) => setSceneName(event.target.value)}
                     className="input-apple"
                     required
+                    disabled={
+                      submitting ||
+                      referenceLoading ||
+                      referenceFailures.includes('scenes')
+                    }
                   >
-                    <option value="">请选择场景</option>
+                    <option value="">
+                      {referenceLoading ? '正在加载场景...' : '请选择场景'}
+                    </option>
+                    {sceneName && !scenes.some((scene) => scene.name === sceneName) && (
+                      <option value={sceneName}>{sceneName}</option>
+                    )}
                     {scenes.map((scene) => (
                       <option key={scene.id} value={scene.name}>
                         {scene.name}
@@ -442,15 +850,27 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
             )}
 
             <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+              <label
+                htmlFor={`edit-material-${params.id}-platform`}
+                className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+              >
                 平台分类
               </label>
               <select
+                id={`edit-material-${params.id}-platform`}
                 value={platformName}
                 onChange={(event) => setPlatformName(event.target.value)}
                 className="input-apple"
+                disabled={
+                  submitting ||
+                  referenceLoading ||
+                  referenceFailures.includes('platforms')
+                }
               >
-                <option value="">不选择</option>
+                <option value="">{referenceLoading ? '正在加载平台...' : '不选择'}</option>
+                {platformName && !platforms.some((platform) => platform.name === platformName) && (
+                  <option value={platformName}>{platformName}</option>
+                )}
                 {platforms.map((platform) => (
                   <option key={platform.id} value={platform.name}>
                     {platform.name}
@@ -460,15 +880,28 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
             </div>
 
             <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+              <label
+                htmlFor={`edit-material-${params.id}-product-category`}
+                className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+              >
                 品类{requiresProductCategoryName(materialType) ? ' *' : ''}
               </label>
               <select
+                id={`edit-material-${params.id}-product-category`}
                 value={productCategoryName}
                 onChange={(event) => setProductCategoryName(event.target.value)}
                 className="input-apple"
+                disabled={
+                  submitting ||
+                  referenceLoading ||
+                  referenceFailures.includes('productCategories')
+                }
               >
-                <option value="">不选择</option>
+                <option value="">{referenceLoading ? '正在加载品类...' : '不选择'}</option>
+                {productCategoryName &&
+                  !productCategories.some((category) => category.name === productCategoryName) && (
+                    <option value={productCategoryName}>{productCategoryName}</option>
+                  )}
                 {productCategories.map((category) => (
                   <option key={category.id} value={category.name}>
                     {category.name}
@@ -479,10 +912,19 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
 
             {showRenderer && (
               <div>
-                <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+                <label
+                  htmlFor={`edit-material-${params.id}-renderer`}
+                  className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+                >
                   渲染器 *
                 </label>
-                <select value={renderer} onChange={(event) => setRenderer(event.target.value)} className="input-apple" required>
+                <select
+                  id={`edit-material-${params.id}-renderer`}
+                  value={renderer}
+                  onChange={(event) => setRenderer(event.target.value)}
+                  className="input-apple"
+                  required
+                >
                   <option value="">请选择渲染器</option>
                   <option value="CR">CR</option>
                   <option value="VR">VR</option>
@@ -503,29 +945,59 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
             )}
 
             {materialType === '任务-详情' && (
-              <div>
-                <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
-                  需求运营{canKeepRequesterBlank ? '' : ' *'}
-                </label>
-                <SearchableUserSelect
-                  users={users}
-                  value={taskDetailRequesterUserId}
-                  onChange={(nextUserId, displayName) => {
-                    setTaskDetailRequesterUserId(nextUserId)
-                    setTaskDetailRequesterName(displayName)
-                  }}
-                  placeholder="搜索发起本次出图需求的运营人员"
-                  required={!canKeepRequesterBlank}
-                  clearable={canKeepRequesterBlank}
-                />
-                <p className="mt-1 text-xs text-gray-500 dark:text-gray-400">
-                  {canKeepRequesterBlank
-                    ? taskDetailRequesterName
-                      ? `原记录为“${taskDetailRequesterName}”，对应账号已不可选；可保持原记录或重新选择。`
-                      : '这是一条历史素材，原来没有需求运营数据，可暂时留空。'
-                    : '记录发起本次出图需求的运营人员，与素材所有者可以不同。'}
-                </p>
-              </div>
+              <>
+                <div>
+                  <label
+                    htmlFor={`edit-material-${params.id}-source-type`}
+                    className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+                  >
+                    出图方式
+                  </label>
+                  <select
+                    id={`edit-material-${params.id}-source-type`}
+                    value={taskDetailSourceType}
+                    onChange={(event) => setTaskDetailSourceType(event.target.value)}
+                    className="input-apple"
+                  >
+                    <option value="">未设置</option>
+                    {TASK_DETAIL_SOURCE_TYPE_OPTIONS.map((option) => (
+                      <option key={option} value={option}>
+                        {option}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+
+                <div>
+                  <label
+                    htmlFor={`edit-material-${params.id}-requester`}
+                    className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+                  >
+                    需求运营{canKeepRequesterBlank ? '' : ' *'}
+                  </label>
+                  <SearchableUserSelect
+                    id={`edit-material-${params.id}-requester`}
+                    users={users}
+                    value={taskDetailRequesterUserId}
+                    onChange={(nextUserId, displayName) => {
+                      setTaskDetailRequesterUserId(nextUserId)
+                      setTaskDetailRequesterName(displayName)
+                    }}
+                    placeholder="搜索发起本次出图需求的运营人员"
+                    required={!canKeepRequesterBlank}
+                    clearable={canKeepRequesterBlank}
+                    loading={referenceLoading}
+                    disabled={submitting || referenceFailures.includes('users')}
+                  />
+                  <p className="mt-1 text-xs text-gray-500 dark:text-gray-400">
+                    {canKeepRequesterBlank
+                      ? taskDetailRequesterName
+                        ? `原记录为“${taskDetailRequesterName}”，对应账号已不可选；可保持原记录或重新选择。`
+                        : '这是一条历史素材，原来没有需求运营数据，可暂时留空。'
+                      : '记录发起本次出图需求的运营人员，与素材所有者可以不同。'}
+                  </p>
+                </div>
+              </>
             )}
 
             {showIsFullSet && (
@@ -545,10 +1017,14 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
             )}
 
             <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300">
+              <label
+                htmlFor={`edit-material-${params.id}-owner`}
+                className="mb-2 block text-sm font-medium text-gray-700 dark:text-gray-300"
+              >
                 作者（素材所有者） *
               </label>
               <SearchableUserSelect
+                id={`edit-material-${params.id}-owner`}
                 users={users}
                 value={userId}
                 onChange={(nextUserId, displayName) => {
@@ -557,6 +1033,8 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
                 }}
                 placeholder="请输入或搜索用户（支持拼音）"
                 required
+                loading={referenceLoading}
+                disabled={submitting || referenceFailures.includes('users')}
               />
               <p className="mt-1 text-xs text-gray-500 dark:text-gray-400">
                 修改作者会同步变更素材归属人。
@@ -578,22 +1056,35 @@ export default function EditMaterialPage({ params }: { params: { id: string } })
               </div>
             )}
 
-            <div className="flex gap-4 pt-4">
-              <button
-                type="button"
-                onClick={() => router.back()}
-                className="flex-1 rounded-apple border border-gray-300 px-6 py-3 font-medium text-gray-700 transition-colors hover:bg-gray-50 dark:border-gray-600 dark:text-gray-300 dark:hover:bg-gray-700"
-                disabled={submitting}
-              >
-                取消
-              </button>
-              <button type="submit" className="btn-primary flex-1" disabled={submitting}>
-                {submitting ? '保存中...' : '保存修改'}
-              </button>
+            <div className="sticky bottom-0 z-20 -mx-4 border-t border-gray-200 bg-white/95 px-4 pt-3 pb-[max(0.75rem,env(safe-area-inset-bottom))] backdrop-blur-sm dark:border-gray-700 dark:bg-gray-800/95 sm:static sm:mx-0 sm:border-0 sm:bg-transparent sm:p-0 sm:pt-4 sm:backdrop-blur-none">
+              {hasUnsavedChanges && (
+                <div className="mb-2 flex items-center gap-2 text-xs text-gray-500 sm:hidden">
+                  <span className="h-2 w-2 rounded-full bg-amber-500" aria-hidden="true" />
+                  未保存
+                </div>
+              )}
+              <div className="grid grid-cols-2 gap-3 sm:flex sm:gap-4">
+                <button
+                  type="button"
+                  onClick={() => void handleCancel()}
+                  className="min-h-11 rounded-apple border border-gray-300 px-4 font-medium text-gray-700 transition-colors hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-200 dark:border-gray-600 dark:text-gray-300 dark:hover:bg-gray-700 sm:flex-1"
+                  disabled={submitting}
+                >
+                  取消
+                </button>
+                <button
+                  type="submit"
+                  className="btn-primary min-h-11 px-4 sm:flex-1"
+                  disabled={submitting || referenceLoading || hasReferenceFailure}
+                >
+                  {submitting ? '保存中...' : '保存修改'}
+                </button>
+              </div>
             </div>
           </form>
         </div>
       </div>
+      {confirmActionDialog}
     </div>
   )
 }
diff --git a/app/page.tsx b/app/page.tsx
index 3c4110f..608b062 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -588,13 +588,12 @@ export default function Home() {
         }
         if (requestId === materialsRequestIdRef.current) {
           const data = await response.json()
-          // 素材ID验证和previewUrl fallback
+          // 清理素材 ID，并为预览图补齐统一 fallback
           const materialsList = ((data.materials || data) as Material[])
             .map((e) => {
-              // 验证ID
               if (!e.id || typeof e.id !== 'string') return null
               const trimmedId = e.id.trim()
-              if (!trimmedId || trimmedId.length < 10 || trimmedId.length > 100) return null
+              if (!trimmedId) return null
               
               // previewUrl fallback逻辑
               const previewUrl = e.previewUrl || 
@@ -1346,7 +1345,7 @@ export default function Home() {
           <SearchBar
             value={searchKeyword}
             onChange={handleSearchChange}
-            placeholder="搜索SPU、店铺、场景类别、作者..."
+            placeholder="搜索素材 ID、SPU、任务号、店铺、场景或作者"
             isSearching={isSearchPending}
           />
 
diff --git a/components/EditMaterialModal.tsx b/components/EditMaterialModal.tsx
deleted file mode 100644
index 065d7c7..0000000
--- a/components/EditMaterialModal.tsx
+++ /dev/null
@@ -1,514 +0,0 @@
-'use client'
-
-import { useEffect, useState } from 'react'
-import SearchableUserSelect from '@/components/SearchableUserSelect'
-import {
-  canManuallyReplacePreview,
-  getSelectableMaterialTypeOptions,
-  supportsIsFullSet,
-  supportsTaskNo,
-} from '@/lib/material-type-options'
-import { isCertificateReportMaterialType } from '@/lib/certificate-report'
-import { TASK_DETAIL_SOURCE_TYPE_OPTIONS } from '@/lib/task-detail-source-type'
-import TaskReferenceFields from '@/components/upload/TaskReferenceFields'
-import { getDingtalkApprovalNoError } from '@/lib/dingtalk-approval-no'
-import {
-  requiresCategoryAndScene,
-  requiresProductCategoryName,
-  requiresRenderer,
-} from '@/lib/material-validation'
-
-interface EditMaterialModalProps {
-  material: {
-    id: string
-    previewUrl: string
-    productModel: string
-    reportTitle?: string | null
-    categoryName: string
-    sceneName: string
-    platformName?: string | null
-    productCategoryName?: string | null
-    materialType: string
-    renderer: string
-    authorName: string
-    userId: string
-    taskNo?: string | null
-    dingtalkApprovalNo?: string | null
-    taskDetailSourceType?: string | null
-    taskStatus?: string | null
-    taskFetchedAt?: string | null
-    isFullSet?: boolean
-    taskDetailRequesterUserId?: string | null
-    taskDetailRequesterName?: string | null
-  }
-  onClose: () => void
-  onSuccess: () => void
-}
-
-export default function EditMaterialModal({ material, onClose, onSuccess }: EditMaterialModalProps) {
-  const [previewImage, setPreviewImage] = useState<File | null>(null)
-  const [previewUrl, setPreviewUrl] = useState<string>(material.previewUrl || '')
-  const [productModel, setProductModel] = useState(material.productModel)
-  const [reportTitle, setReportTitle] = useState(material.reportTitle || '')
-  const [categoryName, setCategoryName] = useState(material.categoryName)
-  const [sceneName, setSceneName] = useState(material.sceneName)
-  const [platformName, setPlatformName] = useState(material.platformName || '')
-  const [productCategoryName, setProductCategoryName] = useState(material.productCategoryName || '')
-  const [materialType, setMaterialType] = useState(material.materialType || '3D场景')
-  const [renderer, setRenderer] = useState(material.renderer || 'CR')
-  const [authorName, setAuthorName] = useState(material.authorName)
-  const [userId, setUserId] = useState(material.userId)
-  const [taskNo, setTaskNo] = useState(material.taskNo || '')
-  const [dingtalkApprovalNo, setDingtalkApprovalNo] = useState(material.dingtalkApprovalNo || '')
-  const [taskDetailSourceType, setTaskDetailSourceType] = useState(material.taskDetailSourceType || '')
-  const [taskDetailRequesterUserId, setTaskDetailRequesterUserId] = useState(material.taskDetailRequesterUserId || '')
-  const [taskDetailRequesterName, setTaskDetailRequesterName] = useState(material.taskDetailRequesterName || '')
-  const [taskStatus] = useState(material.taskStatus || '')
-  const [taskFetchedAt] = useState(material.taskFetchedAt || '')
-  const [isFullSet] = useState(Boolean(material.isFullSet))
-  const [users, setUsers] = useState<Array<{ id: string; displayName: string; username: string }>>([])
-  const [categories, setCategories] = useState<Array<{ id: string; name: string }>>([])
-  const [scenes, setScenes] = useState<Array<{ id: string; name: string }>>([])
-  const [platforms, setPlatforms] = useState<Array<{ id: string; name: string; count: number }>>([])
-  const [productCategories, setProductCategories] = useState<Array<{ id: string; name: string; count: number }>>([])
-  const [updating, setUpdating] = useState(false)
-  const [error, setError] = useState('')
-
-  const showCategoryScene = requiresCategoryAndScene(materialType)
-  const showRenderer = requiresRenderer(materialType)
-  const showTaskNo = supportsTaskNo(materialType)
-  const showIsFullSet = supportsIsFullSet(materialType)
-  const allowPreviewReplacement = canManuallyReplacePreview(materialType)
-  const isCertificateReport = isCertificateReportMaterialType(materialType)
-  const isFetchedTask = taskStatus === 'fetched'
-  const materialTypeOptions = getSelectableMaterialTypeOptions(materialType)
-  const canKeepRequesterBlank =
-    material.materialType === '任务-详情' && !material.taskDetailRequesterUserId
-
-  useEffect(() => {
-    void fetchSelectOptions()
-  }, [])
-
-  const fetchSelectOptions = async () => {
-    try {
-      const [categoriesResponse, scenesResponse, platformsResponse, productCategoriesResponse, usersResponse] = await Promise.all([
-        fetch('/api/categories'),
-        fetch('/api/scenes'),
-        fetch('/api/platforms'),
-        fetch('/api/product-categories'),
-        fetch('/api/users/list'),
-      ])
-
-      if (categoriesResponse.ok) {
-        setCategories(await categoriesResponse.json())
-      }
-      if (scenesResponse.ok) {
-        setScenes(await scenesResponse.json())
-      }
-      if (platformsResponse.ok) {
-        setPlatforms(await platformsResponse.json())
-      }
-      if (productCategoriesResponse.ok) {
-        setProductCategories(await productCategoriesResponse.json())
-      }
-      if (usersResponse.ok) {
-        const activeUsers = await usersResponse.json()
-        const normalizedUsers = Array.isArray(activeUsers) ? activeUsers : []
-        if (
-          material.taskDetailRequesterUserId &&
-          !normalizedUsers.some((user) => user.id === material.taskDetailRequesterUserId)
-        ) {
-          normalizedUsers.push({
-            id: material.taskDetailRequesterUserId,
-            username: '已停用',
-            displayName: material.taskDetailRequesterName || '原需求运营',
-          })
-        }
-        setUsers(normalizedUsers)
-      }
-    } catch (fetchError) {
-      console.error('加载编辑弹窗数据失败:', fetchError)
-    }
-  }
-
-  const handlePreviewChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const file = event.target.files?.[0]
-    if (!file) {
-      return
-    }
-
-    if (!file.type.startsWith('image/')) {
-      setError('请选择图片文件')
-      return
-    }
-
-    setPreviewImage(file)
-    setPreviewUrl(URL.createObjectURL(file))
-    setError('')
-  }
-
-  const handleSubmit = async (event: React.FormEvent) => {
-    event.preventDefault()
-    setError('')
-
-    if (!materialType || !authorName) {
-      setError('请填写所有必填字段')
-      return
-    }
-
-    if (isCertificateReport) {
-      if (!productModel.trim() && !reportTitle.trim()) {
-        setError('SPU 和 报告名称/检测对象 至少填写一个')
-        return
-      }
-    } else if (!productModel) {
-      setError('请填写所有必填字段')
-      return
-    }
-
-    if (showCategoryScene && (!categoryName || !sceneName)) {
-      setError('请填写店铺和场景')
-      return
-    }
-
-    if (requiresProductCategoryName(materialType) && !productCategoryName) {
-      setError('标准模型类型必须选择品类')
-      return
-    }
-
-    if (showRenderer && !renderer) {
-      setError('3D场景类型必须指定渲染器')
-      return
-    }
-
-    if (materialType === '任务-详情' && !taskDetailRequesterUserId && !canKeepRequesterBlank) {
-      setError('请选择需求运营人员')
-      return
-    }
-
-    if (showTaskNo) {
-      const dingtalkApprovalNoError = getDingtalkApprovalNoError(dingtalkApprovalNo)
-      if (dingtalkApprovalNoError) {
-        setError(dingtalkApprovalNoError)
-        return
-      }
-    }
-
-    if (isFetchedTask) {
-      const confirmed = window.confirm('这条任务素材已经被外部系统获取过，继续保存可能影响对方使用，确认继续吗？')
-      if (!confirmed) {
-        return
-      }
-    }
-
-    setUpdating(true)
-
-    try {
-      const formData = new FormData()
-      formData.append('id', material.id)
-      formData.append('productModel', productModel)
-      formData.append('reportTitle', reportTitle)
-      formData.append('categoryName', categoryName)
-      formData.append('sceneName', sceneName)
-      formData.append('platformName', platformName)
-      formData.append('productCategoryName', productCategoryName)
-      formData.append('materialType', materialType)
-      formData.append('renderer', renderer)
-      formData.append('authorName', authorName)
-      formData.append('userId', userId)
-      formData.append('taskNo', showTaskNo ? taskNo : '')
-      formData.append('dingtalkApprovalNo', showTaskNo ? dingtalkApprovalNo : '')
-      formData.append('taskDetailSourceType', materialType === '任务-详情' ? taskDetailSourceType : '')
-      formData.append(
-        'taskDetailRequesterUserId',
-        materialType === '任务-详情' ? taskDetailRequesterUserId : '',
-      )
-
-      if (previewImage && allowPreviewReplacement) {
-        formData.append('previewImage', previewImage)
-      }
-
-      const response = await fetch('/api/materials/update', {
-        method: 'PUT',
-        body: formData,
-      })
-
-      if (!response.ok) {
-        const data = await response.json()
-        setError(data.error || '更新失败')
-        return
-      }
-
-      onSuccess()
-    } catch (submitError) {
-      console.error('更新失败:', submitError)
-      setError('更新失败，请稍后再试')
-    } finally {
-      setUpdating(false)
-    }
-  }
-
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50 p-4">
-      <div className="max-h-[90vh] w-full max-w-2xl overflow-y-auto rounded-apple bg-white shadow-apple-lg dark:bg-gray-800">
-        <div className="border-b border-gray-200 p-6 dark:border-gray-700">
-          <div className="flex items-center justify-between">
-            <h2 className="text-2xl font-bold text-gray-900 dark:text-white">编辑素材</h2>
-            <button onClick={onClose} className="text-2xl leading-none text-gray-400 hover:text-gray-600">
-              ×
-            </button>
-          </div>
-        </div>
-
-        <form onSubmit={handleSubmit} className="space-y-6 p-6">
-          {isFetchedTask && (
-            <div className="rounded-lg border border-yellow-200 bg-yellow-50 p-4 text-sm text-yellow-800">
-              这条任务素材已被外部系统获取。
-              {taskFetchedAt ? ` 获取时间：${new Date(taskFetchedAt).toLocaleString('zh-CN')}` : ''}
-            </div>
-          )}
-
-          {!allowPreviewReplacement && (
-            <div className="rounded-lg border border-blue-200 bg-blue-50 p-4 text-sm text-blue-700">
-              当前素材类型的预览以系统生成结果为准，这里不支持手工替换封面。
-            </div>
-          )}
-
-          {error && (
-            <div className="rounded-apple border border-red-200 bg-red-50 px-4 py-3 text-red-600">
-              {error}
-            </div>
-          )}
-
-          {allowPreviewReplacement && (
-            <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700">预览图</label>
-              <div className="space-y-3">
-                {previewUrl ? (
-                  <div className="overflow-hidden rounded-apple border border-gray-200 bg-gray-50 p-3">
-                    <img src={previewUrl} alt="预览图" className="mx-auto max-h-72 rounded object-contain" />
-                  </div>
-                ) : (
-                  <div className="rounded-apple border border-dashed border-gray-300 p-6 text-center text-sm text-gray-500">
-                    当前没有预览图
-                  </div>
-                )}
-                <input type="file" accept="image/*" onChange={handlePreviewChange} className="block w-full text-sm" />
-              </div>
-            </div>
-          )}
-
-          <div>
-            <label className="mb-2 block text-sm font-medium text-gray-700">
-              {isCertificateReport ? 'SPU' : '产品型号 *'}
-            </label>
-            <input
-              type="text"
-              value={productModel}
-              onChange={(event) => setProductModel(event.target.value)}
-              className="input-apple"
-              required={!isCertificateReport}
-            />
-          </div>
-
-          {isCertificateReport && (
-            <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700">报告名称 / 检测对象</label>
-              <input
-                type="text"
-                value={reportTitle}
-                onChange={(event) => setReportTitle(event.target.value)}
-                className="input-apple"
-                placeholder="SPU 和这个字段至少填写一个"
-              />
-            </div>
-          )}
-
-          <div>
-            <label className="mb-2 block text-sm font-medium text-gray-700">素材类型 *</label>
-            <select value={materialType} onChange={(event) => setMaterialType(event.target.value)} className="input-apple" required>
-              {materialTypeOptions.map((type) => (
-                <option key={type} value={type}>
-                  {type}
-                </option>
-              ))}
-            </select>
-          </div>
-
-          {showCategoryScene && (
-            <>
-              <div>
-                <label className="mb-2 block text-sm font-medium text-gray-700">店铺 *</label>
-                <select value={categoryName} onChange={(event) => setCategoryName(event.target.value)} className="input-apple" required>
-                  <option value="">请选择店铺</option>
-                  {categories.map((category) => (
-                    <option key={category.id} value={category.name}>
-                      {category.name}
-                    </option>
-                  ))}
-                </select>
-              </div>
-
-              <div>
-                <label className="mb-2 block text-sm font-medium text-gray-700">场景 *</label>
-                <select value={sceneName} onChange={(event) => setSceneName(event.target.value)} className="input-apple" required>
-                  <option value="">请选择场景</option>
-                  {scenes.map((scene) => (
-                    <option key={scene.id} value={scene.name}>
-                      {scene.name}
-                    </option>
-                  ))}
-                </select>
-              </div>
-            </>
-          )}
-
-          <div>
-            <label className="mb-2 block text-sm font-medium text-gray-700">平台分类</label>
-            <select value={platformName} onChange={(event) => setPlatformName(event.target.value)} className="input-apple">
-              <option value="">不选择</option>
-              {platforms.map((platform) => (
-                <option key={platform.id} value={platform.name}>
-                  {platform.name}
-                </option>
-              ))}
-            </select>
-          </div>
-
-          <div>
-            <label className="mb-2 block text-sm font-medium text-gray-700">
-              品类{requiresProductCategoryName(materialType) ? ' *' : ''}
-            </label>
-            <select value={productCategoryName} onChange={(event) => setProductCategoryName(event.target.value)} className="input-apple">
-              <option value="">不选择</option>
-              {productCategories.map((category) => (
-                <option key={category.id} value={category.name}>
-                  {category.name}
-                </option>
-              ))}
-            </select>
-          </div>
-
-          {showRenderer && (
-            <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700">渲染器 *</label>
-              <select value={renderer} onChange={(event) => setRenderer(event.target.value)} className="input-apple" required>
-                <option value="">请选择渲染器</option>
-                <option value="CR">CR</option>
-                <option value="VR">VR</option>
-                <option value="其它">其它</option>
-              </select>
-            </div>
-          )}
-
-          {showTaskNo && (
-            <TaskReferenceFields
-              idPrefix={`edit-material-${material.id}`}
-              taskNo={taskNo}
-              onTaskNoChange={setTaskNo}
-              dingtalkApprovalNo={dingtalkApprovalNo}
-              onDingtalkApprovalNoChange={setDingtalkApprovalNo}
-              disabled={updating}
-            />
-          )}
-
-          {materialType === '任务-详情' && (
-            <>
-              <div>
-                <label className="mb-2 block text-sm font-medium text-gray-700">出图方式</label>
-                <select
-                  value={taskDetailSourceType}
-                  onChange={(event) => setTaskDetailSourceType(event.target.value)}
-                  className="input-apple"
-                >
-                  <option value="">未设置</option>
-                  {TASK_DETAIL_SOURCE_TYPE_OPTIONS.map((option) => (
-                    <option key={option} value={option}>
-                      {option}
-                    </option>
-                  ))}
-                </select>
-              </div>
-
-              <div>
-                <label className="mb-2 block text-sm font-medium text-gray-700">
-                  需求运营{canKeepRequesterBlank ? '' : ' *'}
-                </label>
-                <SearchableUserSelect
-                  users={users}
-                  value={taskDetailRequesterUserId}
-                  onChange={(nextUserId, displayName) => {
-                    setTaskDetailRequesterUserId(nextUserId)
-                    setTaskDetailRequesterName(displayName)
-                  }}
-                  placeholder="搜索发起本次出图需求的运营人员"
-                  required={!canKeepRequesterBlank}
-                  clearable={canKeepRequesterBlank}
-                />
-                <p className="mt-1 text-xs text-gray-500">
-                  {canKeepRequesterBlank
-                    ? taskDetailRequesterName
-                      ? `原记录为“${taskDetailRequesterName}”，对应账号已不可选；可保持原记录或重新选择。`
-                      : '这是一条历史素材，原来没有需求运营数据，可暂时留空。'
-                    : '记录发起本次出图需求的运营人员，与素材所有者可以不同。'}
-                </p>
-              </div>
-            </>
-          )}
-
-          {showIsFullSet && (
-            <div>
-              <label className="mb-2 block text-sm font-medium text-gray-700">整套判定</label>
-              <div className="rounded-apple border border-gray-300 px-4 py-3 text-sm text-gray-700">
-                <p>
-                  当前结果：<span className="font-medium">{isFullSet ? '是' : '否'}</span>
-                </p>
-                <p className="mt-2 text-xs text-gray-500">
-                  系统会根据是否同时存在主图、SKU 图、详情图自动判定，这里不允许手工修改。
-                </p>
-              </div>
-            </div>
-          )}
-
-          <div>
-            <label className="mb-2 block text-sm font-medium text-gray-700">作者（素材所有者） *</label>
-            <SearchableUserSelect
-              users={users}
-              value={userId}
-              onChange={(nextUserId, displayName) => {
-                setUserId(nextUserId)
-                setAuthorName(displayName)
-              }}
-              placeholder="请输入或搜索用户（支持拼音）"
-              required
-            />
-          </div>
-
-          {(showTaskNo || showIsFullSet) && (
-            <div className="grid gap-4 rounded-apple border border-gray-200 bg-gray-50 p-4">
-              <div>
-                <p className="mb-1 text-sm text-gray-500">任务状态</p>
-                <p className="text-sm font-medium text-gray-900">{taskStatus || '未记录'}</p>
-              </div>
-              <div>
-                <p className="mb-1 text-sm text-gray-500">外部获取时间</p>
-                <p className="text-sm font-medium text-gray-900">
-                  {taskFetchedAt ? new Date(taskFetchedAt).toLocaleString('zh-CN') : '未记录'}
-                </p>
-              </div>
-            </div>
-          )}
-
-          <div className="flex justify-end space-x-3 pt-4">
-            <button type="button" onClick={onClose} className="btn-secondary" disabled={updating}>
-              取消
-            </button>
-            <button type="submit" className="btn-primary" disabled={updating}>
-              {updating ? '更新中...' : '保存修改'}
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  )
-}
diff --git a/components/SearchableUserSelect.tsx b/components/SearchableUserSelect.tsx
index 97e9c61..ae92cda 100644
--- a/components/SearchableUserSelect.tsx
+++ b/components/SearchableUserSelect.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useState, useRef, useEffect } from 'react'
+import { useEffect, useId, useMemo, useRef, useState } from 'react'
 import { pinyin } from 'pinyin-pro'
 
 interface User {
@@ -10,6 +10,7 @@ interface User {
 }
 
 interface SearchableUserSelectProps {
+  id?: string
   users: User[]
   value: string
   onChange: (userId: string, displayName: string) => void
@@ -18,9 +19,11 @@ interface SearchableUserSelectProps {
   className?: string
   disabled?: boolean
   clearable?: boolean
+  loading?: boolean
 }
 
 export default function SearchableUserSelect({
+  id,
   users,
   value,
   onChange,
@@ -29,50 +32,55 @@ export default function SearchableUserSelect({
   className = '',
   disabled = false,
   clearable = true,
+  loading = false,
 }: SearchableUserSelectProps) {
   const [searchTerm, setSearchTerm] = useState('')
   const [isOpen, setIsOpen] = useState(false)
   const [highlightedIndex, setHighlightedIndex] = useState(0)
   const containerRef = useRef<HTMLDivElement>(null)
   const inputRef = useRef<HTMLInputElement>(null)
+  const listboxId = useId()
+  const isDisabled = disabled || loading
 
   // 获取选中用户的显示名称
-  const selectedUser = users.find(u => u.id === value)
-  const displayValue = selectedUser ? `${selectedUser.displayName} (${selectedUser.username})` : ''
+  const selectedUser = useMemo(() => users.find((user) => user.id === value), [users, value])
+  const displayValue = selectedUser
+    ? selectedUser.displayName === selectedUser.username
+      ? selectedUser.displayName
+      : `${selectedUser.displayName} (${selectedUser.username})`
+    : ''
 
-  // 拼音搜索匹配函数
-  const matchesSearch = (user: User, search: string): boolean => {
-    if (!search) return true
+  // 人员数量较多时，预先生成一次搜索索引，避免每次按键都重复计算全量拼音。
+  const indexedUsers = useMemo(() => users.map((user) => {
+    const fullPinyin = pinyin(user.displayName, { toneType: 'none', type: 'array' }).join('')
+    const firstLetters = pinyin(user.displayName, {
+      pattern: 'first',
+      toneType: 'none',
+      type: 'array',
+    }).join('')
 
-    const searchLower = search.toLowerCase()
-
-    // 1. 匹配显示名称
-    if (user.displayName.toLowerCase().includes(searchLower)) {
-      return true
+    return {
+      user,
+      searchText: [
+        user.displayName,
+        user.username,
+        fullPinyin,
+        firstLetters,
+      ].join(' ').toLowerCase(),
     }
+  }), [users])
 
-    // 2. 匹配用户名
-    if (user.username.toLowerCase().includes(searchLower)) {
-      return true
-    }
+  const filteredUsers = useMemo(() => {
+    const keyword = searchTerm.trim().toLowerCase()
+    if (!keyword) return indexedUsers.map((item) => item.user)
+    return indexedUsers
+      .filter((item) => item.searchText.includes(keyword))
+      .map((item) => item.user)
+  }, [indexedUsers, searchTerm])
 
-    // 3. 匹配拼音全拼
-    const fullPinyin = pinyin(user.displayName, { toneType: 'none', type: 'array' }).join('').toLowerCase()
-    if (fullPinyin.includes(searchLower)) {
-      return true
-    }
-
-    // 4. 匹配拼音首字母
-    const firstLetters = pinyin(user.displayName, { pattern: 'first', toneType: 'none', type: 'array' }).join('').toLowerCase()
-    if (firstLetters.includes(searchLower)) {
-      return true
-    }
-
-    return false
-  }
-
-  // 过滤用户列表
-  const filteredUsers = users.filter(user => matchesSearch(user, searchTerm))
+  useEffect(() => {
+    setHighlightedIndex((current) => Math.min(current, Math.max(filteredUsers.length - 1, 0)))
+  }, [filteredUsers.length])
 
   // 点击外部关闭下拉框
   useEffect(() => {
@@ -88,7 +96,7 @@ export default function SearchableUserSelect({
 
   // 键盘导航
   const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (disabled) {
+    if (isDisabled) {
       return
     }
 
@@ -132,7 +140,7 @@ export default function SearchableUserSelect({
 
   // 打开下拉框
   const handleFocus = () => {
-    if (disabled) {
+    if (isDisabled) {
       return
     }
 
@@ -143,7 +151,7 @@ export default function SearchableUserSelect({
   // 清空选择
   const handleClear = (e: React.MouseEvent) => {
     e.stopPropagation()
-    if (disabled || !clearable) {
+    if (isDisabled || !clearable) {
       return
     }
 
@@ -157,26 +165,38 @@ export default function SearchableUserSelect({
     <div ref={containerRef} className={`relative ${className}`}>
       <div className="relative">
         <input
+          id={id}
           ref={inputRef}
           type="text"
           value={isOpen ? searchTerm : displayValue}
           onChange={(e) => setSearchTerm(e.target.value)}
           onFocus={handleFocus}
           onKeyDown={handleKeyDown}
-          placeholder={placeholder}
+          placeholder={loading ? '正在加载人员...' : placeholder}
           required={required}
-          disabled={disabled}
+          disabled={isDisabled}
           className="input-apple pr-20 disabled:cursor-not-allowed disabled:opacity-60"
           autoComplete="off"
+          role="combobox"
+          aria-autocomplete="list"
+          aria-expanded={isOpen && !isDisabled}
+          aria-controls={listboxId}
+          aria-activedescendant={
+            isOpen && filteredUsers[highlightedIndex]
+              ? `${listboxId}-option-${filteredUsers[highlightedIndex].id}`
+              : undefined
+          }
+          aria-busy={loading}
         />
 
         <div className="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1">
-          {value && clearable && !disabled && (
+          {value && clearable && !isDisabled && (
             <button
               type="button"
               onClick={handleClear}
-              className="p-1 hover:bg-gray-200 dark:hover:bg-gray-600 rounded transition-colors"
+              className="flex h-9 w-9 items-center justify-center rounded transition-colors hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-blue-200 dark:hover:bg-gray-600"
               title="清空"
+              aria-label="清空已选人员"
             >
               <svg className="w-4 h-4 text-gray-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
@@ -187,12 +207,13 @@ export default function SearchableUserSelect({
           <button
             type="button"
             onClick={() => {
-              if (!disabled) {
+              if (!isDisabled) {
                 setIsOpen(!isOpen)
               }
             }}
-            disabled={disabled}
-            className="p-1 hover:bg-gray-200 dark:hover:bg-gray-600 rounded transition-colors disabled:cursor-not-allowed"
+            disabled={isDisabled}
+            className="flex h-9 w-9 items-center justify-center rounded transition-colors hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-blue-200 disabled:cursor-not-allowed dark:hover:bg-gray-600"
+            aria-label={isOpen ? '收起人员列表' : '展开人员列表'}
           >
             <svg
               className={`w-4 h-4 text-gray-500 transition-transform ${isOpen ? 'rotate-180' : ''}`}
@@ -206,8 +227,12 @@ export default function SearchableUserSelect({
         </div>
       </div>
 
-      {isOpen && !disabled && (
-        <div className="absolute z-50 w-full mt-1 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 rounded-lg shadow-lg max-h-60 overflow-y-auto">
+      {isOpen && !isDisabled && (
+        <div
+          id={listboxId}
+          role="listbox"
+          className="absolute z-50 mt-1 max-h-60 w-full overflow-y-auto rounded-lg border border-gray-300 bg-white shadow-lg dark:border-gray-600 dark:bg-gray-800"
+        >
           {filteredUsers.length === 0 ? (
             <div className="px-4 py-3 text-sm text-gray-500 dark:text-gray-400 text-center">
               未找到匹配的用户
@@ -216,6 +241,9 @@ export default function SearchableUserSelect({
             filteredUsers.map((user, index) => (
               <button
                 key={user.id}
+                id={`${listboxId}-option-${user.id}`}
+                role="option"
+                aria-selected={user.id === value}
                 type="button"
                 onClick={() => handleSelect(user)}
                 className={`w-full px-4 py-2 text-left hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors ${
diff --git a/components/home/SearchBar.tsx b/components/home/SearchBar.tsx
index 5b988d1..9897cf6 100644
--- a/components/home/SearchBar.tsx
+++ b/components/home/SearchBar.tsx
@@ -27,7 +27,7 @@ interface Suggestion {
 function SearchBarInner({
   value: externalValue,
   onChange,
-  placeholder = '搜索素材：SPU型号、任务号、SKU、店铺、场景、作者...',
+  placeholder = '搜索素材 ID、SPU、任务号、店铺、场景或作者',
   isSearching = false,
 }: SearchBarProps) {
   // 本地状态用于显示（包括 IME 组合中的拼音）
@@ -343,4 +343,4 @@ function SearchBarInner({
 
 const SearchBar = memo(SearchBarInner)
 
-export default SearchBar
\ No newline at end of file
+export default SearchBar
diff --git a/lib/__tests__/maixiang-spu-assets-route.test.ts b/lib/__tests__/maixiang-spu-assets-route.test.ts
index e3b8180..db45fcc 100644
--- a/lib/__tests__/maixiang-spu-assets-route.test.ts
+++ b/lib/__tests__/maixiang-spu-assets-route.test.ts
@@ -155,6 +155,7 @@ describe('external maixiang-spu-assets route', () => {
           deletedAt: null,
           materialType: expect.any(Object),
           OR: expect.arrayContaining([
+            { id: 'GBSFY-AD0297+GBSFY-CZ0102' },
             { productModel: { contains: 'GBSFY-AD0297+GBSFY-CZ0102', mode: 'insensitive' } },
             { reportTitle: { contains: 'GBSFY-AD0297+GBSFY-CZ0102', mode: 'insensitive' } },
             { taskNo: { contains: 'GBSFY-AD0297+GBSFY-CZ0102', mode: 'insensitive' } },
diff --git a/lib/__tests__/material-edit-page.test.tsx b/lib/__tests__/material-edit-page.test.tsx
new file mode 100644
index 0000000..7cf84be
--- /dev/null
+++ b/lib/__tests__/material-edit-page.test.tsx
@@ -0,0 +1,179 @@
+/** @jest-environment jsdom */
+
+import { act, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useSession } from 'next-auth/react'
+import EditMaterialPage from '@/app/edit/[id]/page'
+
+const mockPush = jest.fn()
+const mockBack = jest.fn()
+const mockRouter = {
+  push: mockPush,
+  back: mockBack,
+}
+
+jest.mock('next-auth/react', () => ({
+  useSession: jest.fn(),
+}))
+
+jest.mock('next/navigation', () => ({
+  useRouter: () => mockRouter,
+}))
+
+jest.mock('@/components/Header', () => ({
+  __esModule: true,
+  default: () => <a href="/">返回素材库</a>,
+}))
+
+jest.mock('@/components/upload/TaskReferenceFields', () => ({
+  __esModule: true,
+  default: () => null,
+}))
+
+const material = {
+  id: 'material-1',
+  userId: 'user-1',
+  productModel: 'SPU-001',
+  reportTitle: null,
+  categoryName: '店铺A',
+  sceneName: '场景A',
+  platformName: 'Amazon',
+  productCategoryName: '',
+  materialType: '3D场景',
+  renderer: 'CR',
+  authorName: '测试作者',
+  previewUrl: null,
+  taskNo: null,
+  dingtalkApprovalNo: null,
+  taskStatus: null,
+  taskFetchedAt: null,
+  isFullSet: false,
+  taskDetailSourceType: null,
+  taskDetailRequesterUserId: null,
+  taskDetailRequesterName: null,
+  canEdit: true,
+}
+
+function jsonResponse(payload: unknown, status = 200) {
+  return Promise.resolve({
+    ok: status >= 200 && status < 300,
+    status,
+    json: async () => payload,
+  } as Response)
+}
+
+function referencePayload(url: string) {
+  if (url.endsWith('/api/categories')) {
+    return [{ id: 'category-1', name: '店铺A' }]
+  }
+  if (url.endsWith('/api/scenes')) {
+    return [{ id: 'scene-1', name: '场景A' }]
+  }
+  if (url.endsWith('/api/platforms')) {
+    return [{ id: 'platform-1', name: 'Amazon', count: 1 }]
+  }
+  if (url.endsWith('/api/product-categories')) {
+    return []
+  }
+  return [{ id: 'user-1', username: 'author', displayName: '测试作者' }]
+}
+
+describe('EditMaterialPage', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    ;(useSession as jest.Mock).mockReturnValue({
+      data: { user: { id: 'user-1', role: 'USER' } },
+      status: 'authenticated',
+    })
+    Element.prototype.scrollIntoView = jest.fn()
+  })
+
+  test('素材本体先于可选项显示，选项完成前禁止保存', async () => {
+    let releaseReferences: (() => void) | undefined
+    const referenceGate = new Promise<void>((resolve) => {
+      releaseReferences = resolve
+    })
+    global.fetch = jest.fn((input: RequestInfo | URL) => {
+      const url = String(input)
+      if (url.includes('/api/materials/material-1')) {
+        return jsonResponse(material)
+      }
+      return referenceGate.then(() => jsonResponse(referencePayload(url)))
+    }) as jest.Mock
+
+    render(<EditMaterialPage params={{ id: 'material-1' }} />)
+
+    expect(await screen.findByLabelText('产品型号 *')).toHaveValue('SPU-001')
+    expect(screen.getByText('正在加载店铺、场景和人员选项…')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: '保存修改' })).toBeDisabled()
+
+    await act(async () => {
+      releaseReferences?.()
+      await referenceGate
+    })
+
+    await waitFor(() => {
+      expect(screen.queryByText('正在加载店铺、场景和人员选项…')).not.toBeInTheDocument()
+    })
+    expect(screen.getByRole('button', { name: '保存修改' })).toBeEnabled()
+  })
+
+  test('部分选项失败时保留当前值、显示重试并禁止保存', async () => {
+    global.fetch = jest.fn((input: RequestInfo | URL) => {
+      const url = String(input)
+      if (url.includes('/api/materials/material-1')) {
+        return jsonResponse(material)
+      }
+      if (url.endsWith('/api/categories')) {
+        return jsonResponse({ error: '店铺读取失败' }, 500)
+      }
+      return jsonResponse(referencePayload(url))
+    }) as jest.Mock
+
+    render(<EditMaterialPage params={{ id: 'material-1' }} />)
+
+    const categorySelect = await screen.findByLabelText('店铺 *')
+    await screen.findByText('店铺加载失败，当前值已保留。')
+
+    expect(categorySelect).toHaveValue('店铺A')
+    expect(categorySelect).toBeDisabled()
+    expect(screen.getByRole('button', { name: '重新加载' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: '保存修改' })).toBeDisabled()
+  })
+
+  test('修改后取消会使用统一弹窗，刷新保护与移动端粘性操作区同时生效', async () => {
+    const user = userEvent.setup()
+    global.fetch = jest.fn((input: RequestInfo | URL) => {
+      const url = String(input)
+      if (url.includes('/api/materials/material-1')) {
+        return jsonResponse(material)
+      }
+      return jsonResponse(referencePayload(url))
+    }) as jest.Mock
+
+    render(<EditMaterialPage params={{ id: 'material-1' }} />)
+
+    const productModelInput = await screen.findByLabelText('产品型号 *')
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: '保存修改' })).toBeEnabled()
+    })
+    await user.clear(productModelInput)
+    await user.type(productModelInput, 'SPU-002')
+
+    const beforeUnloadEvent = new Event('beforeunload', { cancelable: true })
+    window.dispatchEvent(beforeUnloadEvent)
+    expect(beforeUnloadEvent.defaultPrevented).toBe(true)
+
+    const saveButton = screen.getByRole('button', { name: '保存修改' })
+    expect(saveButton.closest('.sticky')).not.toBeNull()
+
+    await user.click(screen.getByRole('button', { name: '取消' }))
+    expect(await screen.findByText('放弃未保存的修改？')).toBeInTheDocument()
+    await user.click(screen.getByRole('button', { name: '继续编辑' }))
+    expect(mockBack).not.toHaveBeenCalled()
+
+    await user.click(screen.getByRole('button', { name: '取消' }))
+    await user.click(await screen.findByRole('button', { name: '放弃修改' }))
+    expect(mockBack).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/lib/__tests__/material-edit-routes.test.ts b/lib/__tests__/material-edit-routes.test.ts
index 5513bcb..8ac2b17 100644
--- a/lib/__tests__/material-edit-routes.test.ts
+++ b/lib/__tests__/material-edit-routes.test.ts
@@ -166,6 +166,52 @@ describe('material edit routes', () => {
     )
   })
 
+  test.each([
+    {
+      name: '/api/materials/[id]',
+      put: async (formData: FormData) =>
+        putMaterialById(
+          new NextRequest('http://localhost/api/materials/material-1', {
+            method: 'PUT',
+            body: formData,
+          }),
+          { params: { id: 'material-1' } },
+        ),
+    },
+    {
+      name: '/api/materials/update',
+      put: async (formData: FormData) => {
+        formData.append('id', 'material-1')
+        return putMaterialUpdate(
+          new NextRequest('http://localhost/api/materials/update', {
+            method: 'PUT',
+            body: formData,
+          }),
+        )
+      },
+    },
+  ])('$name 不应把未提交的可选字段合成为空值', async ({ put }) => {
+    const formData = new FormData()
+    formData.append('productModel', 'SPU-001')
+    formData.append('categoryName', '店铺A')
+    formData.append('sceneName', '场景A')
+    formData.append('materialType', '3D场景')
+    formData.append('renderer', 'CR')
+    formData.append('authorName', '测试作者')
+
+    const response = await put(formData)
+
+    expect(response.status).toBe(200)
+    const call = (updateMaterialWithSharedRules as jest.Mock).mock.calls[0][0]
+    expect(call.input).not.toHaveProperty('reportTitle')
+    expect(call.input).not.toHaveProperty('userId')
+    expect(call.input).not.toHaveProperty('taskNo')
+    expect(call.input).not.toHaveProperty('dingtalkApprovalNo')
+    expect(call.input).not.toHaveProperty('taskDetailSourceType')
+    expect(call.input).not.toHaveProperty('taskDetailRequesterUserId')
+    expect(call.input).not.toHaveProperty('isFullSet')
+  })
+
   test.each(['share=1', 'shareId=anything'])(
     'GET /api/materials/[id] 不能通过 %s 绕过登录校验',
     async (shareParam) => {
@@ -250,6 +296,7 @@ describe('material edit routes', () => {
     expect(body.taskDetailRequesterUserId).toBe('requester-1')
     expect(body.taskDetailRequesterName).toBe('运营甲')
     expect(body.sourceFileUrl).toBe('/api/materials/download?id=material-1')
+    expect(body.canEdit).toBe(true)
   })
 
   test('PUT 路由应透传任务详情出图方式字段', async () => {
diff --git a/lib/__tests__/material-query.test.ts b/lib/__tests__/material-query.test.ts
new file mode 100644
index 0000000..6fa2121
--- /dev/null
+++ b/lib/__tests__/material-query.test.ts
@@ -0,0 +1,42 @@
+import { prisma } from '@/lib/prisma'
+import { buildMaterialSearchOrConditions } from '@/lib/material-query'
+
+jest.mock('@/lib/prisma', () => ({
+  prisma: {
+    materialSku: {
+      findMany: jest.fn(),
+    },
+    user: {
+      findMany: jest.fn(),
+    },
+  },
+}))
+
+jest.mock('@/lib/department-permission', () => ({
+  getUserViewableMaterialTypes: jest.fn(),
+  isSuperAdmin: jest.fn(),
+  isSystemAdmin: jest.fn(),
+}))
+
+describe('material search conditions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    ;(prisma.materialSku.findMany as jest.Mock).mockResolvedValue([])
+    ;(prisma.user.findMany as jest.Mock).mockResolvedValue([])
+  })
+
+  test('完整素材 UUID 应使用精确匹配', async () => {
+    const materialId = '954554fb-50b4-45c4-9234-9e94b6948953'
+
+    const conditions = await buildMaterialSearchOrConditions(materialId)
+
+    expect(conditions).toEqual(expect.arrayContaining([{ id: materialId }]))
+  })
+
+  test('非 UUID 的历史素材 ID 也应使用精确匹配', async () => {
+    const materialId = 'legacy-material-1'
+    const conditions = await buildMaterialSearchOrConditions(materialId)
+
+    expect(conditions).toEqual(expect.arrayContaining([{ id: materialId }]))
+  })
+})
diff --git a/lib/__tests__/material-update.test.ts b/lib/__tests__/material-update.test.ts
index 9dff4e6..a3c2d93 100644
--- a/lib/__tests__/material-update.test.ts
+++ b/lib/__tests__/material-update.test.ts
@@ -237,6 +237,48 @@ describe('material-update shared rules', () => {
     })
   })
 
+  test('旧编辑调用未提交报告名称时应保留证书原值', async () => {
+    const existingCertificate = {
+      ...baseMaterial,
+      materialType: '证书-检测报告',
+      categoryName: '通用',
+      sceneName: '通用',
+      productCategoryName: '板材',
+      productModel: '',
+      reportTitle: '原检测报告',
+      renderer: '',
+    }
+    ;(prisma.material.findFirst as jest.Mock).mockResolvedValue(existingCertificate)
+    ;(prisma.material.update as jest.Mock).mockImplementation(async ({ data }) => ({
+      ...existingCertificate,
+      ...data,
+    }))
+
+    const result = await updateMaterialWithSharedRules({
+      materialId: 'material-1',
+      operatorUserId: 'user-1',
+      operatorRole: 'USER',
+      input: {
+        productModel: '',
+        categoryName: '',
+        sceneName: '',
+        platformName: '',
+        productCategoryName: '板材',
+        materialType: '证书-检测报告',
+        renderer: '',
+        authorName: '测试作者',
+      },
+    })
+
+    expect('error' in result).toBe(false)
+    expect(prisma.material.update).toHaveBeenCalledWith({
+      where: { id: 'material-1' },
+      data: expect.objectContaining({
+        reportTitle: '原检测报告',
+      }),
+    })
+  })
+
   test('证书-检测报告同时缺少 SPU 和报告名称时应返回 400', async () => {
     ;(prisma.material.findFirst as jest.Mock).mockResolvedValue({
       ...baseMaterial,
@@ -461,6 +503,44 @@ describe('material-update shared rules', () => {
     })
   })
 
+  test('旧编辑调用未提交出图方式时应保留任务详情原值', async () => {
+    const existingTaskDetail = {
+      ...baseMaterial,
+      materialType: '任务-详情',
+      taskDetailSourceType: '实拍',
+      categoryName: '店铺A',
+      sceneName: '场景A',
+    }
+    ;(prisma.material.findFirst as jest.Mock).mockResolvedValue(existingTaskDetail)
+    ;(prisma.material.update as jest.Mock).mockImplementation(async ({ data }) => ({
+      ...existingTaskDetail,
+      ...data,
+    }))
+
+    await updateMaterialWithSharedRules({
+      materialId: 'material-1',
+      operatorUserId: 'user-1',
+      operatorRole: 'USER',
+      input: {
+        productModel: 'TASK-SPU-001',
+        categoryName: '店铺A',
+        sceneName: '场景A',
+        platformName: '',
+        productCategoryName: '',
+        materialType: '任务-详情',
+        renderer: '',
+        authorName: '任务作者',
+      },
+    })
+
+    expect(prisma.material.update).toHaveBeenCalledWith({
+      where: { id: 'material-1' },
+      data: expect.objectContaining({
+        taskDetailSourceType: '实拍',
+      }),
+    })
+  })
+
   test('历史任务详情没有需求运营时，编辑其他字段仍可继续留空', async () => {
     ;(prisma.material.findFirst as jest.Mock).mockResolvedValue({
       ...baseMaterial,
diff --git a/lib/__tests__/searchable-user-select.test.tsx b/lib/__tests__/searchable-user-select.test.tsx
new file mode 100644
index 0000000..48e6573
--- /dev/null
+++ b/lib/__tests__/searchable-user-select.test.tsx
@@ -0,0 +1,54 @@
+/** @jest-environment jsdom */
+
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import SearchableUserSelect from '@/components/SearchableUserSelect'
+
+describe('SearchableUserSelect', () => {
+  const users = [
+    { id: 'user-1', username: 'moli', displayName: '魔礼红' },
+    { id: 'user-2', username: 'wuxie', displayName: '无邪' },
+  ]
+
+  test('支持拼音搜索、键盘选择与标准 combobox 语义', async () => {
+    const onChange = jest.fn()
+    const user = userEvent.setup()
+
+    render(
+      <SearchableUserSelect
+        users={users}
+        value=""
+        onChange={onChange}
+      />,
+    )
+
+    const combobox = screen.getByRole('combobox')
+    expect(combobox).toHaveAttribute('aria-expanded', 'false')
+
+    await user.click(combobox)
+    await user.type(combobox, 'molihong')
+
+    expect(combobox).toHaveAttribute('aria-expanded', 'true')
+    expect(screen.getByRole('option', { name: /魔礼红/ })).toBeInTheDocument()
+    expect(screen.queryByRole('option', { name: /无邪/ })).not.toBeInTheDocument()
+
+    await user.keyboard('{Enter}')
+    expect(onChange).toHaveBeenCalledWith('user-1', '魔礼红')
+  })
+
+  test('加载期间保留已选人员并禁用交互', () => {
+    render(
+      <SearchableUserSelect
+        users={users}
+        value="user-2"
+        onChange={jest.fn()}
+        loading
+      />,
+    )
+
+    const combobox = screen.getByRole('combobox')
+    expect(combobox).toBeDisabled()
+    expect(combobox).toHaveValue('无邪 (wuxie)')
+    expect(combobox).toHaveAttribute('aria-busy', 'true')
+  })
+})
diff --git a/lib/__tests__/users-list-route.test.ts b/lib/__tests__/users-list-route.test.ts
new file mode 100644
index 0000000..b4fe06d
--- /dev/null
+++ b/lib/__tests__/users-list-route.test.ts
@@ -0,0 +1,89 @@
+/** @jest-environment node */
+
+import { NextRequest } from 'next/server'
+import { getServerSession } from 'next-auth'
+import { GET } from '@/app/api/users/list/route'
+import { prisma } from '@/lib/prisma'
+
+jest.mock('next-auth', () => ({
+  getServerSession: jest.fn(),
+}))
+
+jest.mock('@/lib/auth', () => ({
+  authOptions: {},
+}))
+
+jest.mock('@/lib/prisma', () => ({
+  prisma: {
+    user: {
+      findMany: jest.fn(),
+    },
+  },
+}))
+
+describe('GET /api/users/list', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  test('未登录时返回 401 且不读取人员数据', async () => {
+    ;(getServerSession as jest.Mock).mockResolvedValue(null)
+
+    const response = await GET(new NextRequest('http://localhost/api/users/list'))
+
+    expect(response.status).toBe(401)
+    expect(prisma.user.findMany).not.toHaveBeenCalled()
+  })
+
+  test('只读取并返回人员选择器需要的最小字段', async () => {
+    ;(getServerSession as jest.Mock).mockResolvedValue({
+      user: { id: 'user-1' },
+    })
+    ;(prisma.user.findMany as jest.Mock).mockResolvedValue([
+      {
+        id: 'user-1',
+        username: 'moli',
+        realName: '魔礼红',
+      },
+      {
+        id: 'user-2',
+        username: 'wuxie',
+        realName: null,
+      },
+    ])
+
+    const response = await GET(new NextRequest('http://localhost/api/users/list'))
+    const body = await response.json()
+
+    expect(response.status).toBe(200)
+    expect(prisma.user.findMany).toHaveBeenCalledWith({
+      where: {
+        isActive: true,
+        status: 'active',
+        archivedAt: null,
+      },
+      select: {
+        id: true,
+        username: true,
+        realName: true,
+      },
+      orderBy: {
+        username: 'asc',
+      },
+    })
+    expect(body).toEqual([
+      {
+        id: 'user-1',
+        username: 'moli',
+        displayName: '魔礼红',
+      },
+      {
+        id: 'user-2',
+        username: 'wuxie',
+        displayName: 'wuxie',
+      },
+    ])
+    expect(body[0]).not.toHaveProperty('email')
+    expect(body[0]).not.toHaveProperty('realName')
+  })
+})
diff --git a/lib/material-query.ts b/lib/material-query.ts
index 015d470..83dafe4 100644
--- a/lib/material-query.ts
+++ b/lib/material-query.ts
@@ -166,6 +166,7 @@ export async function buildMaterialSearchOrConditions(search: string): Promise<a
   const userIds = userMatches.map((item) => item.id)
 
   const orConditions: any[] = [
+    { id: keyword },
     { productModel: { contains: keyword, mode: 'insensitive' } },
     { reportTitle: { contains: keyword, mode: 'insensitive' } },
     { taskNo: { contains: keyword, mode: 'insensitive' } },
diff --git a/lib/material-update.ts b/lib/material-update.ts
index 16255b6..360719d 100644
--- a/lib/material-update.ts
+++ b/lib/material-update.ts
@@ -176,12 +176,16 @@ export async function updateMaterialWithSharedRules(options: UpdateMaterialOptio
   }
 
   const material = editable.material as any
+  const hasReportTitleField = Object.prototype.hasOwnProperty.call(input, 'reportTitle')
   const hasTaskNoField = Object.prototype.hasOwnProperty.call(input, 'taskNo')
   const hasDingtalkApprovalNoField = Object.prototype.hasOwnProperty.call(input, 'dingtalkApprovalNo')
   const hasTaskDetailSourceTypeField = Object.prototype.hasOwnProperty.call(input, 'taskDetailSourceType')
   const hasTaskDetailRequesterField = Object.prototype.hasOwnProperty.call(input, 'taskDetailRequesterUserId')
   const productModel = normalizeString(input.productModel)
   const reportTitle = normalizeReportTitle(input.reportTitle)
+  const effectiveReportTitle = hasReportTitleField
+    ? reportTitle
+    : normalizeReportTitle(material.reportTitle)
   const materialType = normalizeString(input.materialType)
   const authorName = normalizeString(input.authorName)
   const shouldUseGeneralCategoryScene = shouldAutoFillGeneral(materialType)
@@ -200,7 +204,7 @@ export async function updateMaterialWithSharedRules(options: UpdateMaterialOptio
   }
 
   if (isCertificateReportMaterialType(materialType)) {
-    if (!productModel && !reportTitle) {
+    if (!productModel && !effectiveReportTitle) {
       return { error: 'SPU 和 报告名称/检测对象 至少填写一个', status: 400 as const }
     }
   } else if (!productModel) {
@@ -341,7 +345,7 @@ export async function updateMaterialWithSharedRules(options: UpdateMaterialOptio
   const updateData: Record<string, any> = {
     previewUrl,
     productModel,
-    reportTitle: isCertificateReportMaterialType(materialType) ? reportTitle : null,
+    reportTitle: isCertificateReportMaterialType(materialType) ? effectiveReportTitle : null,
     categoryName: shouldUseGeneralCategoryScene ? '通用' : (categoryName ?? material.categoryName),
     sceneName: shouldUseGeneralCategoryScene ? '通用' : (sceneName ?? material.sceneName),
     platformName: platformName ?? '',