feat: 同步报销流程与工作台改动

web/src/utils/accessControl.js

@@ -1,156 +1,156 @@
-export const DEFAULT_APP_VIEW_ORDER = [
+export const DEFAULT_APP_VIEW_ORDER = [
   'workbench',
   'documents',
   'receiptFolder',
   'budget',
-  'audit',
+  'audit',
   'overview',
   'policies',
   'digitalEmployees',
   'employees',
   'settings'
 ]
-
+
 const ALWAYS_VISIBLE_VIEWS = new Set(['workbench', 'documents', 'receiptFolder', 'policies'])
-const VIEW_ROLE_RULES = {
-  overview: ['finance', 'executive'],
+const VIEW_ROLE_RULES = {
+  overview: ['finance', 'executive'],
   budget: ['budget_monitor', 'executive'],
   audit: ['finance'],
   digitalEmployees: ['finance'],
   employees: ['manager'],
   settings: ['manager']
 }
-const CLAIM_MANAGER_ROLE_CODES = new Set(['executive'])
-const CLAIM_RETURN_ROLE_CODES = new Set(['finance', 'executive', 'manager', 'approver', 'budget_monitor'])
-const CLAIM_LEADER_APPROVAL_ROLE_CODES = new Set(['manager', 'approver'])
-const CLAIM_BUDGET_APPROVAL_GRADE = 'P8'
-
-function normalizedRoleCodes(user) {
-  if (!user) {
-    return []
-  }
-
-  return Array.isArray(user.roleCodes)
-    ? user.roleCodes
-        .map((item) => normalizeRoleCode(item))
-        .filter(Boolean)
-    : []
-}
-
-function normalizeRoleCode(value) {
-  const roleCode = String(value || '').trim().toLowerCase()
-  return roleCode === 'auditor' ? 'budget_monitor' : roleCode
-}
-
-function normalizeComparableText(value) {
-  return String(value || '').trim()
-}
-
-function collectIdentityNames(...values) {
-  return values
-    .map((value) => normalizeComparableText(value))
-    .filter(Boolean)
-}
-
-function identityIntersects(leftValues, rightValues) {
-  const rightSet = new Set(rightValues)
-  return leftValues.some((item) => rightSet.has(item))
-}
-
-function normalizedGrade(user) {
-  return String(user?.grade || user?.employeeGrade || '').trim().toUpperCase()
-}
-
-function departmentIntersects(request, user) {
-  const requestDepartments = collectIdentityNames(
-    request?.dept,
-    request?.departmentName,
-    request?.department_name
-  )
-  const currentDepartments = collectIdentityNames(
-    user?.department,
-    user?.departmentName,
-    user?.department_name
-  )
-
-  return requestDepartments.length > 0 && identityIntersects(requestDepartments, currentDepartments)
-}
-
-function hasPlatformAdminIdentity(user) {
-  if (!user) {
-    return false
-  }
-
-  const username = String(user.username || user.account || '').trim().toLowerCase()
-  const role = String(user.role || '').trim().toLowerCase()
-  const roleCodes = normalizedRoleCodes(user)
-
-  return (
-    Boolean(user.isAdmin)
-    || username === 'admin'
-    || role === 'admin'
-    || role === '管理员'
-    || role === '系统管理员'
-    || roleCodes.includes('admin')
-  )
-}
-
-export function isManagerUser(user) {
-  return hasPlatformAdminIdentity(user) || normalizedRoleCodes(user).includes('manager')
-}
-
-export function isPlatformAdminUser(user) {
-  return hasPlatformAdminIdentity(user)
-}
-
-export function isFinanceUser(user) {
-  return normalizedRoleCodes(user).includes('finance')
-}
-
-export function isExecutiveUser(user) {
-  return normalizedRoleCodes(user).includes('executive')
-}
-
-export function isBudgetMonitorUser(user) {
-  return normalizedRoleCodes(user).includes('budget_monitor')
-}
-
-export function canEditBudgetCenter(user) {
-  return isPlatformAdminUser(user) || isExecutiveUser(user)
-}
-
-export function canSwitchBudgetDepartments(user) {
-  return isPlatformAdminUser(user) || isExecutiveUser(user)
-}
-
-export function canManageExpenseClaims(user) {
-  if (isPlatformAdminUser(user)) {
-    return true
-  }
-
-  return normalizedRoleCodes(user).some((roleCode) => CLAIM_MANAGER_ROLE_CODES.has(roleCode))
-}
-
-export function canDeleteArchivedExpenseClaims(user) {
-  return isPlatformAdminUser(user)
-}
-
-export function canReturnExpenseClaims(user) {
-  if (isPlatformAdminUser(user)) {
-    return true
-  }
-
-  return normalizedRoleCodes(user).some((roleCode) => CLAIM_RETURN_ROLE_CODES.has(roleCode))
-}
-
-export function canApproveLeaderExpenseClaims(user) {
-  if (isPlatformAdminUser(user)) {
-    return true
-  }
-
-  return normalizedRoleCodes(user).some((roleCode) => CLAIM_LEADER_APPROVAL_ROLE_CODES.has(roleCode))
-}
-
+const CLAIM_MANAGER_ROLE_CODES = new Set(['executive'])
+const CLAIM_RETURN_ROLE_CODES = new Set(['finance', 'executive', 'manager', 'approver', 'budget_monitor'])
+const CLAIM_LEADER_APPROVAL_ROLE_CODES = new Set(['manager', 'approver'])
+const CLAIM_BUDGET_APPROVAL_GRADE = 'P8'
+
+function normalizedRoleCodes(user) {
+  if (!user) {
+    return []
+  }
+
+  return Array.isArray(user.roleCodes)
+    ? user.roleCodes
+        .map((item) => normalizeRoleCode(item))
+        .filter(Boolean)
+    : []
+}
+
+function normalizeRoleCode(value) {
+  const roleCode = String(value || '').trim().toLowerCase()
+  return roleCode === 'auditor' ? 'budget_monitor' : roleCode
+}
+
+function normalizeComparableText(value) {
+  return String(value || '').trim()
+}
+
+function collectIdentityNames(...values) {
+  return values
+    .map((value) => normalizeComparableText(value))
+    .filter(Boolean)
+}
+
+function identityIntersects(leftValues, rightValues) {
+  const rightSet = new Set(rightValues)
+  return leftValues.some((item) => rightSet.has(item))
+}
+
+function normalizedGrade(user) {
+  return String(user?.grade || user?.employeeGrade || '').trim().toUpperCase()
+}
+
+function departmentIntersects(request, user) {
+  const requestDepartments = collectIdentityNames(
+    request?.dept,
+    request?.departmentName,
+    request?.department_name
+  )
+  const currentDepartments = collectIdentityNames(
+    user?.department,
+    user?.departmentName,
+    user?.department_name
+  )
+
+  return requestDepartments.length > 0 && identityIntersects(requestDepartments, currentDepartments)
+}
+
+function hasPlatformAdminIdentity(user) {
+  if (!user) {
+    return false
+  }
+
+  const username = String(user.username || user.account || '').trim().toLowerCase()
+  const role = String(user.role || '').trim().toLowerCase()
+  const roleCodes = normalizedRoleCodes(user)
+
+  return (
+    Boolean(user.isAdmin)
+    || username === 'admin'
+    || role === 'admin'
+    || role === '管理员'
+    || role === '系统管理员'
+    || roleCodes.includes('admin')
+  )
+}
+
+export function isManagerUser(user) {
+  return hasPlatformAdminIdentity(user) || normalizedRoleCodes(user).includes('manager')
+}
+
+export function isPlatformAdminUser(user) {
+  return hasPlatformAdminIdentity(user)
+}
+
+export function isFinanceUser(user) {
+  return normalizedRoleCodes(user).includes('finance')
+}
+
+export function isExecutiveUser(user) {
+  return normalizedRoleCodes(user).includes('executive')
+}
+
+export function isBudgetMonitorUser(user) {
+  return normalizedRoleCodes(user).includes('budget_monitor')
+}
+
+export function canEditBudgetCenter(user) {
+  return isPlatformAdminUser(user) || isExecutiveUser(user)
+}
+
+export function canSwitchBudgetDepartments(user) {
+  return isPlatformAdminUser(user) || isExecutiveUser(user)
+}
+
+export function canManageExpenseClaims(user) {
+  if (isPlatformAdminUser(user)) {
+    return true
+  }
+
+  return normalizedRoleCodes(user).some((roleCode) => CLAIM_MANAGER_ROLE_CODES.has(roleCode))
+}
+
+export function canDeleteArchivedExpenseClaims(user) {
+  return isPlatformAdminUser(user)
+}
+
+export function canReturnExpenseClaims(user) {
+  if (isPlatformAdminUser(user)) {
+    return true
+  }
+
+  return normalizedRoleCodes(user).some((roleCode) => CLAIM_RETURN_ROLE_CODES.has(roleCode))
+}
+
+export function canApproveLeaderExpenseClaims(user) {
+  if (isPlatformAdminUser(user)) {
+    return true
+  }
+
+  return normalizedRoleCodes(user).some((roleCode) => CLAIM_LEADER_APPROVAL_ROLE_CODES.has(roleCode))
+}
+
 export function canApproveBudgetExpenseApplications(user, request = null) {
   if (isPlatformAdminUser(user)) {
     return true
@@ -163,10 +163,10 @@ export function canApproveBudgetExpenseApplications(user, request = null) {
   if (normalizedGrade(user) !== CLAIM_BUDGET_APPROVAL_GRADE) {
     return false
   }
-
-  return request ? departmentIntersects(request, user) : true
-}
-
+
+  return request ? departmentIntersects(request, user) : true
+}
+
 export function isCurrentRequestApplicant(request, user) {
   const applicantIds = collectIdentityNames(
     request?.employeeId,
@@ -191,45 +191,45 @@ export function isCurrentRequestApplicant(request, user) {
   const applicantNames = collectIdentityNames(
     request?.person,
     request?.employeeName,
-    request?.employee_name,
-    request?.profileName,
-    request?.applicant
-  )
-  const currentNames = collectIdentityNames(
-    user?.name,
-    user?.username,
-    user?.email,
-    user?.employeeNo,
-    user?.employee_no
-  )
-
-  return applicantNames.length > 0 && identityIntersects(applicantNames, currentNames)
-}
-
-export function isCurrentDirectManagerForRequest(request, user) {
-  if (isCurrentRequestApplicant(request, user)) {
-    return false
-  }
-
-  const managerNames = collectIdentityNames(
-    request?.profileManager,
-    request?.managerName,
-    request?.manager_name,
-    request?.directManagerName,
-    request?.direct_manager_name,
-    request?.manager
-  )
-  const currentNames = collectIdentityNames(
-    user?.name,
-    user?.username,
-    user?.email,
-    user?.employeeNo,
-    user?.employee_no
-  )
-
-  return managerNames.length > 0 && identityIntersects(managerNames, currentNames)
-}
-
+    request?.employee_name,
+    request?.profileName,
+    request?.applicant
+  )
+  const currentNames = collectIdentityNames(
+    user?.name,
+    user?.username,
+    user?.email,
+    user?.employeeNo,
+    user?.employee_no
+  )
+
+  return applicantNames.length > 0 && identityIntersects(applicantNames, currentNames)
+}
+
+export function isCurrentDirectManagerForRequest(request, user) {
+  if (isCurrentRequestApplicant(request, user)) {
+    return false
+  }
+
+  const managerNames = collectIdentityNames(
+    request?.profileManager,
+    request?.managerName,
+    request?.manager_name,
+    request?.directManagerName,
+    request?.direct_manager_name,
+    request?.manager
+  )
+  const currentNames = collectIdentityNames(
+    user?.name,
+    user?.username,
+    user?.email,
+    user?.employeeNo,
+    user?.employee_no
+  )
+
+  return managerNames.length > 0 && identityIntersects(managerNames, currentNames)
+}
+
 export function canAccessAppView(user, viewId) {
   if (!viewId || !user) {
     return false
@@ -246,35 +246,35 @@ export function canAccessAppView(user, viewId) {
   if (viewId === 'budget') {
     if (isPlatformAdminUser(user)) {
       return true
-    }
-    const roleCodes = normalizedRoleCodes(user)
-    return VIEW_ROLE_RULES.budget.some((roleCode) => roleCodes.includes(roleCode))
-  }
-
-  if (isManagerUser(user)) {
-    return true
-  }
-
-  if (ALWAYS_VISIBLE_VIEWS.has(viewId)) {
-    return true
-  }
-
-  const requiredRoles = VIEW_ROLE_RULES[viewId] || []
-  const roleCodes = normalizedRoleCodes(user)
-  return requiredRoles.some((roleCode) => roleCodes.includes(roleCode))
-}
-
-export function getAccessibleViewIds(user) {
-  return DEFAULT_APP_VIEW_ORDER.filter((viewId) => canAccessAppView(user, viewId))
-}
-
-export function filterNavItemsByAccess(navItems, user) {
-  return navItems.filter((item) => canAccessAppView(user, item.id))
-}
-
+    }
+    const roleCodes = normalizedRoleCodes(user)
+    return VIEW_ROLE_RULES.budget.some((roleCode) => roleCodes.includes(roleCode))
+  }
+
+  if (isManagerUser(user)) {
+    return true
+  }
+
+  if (ALWAYS_VISIBLE_VIEWS.has(viewId)) {
+    return true
+  }
+
+  const requiredRoles = VIEW_ROLE_RULES[viewId] || []
+  const roleCodes = normalizedRoleCodes(user)
+  return requiredRoles.some((roleCode) => roleCodes.includes(roleCode))
+}
+
+export function getAccessibleViewIds(user) {
+  return DEFAULT_APP_VIEW_ORDER.filter((viewId) => canAccessAppView(user, viewId))
+}
+
+export function filterNavItemsByAccess(navItems, user) {
+  return navItems.filter((item) => canAccessAppView(user, item.id))
+}
+
 export function resolveDefaultAuthorizedRoute(user) {
-  if (isPlatformAdminUser(user) && canAccessAppView(user, 'overview')) {
-    return { name: 'app-overview' }
+  if (isPlatformAdminUser(user) && canAccessAppView(user, 'documents')) {
+    return { name: 'app-documents' }
   }
 
   const firstVisibleView = getAccessibleViewIds(user)[0]

web/src/utils/workbenchSummary.js

@@ -1,4 +1,5 @@
 import { isApplicationRequestLike } from './documentClassification.js'
+import { canProcessApprovalRequest } from './approvalInbox.js'
 
 function parseNumber(value) {
   const nextValue = Number(value)
@@ -46,6 +47,15 @@ export function belongsToCurrentUser(request, currentUser) {
   return names.some((name) => name === person)
 }
 
+function belongsToWorkbenchProgressScope(request, currentUser) {
+  if (belongsToCurrentUser(request, currentUser)) {
+    return true
+  }
+
+  return normalizeText(request?.approvalKey) === 'in_progress'
+    && canProcessApprovalRequest(request, currentUser)
+}
+
 export function hasHighRiskFlag(request) {
   const riskFlags = Array.isArray(request?.riskFlags) ? request.riskFlags : []
 
@@ -133,6 +143,16 @@ function resolveRequestTarget(request) {
   }
 }
 
+function resolveApplicantLabel(request) {
+  return normalizeText(
+    request?.person
+    || request?.employeeName
+    || request?.employee_name
+    || request?.applicant
+    || request?.profileName
+  ) || '待补充'
+}
+
 function resolveStatusTone(approvalKey) {
   if (approvalKey === 'supplement' || approvalKey === 'rejected') return 'danger'
   if (approvalKey === 'draft') return 'success'
@@ -254,31 +274,84 @@ export function buildAdjacentProgressSteps(steps = [], windowSize = 4) {
   }))
 }
 
+const FALLBACK_APPLICATION_PROGRESS_LABELS = Object.freeze([
+  '创建申请',
+  '直属领导审批',
+  '关联单据状态',
+  '已归档'
+])
+const FALLBACK_REIMBURSEMENT_PROGRESS_LABELS = Object.freeze([
+  '关联单据',
+  '待提交',
+  '直属领导审批',
+  '财务审批',
+  '待付款',
+  '已付款',
+  '已归档'
+])
+
+function resolveFallbackProgressCurrentIndex(labels, request, documentTypeLabel) {
+  const approvalKey = normalizeText(request?.approvalKey)
+  const status = normalizeText(request?.approvalStatus || request?.status || request?.workflowNode)
+
+  if (documentTypeLabel === '申请单') {
+    if (/归档/.test(status)) return labels.indexOf('已归档')
+    if (approvalKey === 'completed' || /完成|通过/.test(status)) return labels.indexOf('关联单据状态')
+    if (/直属领导|领导审批|负责人/.test(status)) return labels.indexOf('直属领导审批')
+    return 0
+  }
+
+  if (approvalKey === 'completed' || /归档|已付款|完成/.test(status)) return labels.indexOf('已归档')
+  if (approvalKey === 'pending_payment' || /待付款|待支付/.test(status)) return labels.indexOf('待付款')
+  if (/财务/.test(status)) return labels.indexOf('财务审批')
+  if (/直属领导|领导审批|负责人/.test(status)) return labels.indexOf('直属领导审批')
+  return labels.indexOf('待提交')
+}
+
+function buildFallbackProgressSteps(request, documentTypeLabel) {
+  const labels = documentTypeLabel === '申请单'
+    ? FALLBACK_APPLICATION_PROGRESS_LABELS
+    : FALLBACK_REIMBURSEMENT_PROGRESS_LABELS
+  const currentIndex = Math.max(0, resolveFallbackProgressCurrentIndex(labels, request, documentTypeLabel))
+
+  return labels.map((label, index) => ({
+    label,
+    rawLabel: label,
+    done: index < currentIndex,
+    active: index <= currentIndex,
+    current: index === currentIndex,
+    title: index === currentIndex ? '进行中' : index < currentIndex ? '已完成' : '待处理'
+  }))
+}
+
 function buildProgressItems(ownedRequests) {
   return ownedRequests
-    .filter((request) => Array.isArray(request?.progressSteps) && request.progressSteps.length)
     .map((request) => {
       const requestId = resolveRequestIdentity(request)
-      const steps = buildAdjacentProgressSteps(request.progressSteps, 4)
-      const currentStep = steps.find((step) => step.current)
       const title = normalizeText(request?.title || request?.note || request?.sceneLabel) || '费用单据'
+      const documentTypeLabel = resolveDocumentTypeLabel(request, requestId, title)
+      const sourceSteps = Array.isArray(request?.progressSteps) && request.progressSteps.length
+        ? request.progressSteps
+        : buildFallbackProgressSteps(request, documentTypeLabel)
+      const steps = buildAdjacentProgressSteps(sourceSteps, 4)
+      const currentStep = steps.find((step) => step.current)
 
       const status = normalizeText(request?.approvalStatus || currentStep?.label) || '处理中'
-      const documentTypeLabel = resolveDocumentTypeLabel(request, requestId, title)
 
       return {
         id: requestId,
         requestId,
         title,
         documentTypeLabel,
+        applicantLabel: resolveApplicantLabel(request),
         expenseTypeLabel: resolveExpenseCategory(request),
         amount: formatCurrency(request?.amount),
         status,
         statusTone: resolveProgressStatusTone(normalizeText(request?.approvalKey), status),
-        updatedAt: normalizeText(request?.updatedAt || request?.submittedAt || request?.createdAt),
+        updatedAt: normalizeText(request?.updatedAt || request?.submittedAt || request?.createdAt || request?.applyTime),
         steps,
         target: resolveRequestTarget(request),
-        prompt: `查询 ${requestId || title} 的费用进度`
+        prompt: `查询 ${requestId || title} 的单据进度`
       }
     })
     .sort((left, right) => normalizeText(right.updatedAt).localeCompare(normalizeText(left.updatedAt)))
@@ -486,9 +559,11 @@ function buildExpenseOperationRows(todoItems, notifications, progressItems) {
 }
 
 export function buildWorkbenchSummary(requests, currentUser) {
-  const ownedRequests = Array.isArray(requests)
-    ? requests.filter((item) => belongsToCurrentUser(item, currentUser))
+  const allRequests = Array.isArray(requests)
+    ? requests
     : []
+  const ownedRequests = allRequests.filter((item) => belongsToCurrentUser(item, currentUser))
+  const progressRequests = allRequests.filter((item) => belongsToWorkbenchProgressScope(item, currentUser))
 
   const monthlyClaims = ownedRequests.filter((item) => isCurrentMonth(resolveClaimDate(item)))
 
@@ -505,7 +580,7 @@ export function buildWorkbenchSummary(requests, currentUser) {
   const returnCount = ownedRequests.filter((item) => item.approvalKey === 'rejected').length
   const highRiskCount = monthlyClaims.filter((item) => hasHighRiskFlag(item)).length
   const todoItems = buildTodoItems(ownedRequests)
-  const progressItems = buildProgressItems(ownedRequests)
+  const progressItems = buildProgressItems(progressRequests)
   const notifications = buildNotifications(todoItems, progressItems)
   const expenseStatsDetail = {
     distributionRows: buildExpenseDistributionRows(ownedRequests),