From 00a562d2102ac7e2ace7bb4ced1828031e2eb181 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Sun, 24 Aug 2025 14:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=B9=B4=E5=BA=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E6=B1=87=E6=80=BB=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/budget/budgetCollectionPackage.js |    9 +
 src/views/budget/collection/package.vue   | 1506 +++++++++++++++++++--
 2 files changed, 1391 insertions(+), 124 deletions(-)

diff --git a/src/api/budget/budgetCollectionPackage.js b/src/api/budget/budgetCollectionPackage.js
index b76ac73..e087f68 100644
--- a/src/api/budget/budgetCollectionPackage.js
+++ b/src/api/budget/budgetCollectionPackage.js
@@ -148,3 +148,12 @@ export function getPackageStatusOptions() {
     { value: 'suspended', label: '暂停' }
   ])
 }
+
+// 获取经济分类列表
+export function getEconomicClassifications(params) {
+  return request({
+    url: '/api/ht/economic-categories',
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/views/budget/collection/package.vue b/src/views/budget/collection/package.vue
index d0e3da9..eb43298 100644
--- a/src/views/budget/collection/package.vue
+++ b/src/views/budget/collection/package.vue
@@ -22,7 +22,7 @@
                   style="width: 150px"
                 >
                   <el-option
-                    v-for="item in departmentOptions"
+                    v-for="item in departmentOptions.data || []"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id"
@@ -35,13 +35,6 @@
                 <Button type="error" @click="batchDelete" :disabled="selectedRows.length === 0">批量删除</Button>
                 <Button type="success" @click="toggleTreeView">{{ showTree ? '列表视图' : '树形视图' }}</Button>
                 <Button type="warning" @click="showSummaryView">汇总查看</Button>
-                <Button 
-                  type="info" 
-                  @click="openMultiPackageSummary" 
-                  :disabled="selectedLevel1Packages.length === 0"
-                >
-                  多包汇总提交 ({{ selectedLevel1Packages.length }})
-                </Button>
               </div>
             </div>
           </div>
@@ -62,7 +55,7 @@
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" align="center" :selectable="row => row.level === 1" />
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column align="left" label="序号" width="90">
           <template slot-scope="scope">
             <span class="multi-level-number">{{ generateTreeNumber(scope.row) }}</span>
@@ -124,7 +117,7 @@
         </el-table-column>
 
 
-        <el-table-column fixed="right" label="操作" width="250">
+        <el-table-column fixed="right" label="操作" width="200">
           <template slot-scope="scope">
             <Button 
               v-if="scope.row.level <= 2" 
@@ -146,16 +139,6 @@
             >
               添加子包
             </Button>
-            <Button 
-              v-if="scope.row.level >= 2 && scope.row.level <= 3" 
-              type="primary" 
-              @click="viewDetail(scope.row)" 
-              size="small" 
-              style="margin-right: 5px;" 
-              ghost
-            >
-              查看详情
-            </Button>
             <Button 
               v-if="scope.row.level <= 2" 
               type="error" 
@@ -181,7 +164,7 @@
         v-loading="loading"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" align="center" :selectable="row => row.level === 1" />
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column align="left" label="序号" width="90">
           <template slot-scope="scope">
             <span class="multi-level-number">{{ generateListNumber(scope.row, scope.$index) }}</span>
@@ -255,7 +238,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column fixed="right" label="操作" width="250">
+        <el-table-column fixed="right" label="操作" width="200">
           <template slot-scope="scope">
             <Button 
               v-if="scope.row.level <= 2" 
@@ -277,16 +260,6 @@
             >
               添加子包
             </Button>
-            <Button 
-              v-if="scope.row.level >= 2 && scope.row.level <= 3" 
-              type="primary" 
-              @click="viewDetail(scope.row)" 
-              size="small" 
-              style="margin-right: 5px;" 
-              ghost
-            >
-              查看详情
-            </Button>
             <Button 
               v-if="scope.row.level <= 2" 
               type="error" 
@@ -316,71 +289,342 @@
     </div>
 
     <!-- 汇总查看对话框 -->
-    <el-dialog title="金额汇总表" :visible.sync="summaryDialogVisible" width="95%" :close-on-click-modal="false">
+    <el-dialog title="预算分配汇总表" :visible.sync="summaryDialogVisible" width="95%" :close-on-click-modal="false">
       <div class="summary-container" v-loading="summaryLoading">
-        <div class="cross-table-wrapper">
+        <!-- 统计卡片 -->
+        <el-row :gutter="20" class="stats-row">
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-primary">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-folder"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ summaryStats.bigPackageCount }}</h3>
+                  <p>大包数量</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-success">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-document"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ summaryStats.mediumPackageCount }}</h3>
+                  <p>中包数量</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-warning">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-coin"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ formatAmount(summaryStats.totalAllocatedAmount) }}</h3>
+                  <p>总分配金额(万元)</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-info">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-money"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ formatAmount(summaryStats.totalReportedAmount) }}</h3>
+                  <p>总上报金额(万元)</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+        </el-row>
+        <!-- 第二行统计卡片 -->
+        <el-row :gutter="20" class="stats-row">
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-gradient-1">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-wallet"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ formatAmount(summaryStats.provincialAllocatedAmount) }}</h3>
+                  <p>省厅预算总分配金额(万元)</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-gradient-2">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-cloudy"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ formatAmount(summaryStats.provincialReportedAmount) }}</h3>
+                  <p>省厅预算总上报金额(万元)</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-gradient-3">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-coin"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ formatAmount(summaryStats.ownFundsAndProjectsAllocatedAmount) }}</h3>
+                  <p>自有资金与课题总分配金额(万元)</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="6">
+            <el-card class="stat-card stat-card-gradient-4">
+              <div class="stat-content">
+                <div class="stat-icon">
+                  <i class="el-icon-s-marketing"></i>
+                </div>
+                <div class="stat-info">
+                  <h3>{{ formatAmount(summaryStats.ownFundsAndProjectsReportedAmount) }}</h3>
+                  <p>自有资金与课题总上报金额(万元)</p>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+        </el-row>
+
+        <!-- 统计模式切换 -->
+        <div class="mode-switch-wrapper">
+          <el-radio-group v-model="summaryMode" size="medium">
+            <el-radio-button label="package">按大包统计</el-radio-button>
+            <el-radio-button label="department">按部门统计</el-radio-button>
+            <el-radio-button label="economic">按经济分类统计</el-radio-button>
+          </el-radio-group>
+        </div>
+
+        <!-- 预算表格 -->
+        <div class="table-wrapper">
+          <!-- 按大包统计表格 -->
           <el-table
-            :data="crossTableDataWithSummary"
+            v-show="summaryMode === 'package'"
+            :data="budgetTableFlatData"
             border
-            style="width: 100%"
-            :max-height="600"
             stripe
-            class="cross-table"
-            :row-class-name="getRowClassName"
+            size="small"
+            style="width: 100%"
+            :span-method="packageMergeMethod"
           >
-            <el-table-column 
-              prop="packageName" 
-              label="项目名称" 
-              min-width="200" 
-              fixed="left"
-              align="left"
-            >
+            <el-table-column prop="bigPackageName" label="大包" width="150" align="center" header-align="center" class-name="table-cell-package">
               <template slot-scope="scope">
-                <div :class="scope.row.isSummary ? 'summary-label' : 'package-name-wrapper'">
-                  <span class="package-name">{{ scope.row.packageName }}</span>
-                </div>
+                <span class="package-name-text">{{ scope.row.bigPackageName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="mediumPackageName" label="项目(中包)" width="180" align="left" header-align="center" class-name="table-cell-project">
+              <template slot-scope="scope">
+                <span class="project-name-text">{{ scope.row.mediumPackageName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="allocated_amount" label="分配金额" width="120" align="right" header-align="center" class-name="table-cell-amount">
+              <template slot-scope="scope">
+                <span class="amount-text">{{ formatAmount(scope.row.allocated_amount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="reported_amount" label="上报金额" width="120" align="right" header-align="center" class-name="table-cell-amount">
+              <template slot-scope="scope">
+                <span class="amount-text" v-if="scope.row.reported_amount > 0">
+                  {{ formatAmount(scope.row.reported_amount) }}
+                </span>
+                <span class="no-submission-text" v-else>
+                  {{ scope.row.submission_status === 'no_submission' ? '未申报' : '0' }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="totalAllocated" label="按大包累计分配金额" width="160" align="right" header-align="center" class-name="table-cell-total">
+              <template slot-scope="scope">
+                <span class="total-amount-text">{{ formatAmount(scope.row.totalAllocated) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="totalReported" label="按大包累计上报金额" width="160" align="right" header-align="center" class-name="table-cell-total">
+              <template slot-scope="scope">
+                <span class="total-amount-text">{{ formatAmount(scope.row.totalReported) }}</span>
               </template>
             </el-table-column>
-            
             <el-table-column
               v-for="classification in economicClassifications"
               :key="classification.code"
-              :prop="'amount_' + classification.code"
+              :prop="'economic_' + classification.code"
               :label="classification.name"
               width="120"
               align="right"
+              header-align="center"
+              class-name="table-cell-economic"
             >
               <template slot-scope="scope">
-                <span 
-                  v-if="scope.row['amount_' + classification.code] > 0"
-                  :class="scope.row.isSummary ? 'summary-amount' : 'amount-cell'"
+                <el-tooltip
+                  v-if="scope.row.economicBasis && scope.row.economicBasis[classification.code]"
+                  :content="scope.row.economicBasis[classification.code]"
+                  placement="top"
+                  :popper-options="{ boundariesElement: 'viewport' }"
+                  popper-class="economic-tooltip"
                 >
-                  {{ formatCurrency(scope.row['amount_' + classification.code]) }}
+                  <span class="economic-amount-text">
+                    {{ scope.row.economicAmounts && scope.row.economicAmounts[classification.code] && scope.row.economicAmounts[classification.code] > 0
+                       ? formatAmount(scope.row.economicAmounts[classification.code]) 
+                       : '-' }}
+                  </span>
+                </el-tooltip>
+                <span v-else class="economic-amount-text">
+                  {{ scope.row.economicAmounts && scope.row.economicAmounts[classification.code] && scope.row.economicAmounts[classification.code] > 0
+                     ? formatAmount(scope.row.economicAmounts[classification.code]) 
+                     : '-' }}
                 </span>
-                <span v-else class="empty-cell">-</span>
               </template>
             </el-table-column>
-            
-            <el-table-column 
-              prop="totalAmount" 
-              label="合计" 
-              width="150" 
-              fixed="right" 
+          </el-table>
+
+          <!-- 按部门统计表格 -->
+          <el-table
+            v-show="summaryMode === 'department'"
+            :data="budgetTableFlatDataByDept"
+            border
+            stripe
+            size="small"
+            style="width: 100%"
+            :span-method="departmentMergeMethod"
+          >
+            <el-table-column prop="departmentName" label="部门" width="150" align="center" header-align="center" class-name="table-cell-package">
+              <template slot-scope="scope">
+                <span class="package-name-text">{{ scope.row.departmentName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="projectFullName" label="项目" width="250" align="left" header-align="center" class-name="table-cell-project">
+              <template slot-scope="scope">
+                <span class="project-name-text">{{ scope.row.projectFullName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="allocated_amount" label="分配金额" width="120" align="right" header-align="center" class-name="table-cell-amount">
+              <template slot-scope="scope">
+                <span class="amount-text">{{ formatAmount(scope.row.allocated_amount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="reported_amount" label="上报金额" width="120" align="right" header-align="center" class-name="table-cell-amount">
+              <template slot-scope="scope">
+                <span class="amount-text" v-if="scope.row.reported_amount > 0">
+                  {{ formatAmount(scope.row.reported_amount) }}
+                </span>
+                <span class="no-submission-text" v-else>
+                  {{ scope.row.submission_status === 'no_submission' ? '未申报' : '0' }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="deptTotalAllocated" label="按部门累计分配金额" width="160" align="right" header-align="center" class-name="table-cell-total">
+              <template slot-scope="scope">
+                <span class="total-amount-text">{{ formatAmount(scope.row.deptTotalAllocated) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="deptTotalReported" label="按部门累计上报金额" width="160" align="right" header-align="center" class-name="table-cell-total">
+              <template slot-scope="scope">
+                <span class="total-amount-text">{{ formatAmount(scope.row.deptTotalReported) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-for="classification in economicClassifications"
+              :key="classification.code"
+              :prop="'economic_' + classification.code"
+              :label="classification.name"
+              width="120"
               align="right"
+              header-align="center"
+              class-name="table-cell-economic"
             >
               <template slot-scope="scope">
-                <span :class="scope.row.isSummary ? 'grand-total' : 'total-amount'">
-                  {{ formatCurrency(scope.row.totalAmount) }}
+                <el-tooltip
+                  v-if="scope.row.economicBasis && scope.row.economicBasis[classification.code]"
+                  :content="scope.row.economicBasis[classification.code]"
+                  placement="top"
+                  :popper-options="{ boundariesElement: 'viewport' }"
+                  popper-class="economic-tooltip"
+                >
+                  <span class="economic-amount-text">
+                    {{ scope.row.economicAmounts && scope.row.economicAmounts[classification.code] && scope.row.economicAmounts[classification.code] > 0
+                       ? formatAmount(scope.row.economicAmounts[classification.code]) 
+                       : '-' }}
+                  </span>
+                </el-tooltip>
+                <span v-else class="economic-amount-text">
+                  {{ scope.row.economicAmounts && scope.row.economicAmounts[classification.code] && scope.row.economicAmounts[classification.code] > 0
+                     ? formatAmount(scope.row.economicAmounts[classification.code]) 
+                     : '-' }}
                 </span>
               </template>
             </el-table-column>
           </el-table>
+
+          <!-- 按经济分类统计表格 -->
+          <el-table
+            v-show="summaryMode === 'economic'"
+            :data="budgetTableFlatDataByEconomic"
+            border
+            stripe
+            size="small"
+            style="width: 100%"
+            :span-method="economicMergeMethod"
+          >
+            <el-table-column prop="economicClassName" label="经济分类" width="150" align="center" header-align="center" class-name="table-cell-package">
+              <template slot-scope="scope">
+                <span class="package-name-text">{{ scope.row.economicClassName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="departmentName" label="科室" width="240" align="center" header-align="center" class-name="table-cell-project">
+              <template slot-scope="scope">
+                <span class="project-name-text">{{ scope.row.departmentName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="projectName" label="项目 (中包)" width="220" align="left" header-align="center" class-name="table-cell-project">
+              <template slot-scope="scope">
+                <span class="project-name-text">{{ scope.row.projectFullName ? scope.row.projectFullName : scope.row.projectName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="projectAmount" label="金额" width="120" align="right" header-align="center" class-name="table-cell-amount">
+              <template slot-scope="scope">
+                <el-tooltip
+                  v-if="scope.row.calculationBasis"
+                  :content="scope.row.calculationBasis"
+                  placement="top"
+                  :popper-options="{ boundariesElement: 'viewport' }"
+                  popper-class="economic-tooltip"
+                >
+                  <span class="amount-text">{{ formatAmount(scope.row.projectAmount) }}</span>
+                </el-tooltip>
+                <span v-else class="amount-text">{{ formatAmount(scope.row.projectAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="deptTotal" label="按科室汇总" width="140" align="right" header-align="center" class-name="table-cell-total">
+              <template slot-scope="scope">
+                <span class="total-amount-text">{{ formatAmount(scope.row.deptTotal) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="economicTotal" label="按经济分类汇总" width="160" align="right" header-align="center" class-name="table-cell-total">
+              <template slot-scope="scope">
+                <span class="total-amount-text">{{ formatAmount(scope.row.economicTotal) }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
       </div>
       
       <div slot="footer" class="dialog-footer">
         <el-button @click="summaryDialogVisible = false">关 闭</el-button>
-        <el-button type="primary" @click="exportCrossTable">导出金额汇总表</el-button>
+        <el-button type="primary" @click="exportBudgetTable">导出预算分配表</el-button>
       </div>
     </el-dialog>
 
@@ -478,7 +722,7 @@
             <el-form-item label="负责科室" prop="department_id">
               <el-select v-model="form.department_id" placeholder="请选择负责科室" style="width: 100%" clearable>
                 <el-option
-                  v-for="item in departmentOptions"
+                  v-for="item in departmentOptions.data || []"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
@@ -524,7 +768,8 @@ import {
   deleteBudgetCollectionPackage,
   batchDeleteBudgetCollectionPackage,
   getBudgetCollectionPackageOptions,
-  getBudgetCollectionPackageSummary
+  getBudgetCollectionPackageSummary,
+  getEconomicClassifications
 } from '@/api/budget/budgetCollectionPackage.js'
 import { getBudgetCollectionYearOptions } from '@/api/budget/budgetCollectionYear.js'
 import { listdeptNoAuth } from '@/api/system/department.js'
@@ -605,7 +850,24 @@ export default {
       summaryLoading: false,
       crossTableData: [],
       economicClassifications: [],
-      crossTableSummary: null
+      crossTableSummary: null,
+      // 新增预算表格数据
+      rawBudgetData: [], // 原始数据，深拷贝保存避免引用共享
+      budgetTableData: [],
+      budgetTableFlatData: [], // 扁平化的表格数据用于el-table展示
+      budgetTableFlatDataByDept: [], // 按部门统计的扁平化数据
+      budgetTableFlatDataByEconomic: [], // 按经济分类统计的扁平化数据
+      summaryMode: 'package', // 统计模式：package、department 或 economic
+      summaryStats: {
+        bigPackageCount: 0,
+        mediumPackageCount: 0,
+        totalAllocatedAmount: 0,
+        totalReportedAmount: 0,
+        provincialAllocatedAmount: 0,
+        provincialReportedAmount: 0,
+        ownFundsAndProjectsAllocatedAmount: 0,
+        ownFundsAndProjectsReportedAmount: 0
+      }
     }
   },
   computed: {
@@ -627,6 +889,21 @@ export default {
       }
 
       return [...this.crossTableData, summaryRow]
+    },
+
+    // 按大包统计合并方法
+    packageMergeMethod() {
+      return this.mergeMethod
+    },
+
+    // 按部门统计合并方法
+    departmentMergeMethod() {
+      return this.mergeMethodByDept
+    },
+
+    // 按经济分类统计合并方法
+    economicMergeMethod() {
+      return this.mergeMethodByEconomic
     }
   },
   created() {
@@ -702,13 +979,13 @@ export default {
 
         // 加载部门选项
         const deptResponse = await listdeptNoAuth()
-        if (deptResponse && deptResponse.data && Array.isArray(deptResponse.data)) {
-          this.departmentOptions = deptResponse.data
+        if (deptResponse) {
+          this.departmentOptions = deptResponse
         }
         
         console.log('选项加载完成:', {
           yearOptions: this.yearOptions.length,
-          departmentOptions: this.departmentOptions.length
+          //departmentOptions: this.departmentOptions.length
         })
       } catch (error) {
         console.error('加载选项失败:', error)
@@ -992,11 +1269,11 @@ export default {
     },
 
     formatCurrency(amount) {
-      if (amount === null || amount === undefined || amount === '') return '0.0000'
+      if (amount === null || amount === undefined || amount === '') return '0.0'
       const num = Number(amount)
       return isFinite(num)
-        ? num.toLocaleString('zh-CN', { minimumFractionDigits: 4, maximumFractionDigits: 4 })
-        : '0.0000'
+        ? num.toLocaleString('zh-CN', { minimumFractionDigits: 1, maximumFractionDigits: 1 })
+        : '0.0'
     },
 
     formatDate(dateStr) {
@@ -1049,38 +1326,724 @@ export default {
     async loadSummaryData() {
       this.summaryLoading = true
       try {
-        const params = {
-          year_id: this.searchFields.year_id,
-          level: 3, // 只获取第三层小包数据
-          cross_table: true // 请求交叉表数据
-        }
+        // 并行获取经济分类和预算数据
+        const [packageResponse, economicResponse] = await Promise.all([
+          getBudgetCollectionPackageList({
+            year_id: this.searchFields.year_id,
+            show_tree: true
+          }),
+          getEconomicClassifications({
+            year_id: this.searchFields.year_id
+          }).catch((error) => {
+            console.error('获取经济分类失败:', error)
+            return { code: 0, data: [] }
+          })
+        ])
         
-        const response = await getBudgetCollectionPackageSummary(params)
+        console.log('获取到的原始预算数据:', packageResponse)
+        console.log('获取到的经济分类响应:', economicResponse)
         
-        if (response) {
-          // response 本身就是处理后的数据，不需要 .data
-          // 设置经济分类列
-          this.economicClassifications = response.economicClassifications || []
+        // 处理经济分类数据
+        let economicData = economicResponse || []
+        
+        this.economicClassifications = economicData.map(item => ({
+          id: item.id,
+          code: item.id.toString(), // 使用ID作为code
+          name: item.name,
+          sort_order: item.sort_order
+        })).sort((a, b) => (a.sort_order || 0) - (b.sort_order || 0)) // 按sort_order排序
+        
+        console.log('处理后的经济分类:', this.economicClassifications)
+        
+        if (packageResponse) {
+          let rawData = packageResponse.data || packageResponse
+          if (!Array.isArray(rawData)) {
+            rawData = []
+          }
+          
+          console.log('处理原始数据:', rawData)
           
-          // 设置交叉表数据
-          this.crossTableData = response.crossTableData || []
+          // 保存原始数据
+          this.rawBudgetData = rawData
           
-          // 计算合计行
-          this.calculateCrossTableSummary()
+          // 转换为预算表格数据格式
+          this.budgetTableData = this.convertToBudgetTableDataNew(rawData)
+          
+          // 转换为扁平化表格数据
+          this.budgetTableFlatData = this.convertToFlatTableDataNew(this.budgetTableData)
+          
+          // 转换为按部门统计的扁平化数据
+          this.budgetTableFlatDataByDept = this.convertToFlatTableDataByDept(rawData)
+          
+          // 转换为按经济分类统计的扁平化数据
+          this.budgetTableFlatDataByEconomic = this.convertToFlatTableDataByEconomic(rawData)
+          
+          // 计算统计数据
+          this.calculateSummaryStatsNew(rawData)
+          
+          console.log('当前统计模式:', this.summaryMode)
+          console.log('统计数据:', this.summaryStats)
         }
       } catch (error) {
-        console.error('加载交叉汇总数据失败:', error)
-        this.$Message.error('加载交叉汇总数据失败')
+        console.error('加载汇总数据失败:', error)
+        this.$Message.error('加载汇总数据失败')
         
         // 设置默认数据结构避免页面报错
+        this.budgetTableData = []
+        this.budgetTableFlatData = []
+        this.budgetTableFlatDataByDept = []
+        this.budgetTableFlatDataByEconomic = []
+        this.summaryStats = {
+          bigPackageCount: 0,
+          mediumPackageCount: 0,
+          totalAllocatedAmount: 0,
+          totalReportedAmount: 0,
+          provincialAllocatedAmount: 0,
+          provincialReportedAmount: 0,
+          ownFundsAndProjectsAllocatedAmount: 0,
+          ownFundsAndProjectsReportedAmount: 0
+        }
         this.economicClassifications = []
-        this.crossTableData = []
-        this.crossTableSummary = null
       } finally {
         this.summaryLoading = false
       }
     },
 
+    // 新的数据转换方法 - 根据新的数据结构
+    convertToBudgetTableDataNew(rawData) {
+      const budgetData = []
+      
+      rawData.forEach(bigPackage => {
+        if (bigPackage.level === 1) {
+          const processedBigPackage = {
+            id: bigPackage.id,
+            name: bigPackage.name,
+            allocated_amount: parseFloat(bigPackage.allocated_amount || 0),
+            children: [],
+            totalAllocated: 0,
+            totalReported: 0
+          }
+          
+          if (bigPackage.children && bigPackage.children.length > 0) {
+            bigPackage.children.forEach(mediumPackage => {
+              if (mediumPackage.level === 2) {
+                const allocatedAmount = parseFloat(mediumPackage.allocated_amount || 0)
+                const reportedAmount = mediumPackage.submission && mediumPackage.submission.status !== "draft" ? parseFloat(mediumPackage.submission.total_amount || 0) : 0
+                
+                // 从submission中提取经济分类数据（确保完全独立）
+                const economicAmounts = {}
+                const economicBasis = {}
+                if (mediumPackage.submission && mediumPackage.submission.economic_items) {
+                  console.log(`处理中包 ${mediumPackage.name} 的经济分类数据:`, mediumPackage.submission.economic_items)
+                  mediumPackage.submission.economic_items.forEach(item => {
+                    const classificationId = String(item.economic_classification_id) // 强制转换为字符串避免引用
+                    const amount = parseFloat(item.amount || 0)
+                    economicAmounts[classificationId] = amount
+                    economicBasis[classificationId] = item.calculation_basis || ''
+                    console.log(`经济分类 ${classificationId} 金额: ${amount}，测算依据: ${item.calculation_basis}`)
+                  })
+                } else {
+                  console.log(`中包 ${mediumPackage.name} 没有submission或economic_items数据`)
+                }
+                
+                const processedMedium = {
+                  id: mediumPackage.id,
+                  name: mediumPackage.name,
+                  allocated_amount: allocatedAmount,
+                  reported_amount: reportedAmount,
+                  decomposed_amount: parseFloat(mediumPackage.decomposed_amount || 0),
+                  submission_status: mediumPackage.submission ? mediumPackage.submission.status : 'no_submission',
+                  economicAmounts: economicAmounts,
+                  economicBasis: economicBasis
+                }
+                
+                processedBigPackage.children.push(processedMedium)
+                processedBigPackage.totalAllocated += allocatedAmount
+                processedBigPackage.totalReported += reportedAmount
+              }
+            })
+          }
+          
+          budgetData.push(processedBigPackage)
+        }
+      })
+      
+      return budgetData
+    },
+
+    // 原有的转换方法（保持兼容性）
+    convertToBudgetTableData(rawData) {
+      return this.convertToBudgetTableDataNew(rawData)
+    },
+
+    // 新的扁平化数据转换方法
+    convertToFlatTableDataNew(budgetData) {
+      const flatData = []
+      
+      budgetData.forEach((bigPackage, bigIndex) => {
+        if (bigPackage.children && bigPackage.children.length > 0) {
+          bigPackage.children.forEach((mediumPackage, mediumIndex) => {
+            flatData.push({
+              bigPackageIndex: bigIndex,
+              mediumPackageIndex: mediumIndex,
+              bigPackageName: bigPackage.name,
+              mediumPackageName: mediumPackage.name,
+              allocated_amount: mediumPackage.allocated_amount,
+              reported_amount: mediumPackage.reported_amount,
+              decomposed_amount: mediumPackage.decomposed_amount,
+              submission_status: mediumPackage.submission_status,
+              totalAllocated: bigPackage.totalAllocated,
+              totalReported: bigPackage.totalReported,
+              economicAmounts: mediumPackage.economicAmounts,
+              economicBasis: mediumPackage.economicBasis,
+              isFirstOfBigPackage: mediumIndex === 0,
+              bigPackageChildrenCount: bigPackage.children.length
+            })
+          })
+        } else {
+          // 如果大包没有子包，也要显示一行
+          flatData.push({
+            bigPackageIndex: bigIndex,
+            mediumPackageIndex: 0,
+            bigPackageName: bigPackage.name,
+            mediumPackageName: '-',
+            allocated_amount: bigPackage.allocated_amount,
+            reported_amount: 0,
+            decomposed_amount: 0,
+            submission_status: 'no_submission',
+            totalAllocated: bigPackage.allocated_amount,
+            totalReported: 0,
+            economicAmounts: {},
+            isFirstOfBigPackage: true,
+            bigPackageChildrenCount: 1
+          })
+        }
+      })
+      
+      return flatData
+    },
+
+    // 原有的扁平化方法（保持兼容性）
+    convertToFlatTableData(budgetData) {
+      return this.convertToFlatTableDataNew(budgetData)
+    },
+
+    // 转换为按部门统计的扁平化数据
+    convertToFlatTableDataByDept(rawData) {
+      const deptData = {}
+      const flatData = []
+      
+      // 首先按部门分组数据
+      rawData.forEach(bigPackage => {
+        if (bigPackage.level === 1 && bigPackage.children && bigPackage.children.length > 0) {
+          bigPackage.children.forEach(mediumPackage => {
+            if (mediumPackage.level === 2) {
+              const deptId = mediumPackage.department_id
+              const deptName = this.getDepartmentName(deptId)
+              
+              if (!deptData[deptId]) {
+                deptData[deptId] = {
+                  departmentId: deptId,
+                  departmentName: deptName,
+                  projects: [],
+                  totalAllocated: 0,
+                  totalReported: 0
+                }
+              }
+              
+              const allocatedAmount = parseFloat(mediumPackage.allocated_amount || 0)
+              const reportedAmount = mediumPackage.submission && mediumPackage.submission.status !== "draft" 
+                ? parseFloat(mediumPackage.submission.total_amount || 0) : 0
+              
+              // 从submission中提取经济分类数据（确保完全独立）
+              const economicAmounts = {}
+              const economicBasis = {}
+              if (mediumPackage.submission && mediumPackage.submission.economic_items) {
+                mediumPackage.submission.economic_items.forEach(item => {
+                  const classificationId = String(item.economic_classification_id) // 强制转换为字符串避免引用
+                  economicAmounts[classificationId] = parseFloat(item.amount || 0)
+                  economicBasis[classificationId] = item.calculation_basis || ''
+                })
+              }
+              
+              deptData[deptId].projects.push({
+                id: mediumPackage.id,
+                bigPackageName: bigPackage.name,
+                mediumPackageName: mediumPackage.name,
+                projectFullName: `${bigPackage.name} - ${mediumPackage.name}`,
+                allocated_amount: allocatedAmount,
+                reported_amount: reportedAmount,
+                submission_status: mediumPackage.submission ? mediumPackage.submission.status : 'no_submission',
+                economicAmounts: economicAmounts,
+                economicBasis: economicBasis
+              })
+              
+              deptData[deptId].totalAllocated += allocatedAmount
+              deptData[deptId].totalReported += reportedAmount
+            }
+          })
+        }
+      })
+      
+      // 转换为扁平化数据
+      Object.values(deptData).forEach((dept, deptIndex) => {
+        dept.projects.forEach((project, projectIndex) => {
+          flatData.push({
+            departmentId: dept.departmentId,
+            departmentName: dept.departmentName,
+            projectFullName: project.projectFullName,
+            bigPackageName: project.bigPackageName,
+            mediumPackageName: project.mediumPackageName,
+            allocated_amount: project.allocated_amount,
+            reported_amount: project.reported_amount,
+            submission_status: project.submission_status,
+            deptTotalAllocated: dept.totalAllocated,
+            deptTotalReported: dept.totalReported,
+            economicAmounts: project.economicAmounts,
+            economicBasis: project.economicBasis,
+            isFirstOfDept: projectIndex === 0,
+            deptProjectCount: dept.projects.length,
+            deptIndex: deptIndex,
+            projectIndex: projectIndex
+          })
+        })
+      })
+      
+      return flatData
+    },
+
+    // 获取部门名称
+    getDepartmentName(departmentId) {
+      console.log('departmentOptions:', this.departmentOptions)
+      const dept = this.departmentOptions.data?.find(d => d.id === departmentId)
+      return dept ? dept.name : '未知部门'
+    },
+
+    // 转换为按经济分类统计的扁平化数据
+    convertToFlatTableDataByEconomic(rawData) {
+      const economicData = {}
+      const flatData = []
+      
+      // 收集所有项目数据，按经济分类分组
+      rawData.forEach(bigPackage => {
+        if (bigPackage.level === 1 && bigPackage.children && bigPackage.children.length > 0) {
+          bigPackage.children.forEach(mediumPackage => {
+            if (mediumPackage.level === 2) {
+              const deptId = mediumPackage.department_id
+              const deptName = this.getDepartmentName(deptId)
+              
+              // 处理每个项目的经济分类数据
+              if (mediumPackage.submission && mediumPackage.submission.economic_items && mediumPackage.submission.economic_items.length > 0) {
+                mediumPackage.submission.economic_items.forEach(economicItem => {
+                  const economicId = economicItem.economic_classification_id
+                  const amount = parseFloat(economicItem.amount || 0)
+                  
+                  // 确保经济分类存在（防御性编程）
+                  if (!economicData[economicId]) {
+                    const economicName = this.getEconomicClassName(economicId)
+                    economicData[economicId] = {
+                      economicId: economicId,
+                      economicName: economicName,
+                      departments: {},
+                      totalAmount: 0,
+                      sortOrder: 999
+                    }
+                  }
+                  
+                  // 初始化部门
+                  if (!economicData[economicId].departments[deptId]) {
+                    economicData[economicId].departments[deptId] = {
+                      departmentId: deptId,
+                      departmentName: deptName,
+                      projects: [],
+                      deptTotal: 0
+                    }
+                  }
+                  
+                  // 添加项目数据
+                  economicData[economicId].departments[deptId].projects.push({
+                    id: mediumPackage.id,
+                    bigPackageName: bigPackage.name || '未知大包',
+                    mediumPackageName: mediumPackage.name || '未知项目',
+                    projectFullName: `${bigPackage.name}` + '-' + (mediumPackage.name || '未知项目'), // 只显示中包名称
+                    economicAmount: amount,
+                    calculationBasis: economicItem.calculation_basis || '',
+                    submission_status: mediumPackage.submission ? mediumPackage.submission.status : 'draft'
+                  })
+                  
+                  // 累计金额
+                  economicData[economicId].departments[deptId].deptTotal += amount
+                  economicData[economicId].totalAmount += amount
+                })
+                console.log('--------------------------------经济分类数据:', economicData)
+              }
+            }
+          })
+        }
+      })
+      
+      // 转换为扁平化表格数据（按HTML表格的合并逻辑）
+      // 按照经济分类的sort_order排序
+      const sortedEconomicGroups = Object.values(economicData).sort((a, b) => a.sortOrder - b.sortOrder)
+      
+      sortedEconomicGroups.forEach((economicGroup) => {
+        const departments = Object.values(economicGroup.departments)
+        
+        // 如果该经济分类没有任何项目数据，添加一个空行显示
+        if (departments.length === 0) {
+          flatData.push({
+            economicClassName: economicGroup.economicName,
+            departmentName: '-',
+            projectName: '-', 
+            projectAmount: 0, 
+            deptTotal: 0, 
+            economicTotal: 0,
+            
+            // 用于表格合并的标记
+            isFirstEconomic: true,
+            isFirstDept: true,
+            economicRowSpan: 1,
+            deptRowSpan: 1,
+            
+            // 其他信息
+            economicId: economicGroup.economicId,
+            departmentId: null,
+            submission_status: 'no_data'
+          })
+          return
+        }
+        
+        // 计算该经济分类需要合并的总行数（所有部门的所有项目）
+        let economicTotalRows = 0
+        departments.forEach(dept => {
+          economicTotalRows += dept.projects.length
+        })
+        
+        // 按HTML示例逻辑：经济分类合并所有行，部门合并自己的行
+        let economicRowIndex = 0 // 用于跟踪当前是该经济分类的第几行
+        
+        departments.forEach((dept) => {
+          const deptTotalRows = dept.projects.length
+          
+          dept.projects.forEach((project, projectIndex) => {
+            const isFirstEconomicRow = economicRowIndex === 0 // 只有第一行显示经济分类
+            const isFirstDeptRow = projectIndex === 0 // 只有每个部门的第一行显示部门名
+            
+            flatData.push({
+              economicClassName: economicGroup.economicName,
+              departmentName: dept.departmentName,
+              projectName: project.projectFullName, // 项目名称（中包）
+              projectAmount: project.economicAmount, // 金额
+              calculationBasis: project.calculationBasis, // 测算依据
+              deptTotal: dept.deptTotal, // 按科室汇总
+              economicTotal: economicGroup.totalAmount, // 按经济分类汇总
+              
+              // 用于表格合并的标记（参照HTML示例）
+              isFirstEconomic: isFirstEconomicRow,
+              isFirstDept: isFirstDeptRow,
+              economicRowSpan: isFirstEconomicRow ? economicTotalRows : 0, // 经济分类合并所有行
+              deptRowSpan: isFirstDeptRow ? deptTotalRows : 0, // 部门合并该部门的所有项目行
+              
+              // 其他信息
+              economicId: economicGroup.economicId,
+              departmentId: dept.departmentId,
+              submission_status: project.submission_status
+            })
+            
+            economicRowIndex++ // 递增该经济分类下的总行索引
+          })
+        })
+      })
+      
+      console.log('按HTML格式重构的经济分类统计数据:', flatData)
+      return flatData
+    },
+
+    // 获取经济分类名称
+    getEconomicClassName(economicId) {
+      const economic = this.economicClassifications.find(e => e.id === economicId)
+      return economic ? economic.name : '未知分类'
+    },
+
+    // 获取经济分类下的项目总数
+    getEconomicProjectCount(economicGroup) {
+      let count = 0
+      Object.values(economicGroup.departments).forEach(dept => {
+        count += dept.projects.length
+      })
+      return count
+    },
+
+    // 表格合并方法
+    mergeMethod({ row, column, rowIndex, columnIndex }) {
+      // 大包列合并
+      if (columnIndex === 0) {
+        if (row.isFirstOfBigPackage) {
+          return {
+            rowspan: row.bigPackageChildrenCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 按大包累计分配金额列合并
+      if (columnIndex === 4) {
+        if (row.isFirstOfBigPackage) {
+          return {
+            rowspan: row.bigPackageChildrenCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 按大包累计上报金额列合并
+      if (columnIndex === 5) {
+        if (row.isFirstOfBigPackage) {
+          return {
+            rowspan: row.bigPackageChildrenCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+
+    // 按部门统计的表格合并方法
+    mergeMethodByDept({ row, column, rowIndex, columnIndex }) {
+      // 部门列合并
+      if (columnIndex === 0) {
+        if (row.isFirstOfDept) {
+          return {
+            rowspan: row.deptProjectCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 按部门累计分配金额列合并
+      if (columnIndex === 4) {
+        if (row.isFirstOfDept) {
+          return {
+            rowspan: row.deptProjectCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 按部门累计上报金额列合并
+      if (columnIndex === 5) {
+        if (row.isFirstOfDept) {
+          return {
+            rowspan: row.deptProjectCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+
+    // 按经济分类统计的表格合并方法
+    mergeMethodByEconomic({ row, column, rowIndex, columnIndex }) {
+      // 第0列：经济分类列 - 按HTML示例：物业费合并整个经济分类的所有行
+      if (columnIndex === 0) {
+        if (row.isFirstEconomic && row.economicRowSpan > 0) {
+          return {
+            rowspan: row.economicRowSpan,
+            colspan: 1
+          }
+        } else if (!row.isFirstEconomic) {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 第1列：科室列 - 按HTML示例：综合科合并22行，财审科合并22行
+      if (columnIndex === 1) {
+        if (row.isFirstDept && row.deptRowSpan > 0) {
+          return {
+            rowspan: row.deptRowSpan,
+            colspan: 1
+          }
+        } else if (!row.isFirstDept) {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 第2列：项目(中包)列 - 不合并，每行显示一个项目
+      // 第3列：金额列 - 不合并，每行显示一个金额
+      
+      // 第4列：按科室汇总列 - 按HTML示例：综合科显示3，财审科显示7
+      if (columnIndex === 4) {
+        if (row.isFirstDept && row.deptRowSpan > 0) {
+          return {
+            rowspan: row.deptRowSpan,
+            colspan: 1
+          }
+        } else if (!row.isFirstDept) {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 第5列：按经济分类汇总列 - 按HTML示例：物业费显示10
+      if (columnIndex === 5) {
+        if (row.isFirstEconomic && row.economicRowSpan > 0) {
+          return {
+            rowspan: row.economicRowSpan,
+            colspan: 1
+          }
+        } else if (!row.isFirstEconomic) {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      
+      // 默认不合并
+      return {
+        rowspan: 1,
+        colspan: 1
+      }
+    },
+
+    // 新的统计数据计算方法
+    calculateSummaryStatsNew(rawData) {
+      let bigPackageCount = 0
+      let mediumPackageCount = 0
+      let totalAllocatedAmount = 0
+      let totalReportedAmount = 0
+      let provincialAllocatedAmount = 0
+      let provincialReportedAmount = 0
+      let ownFundsAndProjectsAllocatedAmount = 0
+      let ownFundsAndProjectsReportedAmount = 0
+      
+      rawData.forEach(bigPackage => {
+        if (bigPackage.level === 1) {
+          bigPackageCount++
+          
+          // 判断大包是否属于自有资金与课题
+          const isOwnFundsOrProjects = bigPackage.name && (
+            bigPackage.name.includes('自有资金') || 
+            bigPackage.name.includes('课题')
+          )
+          
+          if (bigPackage.children && bigPackage.children.length > 0) {
+            bigPackage.children.forEach(mediumPackage => {
+              if (mediumPackage.level === 2) {
+                const allocatedAmount = parseFloat(mediumPackage.allocated_amount || 0)
+                let reportedAmount = 0
+                
+                totalAllocatedAmount += allocatedAmount
+                mediumPackageCount++
+                
+                // 从submission获取真实上报金额
+                if (mediumPackage.submission && mediumPackage.submission.status !== "draft") {
+                  reportedAmount = parseFloat(mediumPackage.submission.total_amount || 0)
+                  totalReportedAmount += reportedAmount
+                }
+                
+                // 按资金来源分类统计
+                if (isOwnFundsOrProjects) {
+                  ownFundsAndProjectsAllocatedAmount += allocatedAmount
+                  ownFundsAndProjectsReportedAmount += reportedAmount
+                } else {
+                  provincialAllocatedAmount += allocatedAmount
+                  provincialReportedAmount += reportedAmount
+                }
+              }
+            })
+          }
+        }
+      })
+      
+      this.summaryStats = {
+        bigPackageCount,
+        mediumPackageCount,
+        totalAllocatedAmount,
+        totalReportedAmount,
+        provincialAllocatedAmount,
+        provincialReportedAmount,
+        ownFundsAndProjectsAllocatedAmount,
+        ownFundsAndProjectsReportedAmount
+      }
+    },
+
+    // 原有的统计方法（保持兼容性）
+    calculateSummaryStats(rawData) {
+      return this.calculateSummaryStatsNew(rawData)
+    },
+
+    // 重新处理当前模式的数据
+    reprocessCurrentModeData() {
+      if (!this.rawBudgetData || this.rawBudgetData.length === 0) {
+        console.log('原始数据不可用')
+        return
+      }
+      
+      console.log('重新处理', this.summaryMode, '模式数据')
+      
+      try {
+        if (this.summaryMode === 'package') {
+          this.budgetTableData = this.convertToBudgetTableDataNew(this.rawBudgetData)
+          this.budgetTableFlatData = this.convertToFlatTableDataNew(this.budgetTableData)
+          console.log('重新处理按大包统计完成:', this.budgetTableFlatData?.length)
+        } else if (this.summaryMode === 'department') {
+          this.budgetTableFlatDataByDept = this.convertToFlatTableDataByDept(this.rawBudgetData)
+          console.log('重新处理按部门统计完成:', this.budgetTableFlatDataByDept?.length)
+        } else if (this.summaryMode === 'economic') {
+          this.budgetTableFlatDataByEconomic = this.convertToFlatTableDataByEconomic(this.rawBudgetData)
+          console.log('重新处理按经济分类统计完成:', this.budgetTableFlatDataByEconomic?.length)
+        }
+      } catch (error) {
+        console.error('重新处理数据出错:', error)
+      }
+    },
+
+    // 格式化金额显示
+    formatAmount(amount) {
+      if (amount === null || amount === undefined || amount === '') return '0'
+      const num = Number(amount)
+      return isFinite(num) 
+        ? num.toLocaleString('zh-CN', { maximumFractionDigits: 1 })
+        : '0.0'
+    },
+
     // 计算交叉表合计
     calculateCrossTableSummary() {
       if (!this.crossTableData.length || !this.economicClassifications.length) {
@@ -1148,51 +2111,113 @@ export default {
       return typeMap[level] || 'info'
     },
 
-    // 导出交叉表
-    exportCrossTable() {
-      if (!this.crossTableData.length) {
-        this.$Message.warning('暂无数据可导出')
-        return
-      }
-      
+    // 导出预算分配表
+    exportBudgetTable() {
       try {
-        // 构建CSV数据
-        const headers = ['小包名称']
-        this.economicClassifications.forEach(cls => {
-          headers.push(cls.name)
-        })
-        headers.push('合计')
-        
-        let csvContent = headers.join(',') + '\n'
+        let headers = []
+        let data = []
+        let fileName = ''
         
-        // 添加数据行
-        this.crossTableData.forEach(row => {
-          const rowData = [row.packageName]
+        if (this.summaryMode === 'package') {
+          // 按大包统计模式
+          if (!this.budgetTableFlatData.length) {
+            this.$Message.warning('暂无数据可导出')
+            return
+          }
+          
+          headers = ['大包', '项目(中包)', '分配金额', '上报金额', '按大包累计分配金额', '按大包累计上报金额']
           this.economicClassifications.forEach(cls => {
-            const value = row['amount_' + cls.code] || 0
-            rowData.push(value > 0 ? value : '')
+            headers.push(cls.name)
           })
-          rowData.push(row.totalAmount || 0)
-          csvContent += rowData.join(',') + '\n'
-        })
-        
-        // 添加合计行
-        if (this.crossTableSummary) {
-          const summaryRow = [`合计（${this.crossTableData.length}个小包）`]
+          
+          data = this.budgetTableFlatData.map(row => {
+            const rowData = [
+              row.isFirstOfBigPackage ? row.bigPackageName : '',
+              row.mediumPackageName === '-' ? '(无子包)' : row.mediumPackageName,
+              this.formatAmount(row.allocated_amount),
+              row.reported_amount > 0 ? this.formatAmount(row.reported_amount) : (row.submission_status === 'no_submission' ? '未申报' : '0'),
+              row.isFirstOfBigPackage ? this.formatAmount(row.totalAllocated) : '',
+              row.isFirstOfBigPackage ? this.formatAmount(row.totalReported) : ''
+            ]
+            
+            // 添加经济分类金额
+            this.economicClassifications.forEach(cls => {
+              const amount = row.economicAmounts && row.economicAmounts[cls.code]
+              rowData.push(amount && amount > 0 ? this.formatAmount(amount) : '-')
+            })
+            
+            return rowData
+          })
+          
+          fileName = '预算分配汇总表_按大包统计'
+          
+        } else if (this.summaryMode === 'department') {
+          // 按部门统计模式
+          if (!this.budgetTableFlatDataByDept.length) {
+            this.$Message.warning('暂无数据可导出')
+            return
+          }
+          
+          headers = ['部门', '项目', '分配金额', '上报金额', '按部门累计分配金额', '按部门累计上报金额']
           this.economicClassifications.forEach(cls => {
-            summaryRow.push(this.crossTableSummary['amount_' + cls.code] || 0)
+            headers.push(cls.name)
           })
-          summaryRow.push(this.crossTableSummary.totalAmount || 0)
-          csvContent += summaryRow.join(',') + '\n'
+          
+          data = this.budgetTableFlatDataByDept.map(row => {
+            const rowData = [
+              row.isFirstOfDept ? (row.departmentName || '') : '',
+              row.projectFullName || '',
+              this.formatAmount(row.allocated_amount),
+              row.reported_amount > 0 ? this.formatAmount(row.reported_amount) : (row.submission_status === 'no_submission' ? '未申报' : '0'),
+              row.isFirstOfDept ? this.formatAmount(row.deptTotalAllocated) : '',
+              row.isFirstOfDept ? this.formatAmount(row.deptTotalReported) : ''
+            ]
+            
+            // 添加经济分类金额
+            this.economicClassifications.forEach(cls => {
+              const amount = row.economicAmounts && row.economicAmounts[cls.code]
+              rowData.push(amount && amount > 0 ? this.formatAmount(amount) : '-')
+            })
+            
+            return rowData
+          })
+          
+          fileName = '预算分配汇总表_按部门统计'
+          
+        } else if (this.summaryMode === 'economic') {
+          // 按经济分类统计模式
+          if (!this.budgetTableFlatDataByEconomic.length) {
+            this.$Message.warning('暂无数据可导出')
+            return
+          }
+          
+          headers = ['经济分类', '科室', '项目 (中包)', '金额', '按科室汇总', '按经济分类汇总']
+          
+          data = this.budgetTableFlatDataByEconomic.map(row => [
+            row.isFirstEconomic ? (row.economicClassName || '') : '',
+            row.isFirstDept ? (row.departmentName || '') : '',
+            row.projectName || '',
+            this.formatAmount(row.projectAmount),
+            row.isFirstDept ? this.formatAmount(row.deptTotal) : '',
+            row.isFirstEconomic ? this.formatAmount(row.economicTotal) : ''
+          ])
+          
+          fileName = '预算分配汇总表_按经济分类统计'
         }
         
+        // 构建CSV内容
+        let csvContent = headers.join(',') + '\n'
+        data.forEach(row => {
+          csvContent += row.join(',') + '\n'
+        })
+        
         // 下载文件
         const blob = new Blob(['\ufeff' + csvContent], { type: 'text/csv;charset=utf-8;' })
         const link = document.createElement('a')
         if (link.download !== undefined) {
           const url = URL.createObjectURL(blob)
           link.setAttribute('href', url)
-          link.setAttribute('download', `小包与经济分类交叉表_${new Date().toISOString().slice(0, 10)}.csv`)
+          link.setAttribute('download', `${fileName}_${new Date().toISOString().slice(0, 10)}.csv`)
           link.style.visibility = 'hidden'
           document.body.appendChild(link)
           link.click()
@@ -1347,7 +2372,215 @@ export default {
 
 /* 汇总视图样式 */
 .summary-container {
-  min-height: 400px;
+  padding: 20px 0;
+}
+
+.stats-row {
+  margin-bottom: 30px;
+}
+
+/* 模式切换样式 */
+.mode-switch-wrapper {
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.mode-switch-wrapper >>> .el-radio-group {
+  background: #f8f9fa;
+  border-radius: 8px;
+  padding: 4px;
+  display: inline-block;
+}
+
+.mode-switch-wrapper >>> .el-radio-button__inner {
+  border: none;
+  background: transparent;
+  color: #606266;
+  font-weight: 500;
+  transition: all 0.3s ease;
+  padding: 12px 24px;
+  border-radius: 6px;
+}
+
+.mode-switch-wrapper >>> .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+  background: #409EFF;
+  color: white;
+  box-shadow: 0 2px 8px rgba(64, 158, 255, 0.3);
+}
+
+.mode-switch-wrapper >>> .el-radio-button:hover .el-radio-button__inner {
+  color: #409EFF;
+}
+
+/* 统计卡片样式 */
+.stat-card {
+  height: 120px;
+  border: none;
+  border-radius: 12px;
+  box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.08);
+  transition: all 0.3s ease;
+  overflow: hidden;
+  position: relative;
+}
+
+.stat-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 8px 30px 0 rgba(0, 0, 0, 0.12);
+}
+
+.stat-card-primary {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+}
+
+.stat-card-success {
+  background: linear-gradient(135deg, #42d392 0%, #647eff 100%);
+}
+
+.stat-card-warning {
+  background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);
+}
+
+.stat-card-info {
+  background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
+}
+.stat-card-gradient-1 {
+  background: linear-gradient(135deg, #ff9a8b 0%, #fecfef 100%);
+}
+.stat-card-gradient-2 {
+  background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%);
+}
+.stat-card-gradient-3 {
+  background: linear-gradient(135deg, #ffecd2 0%, #fcb69f 100%);
+}
+.stat-card-gradient-4 {
+  background: linear-gradient(135deg, #a8c0ff 0%, #3f2b96 100%);
+}
+
+
+.stat-card >>> .el-card__body {
+  padding: 0;
+  height: 100%;
+  background: transparent;
+}
+
+.stat-content {
+  display: flex;
+  align-items: center;
+  height: 100%;
+  padding: 20px;
+  color: white;
+}
+
+.stat-icon {
+  width: 60px;
+  height: 60px;
+  border-radius: 50%;
+  background: rgba(255, 255, 255, 0.2);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16px;
+  flex-shrink: 0;
+}
+
+.stat-icon i {
+  font-size: 28px;
+  color: white;
+}
+
+.stat-info {
+  flex: 1;
+}
+
+.stat-info h3 {
+  margin: 0 0 6px 0;
+  font-size: 28px;
+  font-weight: 700;
+  color: white;
+  line-height: 1.2;
+}
+
+.stat-info p {
+  margin: 0;
+  font-size: 14px;
+  color: rgba(255, 255, 255, 0.9);
+  font-weight: 500;
+}
+
+/* 表格样式优化 */
+.table-wrapper {
+  margin-top: 20px;
+}
+
+.table-wrapper >>> .el-table {
+  font-size: 14px;
+  color: #303133;
+}
+
+.table-wrapper >>> .el-table th {
+  background-color: #f8f9fa;
+  color: #606266;
+  font-weight: 600;
+  font-size: 14px;
+  padding: 16px 0;
+  white-space: nowrap;
+  border-bottom: 2px solid #e4e7ed;
+}
+
+.table-wrapper >>> .el-table td {
+  padding: 14px 0;
+  font-size: 14px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.table-wrapper >>> .el-table--border td,
+.table-wrapper >>> .el-table--border th {
+  border-right: 1px solid #ebeef5;
+}
+
+.table-wrapper >>> .el-table--striped .el-table__body tr.el-table__row--striped td {
+  background: #fafafa;
+}
+
+.table-wrapper >>> .el-table__body tr:hover > td {
+  background-color: #f5f7fa !important;
+}
+
+/* 单元格内容样式 */
+.package-name-text {
+  color: #303133;
+  font-weight: 600;
+  font-size: 14px;
+}
+
+.project-name-text {
+  color: #303133;
+  font-weight: 500;
+  font-size: 14px;
+}
+
+.amount-text {
+  color: #409EFF;
+  font-weight: 600;
+  font-size: 14px;
+}
+
+.total-amount-text {
+  color: #E6A23C;
+  font-weight: 700;
+  font-size: 14px;
+}
+
+.economic-amount-text {
+  color: #67C23A;
+  font-weight: 600;
+  font-size: 14px;
+}
+
+.no-submission-text {
+  color: #909399;
+  font-weight: 500;
+  font-size: 13px;
 }
 
 .cross-table-wrapper {
@@ -1423,6 +2656,21 @@ export default {
   text-overflow: ellipsis !important;
 }
 
+/* 经济分类统计表格的单元格不换行 */
+.cross-table >>> .table-cell-package .cell,
+.cross-table >>> .table-cell-project .cell,
+.cross-table >>> .table-cell-amount .cell,
+.cross-table >>> .table-cell-total .cell {
+  white-space: nowrap !important;
+  overflow: hidden !important;
+  text-overflow: ellipsis !important;
+}
+
+/* 项目名称列允许更宽显示，防止省略 */
+.cross-table >>> .table-cell-project .cell {
+  max-width: none !important;
+}
+
 /* 主表格预算包名称列样式 */
 .main-package-name-wrapper {
   white-space: nowrap !important;
@@ -1536,4 +2784,14 @@ export default {
   text-overflow: ellipsis !important;
 }
 
+</style>
+
+<style>
+/* 全局样式 - 经济分类tooltip宽度限制 */
+.el-tooltip__popper.economic-tooltip {
+  max-width: 80vw !important;
+  word-wrap: break-word;
+  word-break: break-all;
+  white-space: normal;
+}
 </style>
\ No newline at end of file