From 0e9ceca9526afaa0cc9ac39ee1c8b98669f01543 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 19 Jan 2024 13:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=80=BB?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XyTable/index.vue |  1 +
 src/views/dashboard/index.vue    | 39 ++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 7595b30..5ae6447 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -203,6 +203,7 @@ export default {
                       if(item1.customFn){
                         return (
                           <el-table-column
+                            prop={`${item.Fprop?item.Fprop+'.' : ''}${item1.prop}`}
                             align={item1.align ?? 'center'}
                             header-align={item1.headerAlign ?? 'center'}
                             label={item1.label}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 3ed0339..f35074d 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -689,6 +689,7 @@ export default {
             {
               label: "货物",
               width: 100,
+              prop: "huowu",
               sortable: false,
               customFn: (row) => {
                 return (
@@ -747,6 +748,7 @@ export default {
               },
             },
             {
+              prop: "fuwu",
               label: "服务",
               width: 100,
               sortable: false,
@@ -808,6 +810,7 @@ export default {
               },
             },
             {
+              prop: "gongchen",
               label: "工程",
               width: 100,
               sortable: false,
@@ -874,6 +877,7 @@ export default {
           Fprop: "small",
           multiHd: [
             {
+              prop: "huowu",
               label: "货物",
               width: 100,
               sortable: false,
@@ -935,6 +939,7 @@ export default {
               },
             },
             {
+              prop: "fuwu",
               label: "服务",
               width: 100,
               sortable: false,
@@ -996,6 +1001,7 @@ export default {
               },
             },
             {
+              prop: "gongchen",
               label: "工程",
               width: 100,
               sortable: false,
@@ -1356,13 +1362,42 @@ export default {
         data
       } = param
       const sums = []
-      columns.map((column, index) => {
+      console.log(columns)
+      columns.forEach((column, index) => {
         if (index === 1) {
           sums[index] = '总计'
           return
         }
+        if (column.property === 'government.huowu') {
+          sums[index] = data.reduce((pre,cur) => (pre + (cur.government?.huowu?.length || 0)),0)
+          return
+        }
+        if (column.property === 'small.huowu') {
+          sums[index] = data.reduce((pre,cur) => (pre + (cur.small?.huowu?.length || 0)),0)
+          return
+        }
+        if (column.property === 'government.fuwu') {
+          sums[index] = data.reduce((pre,cur) => (pre + (cur.government?.fuwu?.length || 0)),0)
+          return
+        }
+        if (column.property === 'small.fuwu') {
+          sums[index] = data.reduce((pre,cur) => (pre + (cur.small?.fuwu?.length || 0)),0)
+          return
+        }
+        if (column.property === 'government.gongchen') {
+          sums[index] = data.reduce((pre,cur) => (pre + (cur.government?.gongchen?.length || 0)),0)
+          return
+        }
+        if (column.property === 'small.gongchen') {
+          sums[index] = data.reduce((pre,cur) => (pre + (cur.small?.gongchen?.length || 0)),0)
+          return
+        }
+        if (column.property === 'month_total') {
+          sums[index] = data.reduce((pre,cur) => (pre + cur.month_total.length),0)
+          return
+        }
         if (column.property === 'year_total') {
-          sums[index] = 0
+          sums[index] = data.reduce((pre,cur) => (pre + cur.year_total.length),0)
           return
         }
         if (column.property === 'plan_price') {