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 2026-01-09 15:04:18 +08:00
parent cf8310034a
commit 3b17a2345b
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/AgencyCenter/TeamBill.vue
View File

@ -198,9 +198,7 @@ const fetchTeamBill = async (teamId) => {
return {
...bill,
// 将时间戳转换为可读格式
date: `${bill.billBelong.toString().substring(0, 4)}.${bill.billBelong
.toString()
.substring(4, 6)}`,
date: bill.billTitle,
status: formatStatus(bill.status),
hostSalary: formatSalaryValue(bill.settleResult?.memberSalary || 0) || '-',
agencySalary: formatSalaryValue(bill.settleResult?.ownSalary || 0) || '-',

12
src/views/AgencyCenter/index.vue
View File

@ -418,12 +418,6 @@ const fetchMemberWorkData = async () => {
if (data.targets && data.targets.length > 0) {
const latestTarget = data.targets[0]
// 格式化日期：202508 -> 08/2025
const billBelong = latestTarget.billBelong.toString()
const year = billBelong.substring(0, 4)
const month = billBelong.substring(4, 6)
const day = billBelong.substring(6, 8)
// 格式化状态
const formatStatus = (status) => {
const statusMap = {
@ -441,7 +435,7 @@ const fetchMemberWorkData = async () => {
// 更新数据
Object.assign(progressInfo, {
date: `${year}.${month}.${day}`,
date: latestTarget.billTitle,
status: formatStatus(latestTarget.status),
target: level,
salary: latestTarget.target?.settlementResult?.memberSalary?.toFixed(2) || '–',
@ -466,7 +460,7 @@ const fetchMemberWorkData = async () => {
// agent 为 true 时，使用 ownSalary
salary = parseFloat(
(target.target?.settlementResult?.ownSalary || 0) +
(target.target?.settlementResult?.memberSalary || 0)
(target.target?.settlementResult?.memberSalary || 0),
)
} else if (userIdentity.body?.anchor) {
// anchor 为 true 时，使用 memberSalary
@ -509,7 +503,7 @@ watch(
color.value = 'rgba(174, 174, 174, 1)'
}
return
}
},
)
// 页面跳转方法

12
src/views/HostCenter/index.vue
View File

@ -169,12 +169,6 @@ const fetchMemberWorkData = async () => {
if (data.targets && data.targets.length > 0) {
const latestTarget = data.targets[0]
// 格式化日期：202508 -> 08/2025
const billBelong = latestTarget.billBelong.toString()
const year = billBelong.substring(0, 4)
const month = billBelong.substring(4, 6)
const day = billBelong.substring(6, 8)
// 格式化状态
const formatStatus = (status) => {
const statusMap = {
@ -194,7 +188,7 @@ const fetchMemberWorkData = async () => {
// 更新数据
Object.assign(progressInfo, {
date: `${year}.${month}.${day}`,
date: latestTarget.billTitle,
status: formatStatus(latestTarget.status),
target: level,
salary:
@ -203,8 +197,8 @@ const fetchMemberWorkData = async () => {
? (latestTarget.target?.settlementResult?.ownSalary || 0) +
(latestTarget.target?.settlementResult?.memberSalary || 0)
: userIdentity.body?.anchor
? latestTarget.target?.settlementResult?.memberSalary
: null
? latestTarget.target?.settlementResult?.memberSalary
: null,
) || '-',
income: latestTarget.target?.settlementResult?.acceptGiftValue,
timeDays: latestTarget.target?.effectiveDay || '–',

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

@ -308,7 +308,7 @@ watch(
color.value = 'rgba(174, 174, 174, 1)'
}
return
}
},
)
// 获取政策数据
@ -374,9 +374,7 @@ const fetchWorkReports = async (userId) => {
workReports.value = targets.map((target) => ({
id: target.id,
date: `${target.billBelong.toString().substring(0, 4)}.${target.billBelong
.toString()
.substring(4, 6)}`,
date: target.billTitle,
status: getStatusText(target.status),
income: target.target?.acceptGiftValue,
target: getLevelFromPolicy(target.target?.acceptGiftValue), // 使用政策数据计算等级
@ -386,8 +384,8 @@ const fetchWorkReports = async (userId) => {
? (target.target?.settlementResult?.ownSalary || 0) +
(target.target?.settlementResult?.memberSalary || 0)
: userIdentity.body?.anchor
? target.target?.settlementResult?.memberSalary
: null
? target.target?.settlementResult?.memberSalary
: null,
) || '-',
totalSalary: formatSalaryValue(target.target?.settlementResult?.totalSalary) || '-',
timeDays: target.target?.effectiveDay || '-',
@ -407,7 +405,7 @@ const fetchWorkReports = async (userId) => {
// agent 为 true 时，使用 ownSalary
salary = parseFloat(
(target.target?.settlementResult?.ownSalary || 0) +
(target.target?.settlementResult?.memberSalary || 0)
(target.target?.settlementResult?.memberSalary || 0),
)
} else if (userIdentity.body?.anchor) {
// anchor 为 true 时，使用 memberSalary