diff --git a/web/src/composables/useAppShell.js b/web/src/composables/useAppShell.js
index ac9413c..fe1a87e 100644
--- a/web/src/composables/useAppShell.js
+++ b/web/src/composables/useAppShell.js
@@ -113,7 +113,7 @@ export function useAppShell() {
return {
title: isApplicationDocument ? '申请单详情' : '报销单详情',
desc: isApplicationDocument
- ? '查看申请信息、预计金额、审批进度与预算管理口径。'
+ ? '查看申请信息、预计金额与审批进度。'
: '查看报销明细、票据材料、审批进度与风险提示。'
}
}
diff --git a/web/src/composables/useRequests.js b/web/src/composables/useRequests.js
index fa873ad..adc4c3e 100644
--- a/web/src/composables/useRequests.js
+++ b/web/src/composables/useRequests.js
@@ -764,7 +764,7 @@ export function mapExpenseClaimToRequest(claim) {
riskSummary,
attachmentSummary: isApplicationDocument ? '申请单' : (invoiceCount > 0 ? `${invoiceCount} 张票据` : '无'),
expenseTableSummary: isApplicationDocument
- ? '预计金额已纳入预算管理口径'
+ ? '预计金额已随申请提交'
: expenseItems.length
? (invoiceCount > 0
? `共 ${expenseItems.length} 条费用明细，已关联 ${invoiceCount} 张票据`
diff --git a/web/src/composables/useSystemState.js b/web/src/composables/useSystemState.js
index 8a72c9d..aa30453 100644
--- a/web/src/composables/useSystemState.js
+++ b/web/src/composables/useSystemState.js
@@ -107,7 +107,7 @@ function buildAnonymousUser() {
}
}
-function buildLegacyAdminUser(username = '') {
+function buildLegacyAdminUser(username = '') {
const normalized = String(username || '').trim()
const name = normalized || DEFAULT_USER_NAME
@@ -129,10 +129,25 @@ function buildLegacyAdminUser(username = '') {
email: '',
avatar: name.slice(0, 1).toUpperCase(),
isAdmin: true
- }
-}
-
-function readStoredUser() {
+ }
+}
+
+function resolvePlatformAdminFlag(payload, roleCodes = []) {
+ const username = String(payload?.username || payload?.account || '').trim().toLowerCase()
+ const role = String(payload?.role || '').trim().toLowerCase()
+ const normalizedRoleCodes = roleCodes.map((item) => String(item || '').trim().toLowerCase()).filter(Boolean)
+
+ return (
+ Boolean(payload?.isAdmin)
+ || username === 'admin'
+ || role === 'admin'
+ || role === '管理员'
+ || role === '系统管理员'
+ || normalizedRoleCodes.includes('admin')
+ )
+}
+
+function readStoredUser() {
if (typeof window === 'undefined') {
return buildAnonymousUser()
}
@@ -164,9 +179,9 @@ function readStoredUser() {
roleCodes,
email: String(payload.email || ''),
avatar: String(payload.avatar || name.slice(0, 1).toUpperCase()),
- isAdmin: Boolean(payload.isAdmin)
- }
- }
+ isAdmin: resolvePlatformAdminFlag(payload, roleCodes)
+ }
+ }
} catch {
return buildLegacyAdminUser(readStoredUsername())
}
@@ -609,8 +624,14 @@ async function handleLogin(credentials) {
password: credentials.password
})
- const user = response?.user || buildAnonymousUser()
- loggedIn.value = true
+ const responseUser = response?.user || buildAnonymousUser()
+ const responseRoleCodes = Array.isArray(responseUser.roleCodes) ? responseUser.roleCodes.filter(Boolean) : []
+ const user = {
+ ...responseUser,
+ roleCodes: responseRoleCodes,
+ isAdmin: resolvePlatformAdminFlag(responseUser, responseRoleCodes)
+ }
+ loggedIn.value = true
persistAuthState(true, user)
currentUser.value = user
touchAuthActivity(true)
diff --git a/web/src/services/api.js b/web/src/services/api.js
index ec7058b..1eed858 100644
--- a/web/src/services/api.js
+++ b/web/src/services/api.js
@@ -46,11 +46,13 @@ function readCurrentUserHeaders() {
const username = String(payload?.username || '').trim()
const name = String(payload?.name || username).trim()
const roleCodes = Array.isArray(payload?.roleCodes) ? payload.roleCodes.filter(Boolean) : []
- const isAdmin = Boolean(payload?.isAdmin)
+ const isAdmin = resolveStoredUserAdminFlag(payload, roleCodes)
const department = String(payload?.department || payload?.departmentName || '').trim()
+ const costCenter = String(payload?.costCenter || payload?.cost_center || '').trim()
const safeUsername = pickSafeHeaderValue(username)
const safeName = pickSafeHeaderValue(name)
const safeDepartment = pickSafeHeaderValue(department)
+ const safeCostCenter = pickSafeHeaderValue(costCenter)
if (!safeUsername && !safeName) {
return {}
@@ -73,11 +75,30 @@ function readCurrentUserHeaders() {
headers['x-auth-department'] = safeDepartment
}
+ if (safeCostCenter) {
+ headers['x-auth-cost-center'] = safeCostCenter
+ }
+
return headers
} catch {
return {}
}
}
+
+function resolveStoredUserAdminFlag(payload, roleCodes = []) {
+ const username = String(payload?.username || payload?.account || '').trim().toLowerCase()
+ const role = String(payload?.role || '').trim().toLowerCase()
+ const normalizedRoleCodes = roleCodes.map((item) => String(item || '').trim().toLowerCase()).filter(Boolean)
+
+ return (
+ Boolean(payload?.isAdmin)
+ || username === 'admin'
+ || role === 'admin'
+ || role === '管理员'
+ || role === '系统管理员'
+ || normalizedRoleCodes.includes('admin')
+ )
+}
function normalizeApiBaseUrl(value) {
return String(value || '/api/v1').replace(/\/$/, '')
diff --git a/web/src/services/budgets.js b/web/src/services/budgets.js
new file mode 100644
index 0000000..348f76f
--- /dev/null
+++ b/web/src/services/budgets.js
@@ -0,0 +1,30 @@
+import { apiRequest } from './api.js'
+
+function buildQuery(params = {}) {
+ const search = new URLSearchParams()
+ Object.entries(params || {}).forEach(([key, value]) => {
+ if (typeof value === 'undefined' || value === null || value === '') return
+ search.set(key, String(value))
+ })
+ const query = search.toString()
+ return query ? `?${query}` : ''
+}
+
+export function fetchBudgetSummary(params = {}) {
+ return apiRequest(`/budgets/summary${buildQuery(params)}`)
+}
+
+export function fetchBudgetAllocations(params = {}) {
+ return apiRequest(`/budgets/allocations${buildQuery(params)}`)
+}
+
+export function createBudgetAllocation(payload = {}) {
+ return apiRequest('/budgets/allocations', {
+ method: 'POST',
+ body: JSON.stringify(payload)
+ })
+}
+
+export function fetchBudgetTransactions(allocationId) {
+ return apiRequest(`/budgets/allocations/${encodeURIComponent(String(allocationId || '').trim())}/transactions`)
+}
diff --git a/web/src/utils/accessControl.js b/web/src/utils/accessControl.js
index 4f56239..8e3f335 100644
--- a/web/src/utils/accessControl.js
+++ b/web/src/utils/accessControl.js
@@ -13,44 +13,82 @@ export const DEFAULT_APP_VIEW_ORDER = [
const ALWAYS_VISIBLE_VIEWS = new Set(['workbench', 'documents', 'policies'])
const VIEW_ROLE_RULES = {
overview: ['finance', 'executive'],
- budget: ['finance', 'executive'],
- audit: ['auditor', 'finance'],
- logs: ['manager'],
- employees: ['manager'],
- settings: ['manager']
-}
+ budget: ['budget_monitor', 'executive'],
+ audit: ['finance'],
+ logs: ['manager'],
+ employees: ['manager'],
+ settings: ['manager']
+}
const CLAIM_MANAGER_ROLE_CODES = new Set(['executive'])
const CLAIM_RETURN_ROLE_CODES = new Set(['finance', 'executive', 'manager', 'approver'])
const CLAIM_LEADER_APPROVAL_ROLE_CODES = new Set(['manager', 'approver'])
-function normalizedRoleCodes(user) {
- if (!user) {
- return []
- }
-
- return Array.isArray(user.roleCodes)
- ? user.roleCodes.map((item) => String(item || '').trim().toLowerCase()).filter(Boolean)
- : []
-}
-
+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 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 Boolean(user?.isAdmin) || normalizedRoleCodes(user).includes('manager')
+ return hasPlatformAdminIdentity(user) || normalizedRoleCodes(user).includes('manager')
}
export function isPlatformAdminUser(user) {
- return Boolean(user?.isAdmin)
+ return hasPlatformAdminIdentity(user)
}
export function isFinanceUser(user) {
return normalizedRoleCodes(user).includes('finance')
}
-export function isExecutiveUser(user) {
- return normalizedRoleCodes(user).includes('executive')
-}
-
+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 (Boolean(user?.isAdmin)) {
+ if (isPlatformAdminUser(user)) {
return true
}
@@ -58,21 +96,21 @@ export function canManageExpenseClaims(user) {
}
export function canDeleteArchivedExpenseClaims(user) {
- return Boolean(user?.isAdmin)
+ return isPlatformAdminUser(user)
}
export function canReturnExpenseClaims(user) {
- if (Boolean(user?.isAdmin)) {
+ if (isPlatformAdminUser(user)) {
return true
}
return normalizedRoleCodes(user).some((roleCode) => CLAIM_RETURN_ROLE_CODES.has(roleCode))
}
-export function canApproveLeaderExpenseClaims(user) {
- if (Boolean(user?.isAdmin)) {
- return true
- }
+export function canApproveLeaderExpenseClaims(user) {
+ if (isPlatformAdminUser(user)) {
+ return true
+ }
return normalizedRoleCodes(user).some((roleCode) => CLAIM_LEADER_APPROVAL_ROLE_CODES.has(roleCode))
}
@@ -86,6 +124,14 @@ export function canAccessAppView(user, viewId) {
return false
}
+ 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
}
diff --git a/web/src/utils/budgetOntology.js b/web/src/utils/budgetOntology.js
index eaac9f1..29b090d 100644
--- a/web/src/utils/budgetOntology.js
+++ b/web/src/utils/budgetOntology.js
@@ -119,16 +119,16 @@ export const BUDGET_CONTROL_ACTION_OPTIONS = ['正常', '提醒', '管控']
export const BUDGET_YEAR_OPTIONS = ['2026', '2027', '2028']
export const BUDGET_QUARTER_OPTIONS = ['Q1', 'Q2', 'Q3', 'Q4']
export const BUDGET_EXPENSE_TYPE_OPTIONS = Object.freeze([
- { value: 'travel', label: '差旅费' },
+ { value: 'travel', label: '差旅' },
{ value: 'hotel', label: '住宿费' },
{ value: 'transport', label: '交通费' },
- { value: 'meal', label: '业务招待费' },
+ { value: 'meal', label: '招待费' },
{ value: 'meeting', label: '会务费' },
{ value: 'marketing', label: '市场推广费' },
- { value: 'office', label: '办公用品费' },
+ { value: 'office', label: '办公用品' },
{ value: 'training', label: '培训费' },
{ value: 'software', label: '软件服务费' },
- { value: 'communication', label: '通讯费' },
+ { value: 'communication', label: '通信' },
{ value: 'welfare', label: '福利费' }
])
@@ -139,6 +139,17 @@ const BUDGET_EXPENSE_TYPE_BY_CODE = Object.freeze(
}, {})
)
+export const BUDGET_VISIBLE_EXPENSE_TYPE_CODES = Object.freeze([
+ 'travel',
+ 'communication',
+ 'meal',
+ 'office'
+])
+
+export const BUDGET_VISIBLE_EXPENSE_TYPE_OPTIONS = Object.freeze(
+ BUDGET_VISIBLE_EXPENSE_TYPE_CODES.map((code) => BUDGET_EXPENSE_TYPE_BY_CODE[code]).filter(Boolean)
+)
+
export function resolveBudgetExpenseTypeLabel(code, fallback = '') {
return BUDGET_EXPENSE_TYPE_BY_CODE[String(code || '').trim()]?.label || fallback
}
diff --git a/web/src/utils/expenseApplicationOntology.js b/web/src/utils/expenseApplicationOntology.js
index 79b3275..eab9bd0 100644
--- a/web/src/utils/expenseApplicationOntology.js
+++ b/web/src/utils/expenseApplicationOntology.js
@@ -60,7 +60,7 @@ const PROMPT_FIELD_LABELS = [
]
export const APPLICATION_EXAMPLES = [
- '申请下周去北京做客户现场验收，差旅预算18000元',
+ '申请下周去北京做客户现场验收，预计费用18000元',
'申请上海产品发布会会务费32000元，需要场地和物料',
'申请部门集中采购办公用品4800元，用于新员工入职'
]
diff --git a/web/src/views/AppShellRouteView.vue b/web/src/views/AppShellRouteView.vue
index 0f22f23..d8d081c 100644
--- a/web/src/views/AppShellRouteView.vue
+++ b/web/src/views/AppShellRouteView.vue
@@ -111,7 +111,7 @@
@summary-change="documentSummary = $event"
/>
-
+
diff --git a/web/src/views/AuditView.vue b/web/src/views/AuditView.vue
index 462316e..19a2122 100644
--- a/web/src/views/AuditView.vue
+++ b/web/src/views/AuditView.vue
@@ -285,27 +285,16 @@