From e54a2e294c5b0c7f3d99da5a60fb81adffd14b75 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Fri, 5 Sep 2025 21:06:00 +0800
Subject: [PATCH] =?UTF-8?q?history=20salary=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/HistorySalaryView.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/HistorySalaryView.vue b/src/views/HistorySalaryView.vue
index b92479a..3735df2 100644
--- a/src/views/HistorySalaryView.vue
+++ b/src/views/HistorySalaryView.vue
@@ -301,7 +301,13 @@ const fetchWorkReports = async (userId) => {
         date: target.billTitle,
         status: getStatusText(target.status),
         target: getLevelFromPolicy(target.target?.acceptGiftValue), // 使用政策数据计算等级
-        salary: formatSalaryValue(target.target?.settlementResult?.[userIdentity.body?.agent ? 'ownSalary' : userIdentity.body?.anchor ? 'memberSalary' : null]) || '-',
+        salary: formatSalaryValue(
+          userIdentity.body?.agent
+            ? (target.target?.settlementResult?.ownSalary || 0) + (target.target?.settlementResult?.memberSalary || 0)
+            : userIdentity.body?.anchor
+              ? target.target?.settlementResult?.memberSalary
+              : null
+        ) || '-',
         totalSalary: formatSalaryValue(target.target?.settlementResult?.totalSalary) || '-',
         timeDays: target.target?.effectiveDay || '-',
         hasDetails: target.target && target.target.dailyTargets && target.target.dailyTargets.length > 0,
@@ -315,7 +321,7 @@ const fetchWorkReports = async (userId) => {
         // 根据用户身份决定使用哪个薪资字段
         if (userIdentity.body?.agent) {
           // agent 为 true 时，使用 ownSalary
-          salary = parseFloat(target.target?.settlementResult?.ownSalary || 0)
+          salary = parseFloat((target.target?.settlementResult?.ownSalary || 0) + (target.target?.settlementResult?.memberSalary || 0))
         } else if (userIdentity.body?.anchor) {
           // anchor 为 true 时，使用 memberSalary
           salary = parseFloat(target.target?.settlementResult?.memberSalary || 0)