YG-Soft/X-Financial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: preserve reviewer risk notice after standard adjustment

Browse Source
This commit is contained in:
caoxiaozhu
2026-06-03 19:10:29 +08:00
parent cb36d78fa2
commit 0f8bc4071a
3 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/views/scripts/TravelRequestDetailView.js
View File

@@ -93,7 +93,7 @@ import {
import {
buildCurrentStandardAdjustmentMap,
buildStandardAdjustmentPayload as buildStandardAdjustmentPayloadModel,
filterSubmitterStandardAdjustedRiskCards as filterSubmitterStandardAdjustedRiskCardsModel,
filterSubmitterResolvedRiskCards as filterSubmitterResolvedRiskCardsModel,
isRiskCardMissingExpenseNote as isRiskCardMissingExpenseNoteModel,
resolveExpenseItemForRiskCard as resolveExpenseItemForRiskCardModel
} from './travelRequestDetailStandardAdjustment.js'
@@ -1179,8 +1179,8 @@ export default {
return resolveExpenseItemForRiskCardModel(card, expenseItems.value)
}
function filterSubmitterStandardAdjustedRiskCards(cards, businessStage) {
return filterSubmitterStandardAdjustedRiskCardsModel({
function filterSubmitterResolvedRiskCards(cards, businessStage) {
return filterSubmitterResolvedRiskCardsModel({
cards,
businessStage,
isCurrentApplicant: isCurrentApplicant.value,
@@ -1597,7 +1597,7 @@ export default {
: []
const scopedRiskCards = [
...(hasActionableRiskCards ? [] : summaryRiskCards),
...filterSubmitterStandardAdjustedRiskCards(directRiskCards, currentBusinessStage)
...filterSubmitterResolvedRiskCards(directRiskCards, currentBusinessStage)
]
const riskCards = filterRiskCardsForVisibility(scopedRiskCards, riskViewerContext.value)

22
web/src/views/scripts/travelRequestDetailStandardAdjustment.js
View File

@@ -31,14 +31,6 @@ export function resolveExpenseItemForRiskCard(card, expenseItems = []) {
|| null
}
export function hasStandardAdjustmentForItem(item, standardAdjustmentMap = new Map()) {
const itemId = normalizeText(item?.id)
if (!itemId) {
return false
}
return Boolean(item?.standardAdjustmentAccepted || standardAdjustmentMap.has(itemId))
}
export function isRiskCardMissingExpenseNote(card, expenseItems = []) {
const item = resolveExpenseItemForRiskCard(card, expenseItems)
if (!item) {
@@ -47,7 +39,15 @@ export function isRiskCardMissingExpenseNote(card, expenseItems = []) {
return !normalizeText(item.itemNote)
}
function isRiskCardCoveredByStandardAdjustment(card, expenseItems, standardAdjustmentMap) {
export function hasStandardAdjustmentForItem(item, standardAdjustmentMap = new Map()) {
const itemId = normalizeText(item?.id)
if (!itemId) {
return false
}
return Boolean(item?.standardAdjustmentAccepted || standardAdjustmentMap.has(itemId))
}
function isRiskCardResolvedForSubmitter(card, expenseItems, standardAdjustmentMap) {
if (normalizeText(card?.source) === STANDARD_ADJUSTMENT_RISK_SOURCE) {
return true
}
@@ -57,7 +57,7 @@ function isRiskCardCoveredByStandardAdjustment(card, expenseItems, standardAdjus
)
}
export function filterSubmitterStandardAdjustedRiskCards({
export function filterSubmitterResolvedRiskCards({
cards = [],
businessStage = 'reimbursement',
isCurrentApplicant = false,
@@ -67,7 +67,7 @@ export function filterSubmitterStandardAdjustedRiskCards({
if (businessStage !== 'reimbursement' || !isCurrentApplicant) {
return cards
}
return cards.filter((card) => !isRiskCardCoveredByStandardAdjustment(card, expenseItems, standardAdjustmentMap))
return cards.filter((card) => !isRiskCardResolvedForSubmitter(card, expenseItems, standardAdjustmentMap))
}
function extractRiskCardMoneyValues(card) {