hy/aslan-h5
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(工资结算记录): 历史薪资设置只计算已结算的记录

Browse Source
This commit is contained in:
hzj 2025-12-23 11:49:38 +08:00
parent e6c0fa5fc9
commit bf729514d4
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/Wallet/Detail/HistorySalary.vue
View File

@ -397,22 +397,27 @@ const fetchWorkReports = async (userId) => {
})) }))
// 计算总薪资 - 根据用户身份选择对应的薪资字段 // 计算总薪资 - 根据用户身份选择对应的薪资字段
const totalAmount = targets.reduce((sum, target) => { const totalAmount = targets.reduce((sum, target, index) => {
let salary = 0 let salary = 0
// 根据用户身份决定使用哪个薪资字段 // 跳过第一项（当月还在计算中），从第二项开始计算
if (userIdentity.body?.agent) { if (index > 0) {
// agent 为 true 时，使用 ownSalary // 根据用户身份决定使用哪个薪资字段
salary = parseFloat( if (userIdentity.body?.agent) {
(target.target?.settlementResult?.ownSalary || 0) + // agent 为 true 时，使用 ownSalary
(target.target?.settlementResult?.memberSalary || 0) salary = parseFloat(
) (target.target?.settlementResult?.ownSalary || 0) +
} else if (userIdentity.body?.anchor) { (target.target?.settlementResult?.memberSalary || 0)
// anchor 为 true 时，使用 memberSalary )
salary = parseFloat(target.target?.settlementResult?.memberSalary || 0) } else if (userIdentity.body?.anchor) {
// anchor 为 true 时，使用 memberSalary
salary = parseFloat(target.target?.settlementResult?.memberSalary || 0)
}
return sum + salary
} else {
// 对于第一项，只返回当前的sum，不添加任何值
return sum
} }
return sum + salary
}, 0) }, 0)
totalSalary.value = totalAmount.toFixed(2) totalSalary.value = totalAmount.toFixed(2)