|
|
@@ -115,10 +115,10 @@
|
|
|
<view v-if="isSettledPackage(item)" class="record-card__settle">
|
|
|
<view class="record-card__settle-item">结算状态:已结算</view>
|
|
|
<view class="record-card__settle-item"
|
|
|
- >税后收入:{{ formatAmount(item.userRealAmount) }}</view
|
|
|
+ >税后收入:{{ formatThousands(item.userRealAmount) }}</view
|
|
|
>
|
|
|
<view class="record-card__settle-item"
|
|
|
- >已交税金:{{ formatAmount(item.actualTax) }}</view
|
|
|
+ >已交税金:{{ formatThousands(item.actualTax) }}</view
|
|
|
>
|
|
|
</view>
|
|
|
|
|
|
@@ -500,11 +500,11 @@ const getProgressPercentage = (item: ScorePackageRecordItem) => {
|
|
|
*/
|
|
|
const getProgressText = (item: ScorePackageRecordItem) => {
|
|
|
if (isScorePackage(item)) {
|
|
|
- return `${formatAmount(item.finishScore)}/${formatAmount(item.score)}`
|
|
|
+ return `${formatThousands(item.finishScore) || '-'}/${formatThousands(item.score) || '-'}`
|
|
|
}
|
|
|
|
|
|
const finishedNum = String(item.taskAddFlag) === '1' ? item.taskFinishNum : item.taskNum2
|
|
|
- return `${formatAmount(finishedNum)}/${formatAmount(item.taskNum2)}`
|
|
|
+ return `${formatThousands(finishedNum) || '-'}/${formatThousands(item.taskNum2) || '-'}`
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -517,13 +517,6 @@ const formatDate = (value: Nullable<string>) => {
|
|
|
return date.isValid() ? date.format('YYYY-MM-DD') : '-'
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * 格式化金额 / 数值
|
|
|
- */
|
|
|
-const formatAmount = (value: Nullable<string | number>) => {
|
|
|
- return value === null || value === undefined || value === '' ? '-' : value
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* 获取错误文案
|
|
|
*/
|