From 5c2c5b92dd11854669ad8bcfee9185945d052ab7 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Tue, 27 Jan 2026 14:34:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8A=A5=E8=A1=A8):=20=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E5=A4=A9=E5=8C=BB=E5=B8=81=E6=8A=A5=E8=A1=A8=E6=94=B6=E5=85=A5?=
 =?UTF-8?q?=E9=A1=B9=E6=98=BE=E7=A4=BA=E7=82=B9=E6=95=B0=E5=92=8C=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改收入项数据结构，支持同时显示金额和点数
调整前端布局和显示格式，当点数与金额不同时显示点数信息
---
 .../src/views/statistics/tianyibi/report.vue  | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/apps/finance/src/views/statistics/tianyibi/report.vue b/apps/finance/src/views/statistics/tianyibi/report.vue
index 5ac9371..27181dc 100644
--- a/apps/finance/src/views/statistics/tianyibi/report.vue
+++ b/apps/finance/src/views/statistics/tianyibi/report.vue
@@ -6,8 +6,13 @@ import MonthReportView from '#/views/statistics/common/MonthReportView.vue';
 
 import { useMonthReport } from '../common/useMonthReport';
 
+interface IncomeItem {
+  fee: number;
+  point: number;
+}
+
 interface Report {
-  incomes: Record<string, number>;
+  incomes: Record<string, IncomeItem>;
   consumes: Record<string, number>;
   surplus: number;
 }
@@ -15,6 +20,7 @@ interface Report {
 interface ReportItem {
   type: string;
   fee: number;
+  point: number;
 }
 
 const { year, disabledDate, list, loading, getList, downloadReport, downloadAllReport } =
@@ -24,10 +30,15 @@ const { year, disabledDate, list, loading, getList, downloadReport, downloadAllR
     fileNameBuilder: (y, m) => `天医币报表_${y}年${m}月_文件.xlsx`,
     normalize: (data) => ({
       incomes: {
-        微信: 0,
-        支付宝: 0,
-        银行: 0,
-        ...Object.fromEntries(data.map.incomes.map((item: ReportItem) => [item.type, item.fee])),
+        微信: { fee: 0, point: 0 },
+        支付宝: { fee: 0, point: 0 },
+        银行: { fee: 0, point: 0 },
+        ...Object.fromEntries(
+          data.map.incomes.map((item: ReportItem) => [
+            item.type,
+            { fee: item.fee, point: item.point },
+          ]),
+        ),
       },
       consumes: {
         实物: 0,
@@ -63,11 +74,13 @@ onMounted(() => {
     <template #default="{ item }">
       <div class="-m-2 text-[16px]">
         <div class="flex">
-          <div class="flex-1 bg-[#F6FFF5] px-2 pb-1">
+          <div class="min-w-[50%] bg-[#F6FFF5] px-2 pb-1">
             <div class="p-1 text-center font-bold">进项</div>
-            <div v-for="(fee, type) in item.incomes" :key="type" class="p-1">
+            <div v-for="(value, type) in item.incomes" :key="type" class="p-1">
               <span class="text-gray-500">{{ type }}：</span>
-              <span class="text-black">{{ fee }}</span>
+              <span class="text-black">{{
+                `￥${value.fee}${!value.point || value.fee === value.point ? '' : `（天医币${value.point}）`}`
+              }}</span>
             </div>
           </div>
           <div class="flex-1 bg-[#FFFBF0] px-2 pb-1">