From 0a68f0b2ba1a4e73fe63a1c53cf4493089929ae2 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Mon, 15 Jul 2024 11:02:50 +0800
Subject: [PATCH] fix:合并小计单元格

---
 frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue | 53 ++++++++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue b/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue
index 10b2f92..d9b913b 100644
--- a/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue
+++ b/frontend/front/src/views/pages/reviewOfFinancialDailyReport/index.vue
@@ -16,19 +16,23 @@
                     style="width: 100%; margin-top: 20px">
                     <!-- <el-table-column type="selection" width="55"></el-table-column> -->
                     <el-table-column prop="wdailyfundsforgtype" align="center" label="公司类型"></el-table-column>
-                    <el-table-column prop="wdailyfundsfdate" align="center" sortable label="日期"></el-table-column>
+                    <el-table-column prop="wdailyfundsfdate" align="center" sortable label="日期">
+                    </el-table-column>
                     <el-table-column prop="wdailyfundsforgname" align="center" label="公司"> </el-table-column>
                     <el-table-column prop="wdailyfundsfyesterdayaccountbalance" align="center" label="昨日余额">
                     </el-table-column>
-                    <el-table-column prop="wdailyfundsftodayaccountbalance" align="center" label="今日余额"> </el-table-column>
+                    <el-table-column prop="wdailyfundsftodayaccountbalance" align="center" label="今日余额">
+                    </el-table-column>
                     <el-table-column prop="wdailyfundsfaccountbalancedifference" align="center" label="差额(今日-昨日)">
                     </el-table-column>
                     <el-table-column prop="wdailyfundsftodaynetcashflow" align="center" label="净现金流"> </el-table-column>
                     <el-table-column prop="wdailyfundsftodayfreezing" align="center" label="冻结金额"> </el-table-column>
-                    <el-table-column prop="wdailyfundsftodayfreezeamount" align="center" label="冻结金额上限"> </el-table-column>
+                    <el-table-column prop="wdailyfundsftodayfreezeamount" align="center" label="冻结金额上限">
+                    </el-table-column>
                     <el-table-column prop="wdailyfundsfinspstatusname" align="center" label="复核"> </el-table-column>
                     <el-table-column prop="" align="center" label="复核人"> </el-table-column>
                     <el-table-column prop="" align="center" label="填报人"> </el-table-column>
+                    <el-table-column prop="remake" label="备注"> </el-table-column>
                 </el-table>
             </el-main>
             <el-footer>
@@ -39,7 +43,6 @@
                 </div>
             </el-footer>
         </el-container>
-        <!-- <el-table-column prop="amount3" label="备注"> </el-table-column> -->
         <!-- <div slot="append" style="display:flex;">
                         <div class="sum_footer">
                             <div class="sum_footer_unit center" style="width:160px;">
@@ -153,34 +156,6 @@ export default {
         },
         getSummaries(param) {
             const { columns, data } = param;
-            console.log('data', JSON.parse(JSON.stringify(data)));
-            const sums = [];
-            columns.forEach((column, index) => {
-                if (index === 0) {
-                    sums[index] = '汇总';
-                    return;
-                }
-                const values = data.map(item => Number(item[column.property]));
-                if (!values.every(value => isNaN(value))) {
-                    sums[index] = values.reduce((prev, curr) => {
-                        const value = Number(curr);
-                        if (!isNaN(value)) {
-                            return prev + curr;
-                        } else {
-                            return prev;
-                        }
-                    }, 0);
-                    sums[index] += ' .00';
-                } else {
-                    sums[index] = 'N/A';
-                }
-            });
-            // 可直接调接口获取后修改sums。
-            // console.log("合计列",sums);
-            return sums;
-        },
-        getSummaries(param) {
-            const { columns, data } = param;
             const sums = [];
             columns.forEach((column, index) => {
                 if (index === 0) {
@@ -209,15 +184,16 @@ export default {
             return sums;
         },
         spanMethod({ row, column, rowIndex, columnIndex }) {
-            // console.log('row',JSON.parse(JSON.stringify(row)));
-            // console.log('column',JSON.parse(JSON.stringify(column)));
+            // console.log('row', JSON.parse(JSON.stringify(row)));
+            // console.log('column', JSON.parse(JSON.stringify(column)));
+            // console.log(rowIndex, columnIndex);
             if (columnIndex === 0) {
                 // 第一列合并单元格
                 if (row.wdailyfundsforderno === 'subtotal') {
                     // 小计行
                     return {
                         rowspan: 1,
-                        colspan: 1,
+                        colspan: 3,
                         content: '小计'
                     };
                 } else if (rowIndex > 0 && row.wdailyfundsforgtype === this.tableData[rowIndex - 1].wdailyfundsforgtype) {
@@ -241,6 +217,13 @@ export default {
                         content: row.wdailyfundsforgtype
                     };
                 }
+            } else if (columnIndex === 1 || columnIndex === 2) {
+                if (row.wdailyfundsforderno === 'subtotal' && (!row.wdailyfundsfdate || !wdailyfundsforgname)) {
+                    return {
+                        rowspan: 0,
+                        colspan: 0
+                    }
+                }
             }
 
         },
--
libgit2 0.21.2