fix: 花名册身份证搜索bug修复 + Header企业名称 + 优化文档更新
- 修复Roster.tsx前端二次过滤清空身份证搜索结果的问题 - TopNav增加企业名称显示(复用settingsApi.org()) - 新增docs/20260804-优化.md(23项反馈全面审查) - 更新20260803-优化.md状态(问题5已完成)
This commit is contained in:
@@ -3,7 +3,7 @@ import { ChevronDown, Settings as SettingsIcon, Bell, Menu, HelpCircle, Smartpho
|
||||
import { useState } from 'react'
|
||||
import { useQuery } from '@tanstack/react-query'
|
||||
import { useAuthStore } from '../../store/authStore'
|
||||
import { dashboardApi } from '../../lib/api-services'
|
||||
import { dashboardApi, settingsApi } from '../../lib/api-services'
|
||||
import Breadcrumb from './Breadcrumb'
|
||||
import HelpModal from '../HelpModal'
|
||||
import PortalQRModal from '../PortalQRModal'
|
||||
@@ -22,6 +22,11 @@ export default function TopNav({ onMenuClick }: { onMenuClick?: () => void }) {
|
||||
queryFn: () => dashboardApi.data(),
|
||||
refetchInterval: 60000,
|
||||
})
|
||||
const { data: orgData } = useQuery<any>({
|
||||
queryKey: ['org-settings'],
|
||||
queryFn: () => settingsApi.org(),
|
||||
staleTime: 300000,
|
||||
})
|
||||
const riskCount = dashboardData?.riskSummary?.pending || 0
|
||||
|
||||
return (
|
||||
@@ -36,6 +41,12 @@ export default function TopNav({ onMenuClick }: { onMenuClick?: () => void }) {
|
||||
>
|
||||
<Menu className="w-5 h-5 text-gray-600" />
|
||||
</button>
|
||||
{orgData?.name && (
|
||||
<span className="hidden sm:inline text-sm font-medium text-gray-700 shrink-0">
|
||||
{orgData.name}
|
||||
</span>
|
||||
)}
|
||||
{orgData?.name && <span className="hidden sm:inline text-gray-300 shrink-0">|</span>}
|
||||
<Breadcrumb />
|
||||
</div>
|
||||
|
||||
|
||||
@@ -265,7 +265,7 @@ export default function Roster() {
|
||||
})
|
||||
|
||||
const filtered = employees?.filter((e: any) =>
|
||||
!search || e.name.includes(search) || e.department.includes(search)
|
||||
!search || e.name.includes(search) || e.department.includes(search) || (e.idCardMasked && e.idCardMasked.includes(search))
|
||||
) || []
|
||||
|
||||
if (selectedId) {
|
||||
|
||||
Reference in New Issue
Block a user