feat(组件更新): 显示金币收入
This commit is contained in:
parent
9f762b1d48
commit
7012bc58a2
@ -31,7 +31,10 @@
|
||||
<div class="contentText">Target: {{ target }}</div>
|
||||
<div class="contentText">Salary: ${{ salary }}</div>
|
||||
</div>
|
||||
<div class="contentText">Time(Days):{{ days }}</div>
|
||||
<div style="display: grid; grid-template-columns: repeat(2, 1fr)">
|
||||
<div class="contentText">Time(Days):{{ days }}</div>
|
||||
<div class="contentText" v-if="income">Total income:{{ income }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="more"
|
||||
@ -70,6 +73,11 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
|
||||
income: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
|
||||
days: {
|
||||
type: String,
|
||||
default: '',
|
||||
|
||||
@ -218,6 +218,7 @@
|
||||
:date="progressInfo.date"
|
||||
:target="String(progressInfo.target)"
|
||||
:salary="progressInfo.salary"
|
||||
:income="progressInfo.income"
|
||||
:days="String(progressInfo.timeDays)"
|
||||
></workReportBox>
|
||||
</div>
|
||||
@ -403,6 +404,7 @@ const fetchMemberWorkData = async () => {
|
||||
status: formatStatus(latestTarget.status),
|
||||
target: level,
|
||||
salary: latestTarget.target?.settlementResult?.ownSalary?.toFixed(2) || '–',
|
||||
income: latestTarget.target?.settlementResult?.acceptGiftValue,
|
||||
timeDays: latestTarget.target?.effectiveDay || '–',
|
||||
})
|
||||
} else {
|
||||
|
||||
@ -47,6 +47,7 @@
|
||||
:date="report.date"
|
||||
:target="report.target"
|
||||
:salary="report.salary"
|
||||
:income="report.income"
|
||||
:days="report.timeDays"
|
||||
more="true"
|
||||
@showMore="showReportDetail(report)"
|
||||
@ -127,6 +128,7 @@
|
||||
<div class="text-700">Target: {{ selectedReport.target }}</div>
|
||||
<div class="text-700">Salary: ${{ selectedReport.salary }}</div>
|
||||
<div class="text-700">Time(Days): {{ selectedReport.timeDays }}</div>
|
||||
<div class="text-700">Total income: {{ selectedReport.income }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -154,9 +156,7 @@
|
||||
{{ formatDateNumber(daily.dateNumber) }}
|
||||
</div>
|
||||
<div style="display: flex; justify-content: space-between; align-items: center">
|
||||
<div class="text-700">
|
||||
Target: {{ getLevelFromPolicy(daily.acceptGiftValue) }}
|
||||
</div>
|
||||
<div class="text-700">Income: {{ daily.acceptGiftValue }}</div>
|
||||
|
||||
<div style="font-size: 14px">
|
||||
<span class="text-700">Time:</span>
|
||||
@ -349,6 +349,7 @@ const fetchWorkReports = async (userId) => {
|
||||
.toString()
|
||||
.substring(4, 6)}`,
|
||||
status: getStatusText(target.status),
|
||||
income: target.target?.acceptGiftValue,
|
||||
target: getLevelFromPolicy(target.target?.acceptGiftValue), // 使用政策数据计算等级
|
||||
salary:
|
||||
formatSalaryValue(
|
||||
|
||||
@ -169,6 +169,7 @@
|
||||
:date="progressInfo.date"
|
||||
:target="progressInfo.target"
|
||||
:salary="progressInfo.salary"
|
||||
:income="progressInfo.income"
|
||||
:days="progressInfo.timeDays"
|
||||
></workReportBox>
|
||||
|
||||
@ -256,6 +257,7 @@ const fetchMemberWorkData = async () => {
|
||||
status: formatStatus(latestTarget.status),
|
||||
target: level,
|
||||
salary: latestTarget.target?.settlementResult?.ownSalary?.toFixed(2) || '–',
|
||||
income: latestTarget.target?.settlementResult?.acceptGiftValue,
|
||||
timeDays: latestTarget.target?.effectiveDay || '–',
|
||||
})
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user