feat(工作报告单位组件): 接口接收数据调整

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

View File

@ -198,9 +198,7 @@ const fetchTeamBill = async (teamId) => {
return { return {
...bill, ...bill,
// //
date: `${bill.billBelong.toString().substring(0, 4)}.${bill.billBelong date: bill.billTitle,
.toString()
.substring(4, 6)}`,
status: formatStatus(bill.status), status: formatStatus(bill.status),
hostSalary: formatSalaryValue(bill.settleResult?.memberSalary || 0) || '-', hostSalary: formatSalaryValue(bill.settleResult?.memberSalary || 0) || '-',
agencySalary: formatSalaryValue(bill.settleResult?.ownSalary || 0) || '-', agencySalary: formatSalaryValue(bill.settleResult?.ownSalary || 0) || '-',

View File

@ -418,12 +418,6 @@ const fetchMemberWorkData = async () => {
if (data.targets && data.targets.length > 0) { if (data.targets && data.targets.length > 0) {
const latestTarget = data.targets[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 formatStatus = (status) => {
const statusMap = { const statusMap = {
@ -441,7 +435,7 @@ const fetchMemberWorkData = async () => {
// //
Object.assign(progressInfo, { Object.assign(progressInfo, {
date: `${year}.${month}.${day}`, date: latestTarget.billTitle,
status: formatStatus(latestTarget.status), status: formatStatus(latestTarget.status),
target: level, target: level,
salary: latestTarget.target?.settlementResult?.memberSalary?.toFixed(2) || '', salary: latestTarget.target?.settlementResult?.memberSalary?.toFixed(2) || '',
@ -466,7 +460,7 @@ const fetchMemberWorkData = async () => {
// agent true 使 ownSalary // agent true 使 ownSalary
salary = parseFloat( salary = parseFloat(
(target.target?.settlementResult?.ownSalary || 0) + (target.target?.settlementResult?.ownSalary || 0) +
(target.target?.settlementResult?.memberSalary || 0) (target.target?.settlementResult?.memberSalary || 0),
) )
} else if (userIdentity.body?.anchor) { } else if (userIdentity.body?.anchor) {
// anchor true 使 memberSalary // anchor true 使 memberSalary
@ -509,7 +503,7 @@ watch(
color.value = 'rgba(174, 174, 174, 1)' color.value = 'rgba(174, 174, 174, 1)'
} }
return return
} },
) )
// //

View File

@ -169,12 +169,6 @@ const fetchMemberWorkData = async () => {
if (data.targets && data.targets.length > 0) { if (data.targets && data.targets.length > 0) {
const latestTarget = data.targets[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 formatStatus = (status) => {
const statusMap = { const statusMap = {
@ -194,7 +188,7 @@ const fetchMemberWorkData = async () => {
// //
Object.assign(progressInfo, { Object.assign(progressInfo, {
date: `${year}.${month}.${day}`, date: latestTarget.billTitle,
status: formatStatus(latestTarget.status), status: formatStatus(latestTarget.status),
target: level, target: level,
salary: salary:
@ -203,8 +197,8 @@ const fetchMemberWorkData = async () => {
? (latestTarget.target?.settlementResult?.ownSalary || 0) + ? (latestTarget.target?.settlementResult?.ownSalary || 0) +
(latestTarget.target?.settlementResult?.memberSalary || 0) (latestTarget.target?.settlementResult?.memberSalary || 0)
: userIdentity.body?.anchor : userIdentity.body?.anchor
? latestTarget.target?.settlementResult?.memberSalary ? latestTarget.target?.settlementResult?.memberSalary
: null : null,
) || '-', ) || '-',
income: latestTarget.target?.settlementResult?.acceptGiftValue, income: latestTarget.target?.settlementResult?.acceptGiftValue,
timeDays: latestTarget.target?.effectiveDay || '', timeDays: latestTarget.target?.effectiveDay || '',

View File

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