From 42afc864d21bcadcf1a3c1d40f6b877d2613b47f Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 13 Oct 2025 14:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotifyConfirm.vue | 38 +++++++++--
 .../ecss/components/PackingDetailTab.vue      | 66 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 5a19bf8..0943add 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -113,8 +113,8 @@
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"   type="border-card" @tab-click="tabClick" >
       <el-tab-pane :label="currentRow.cmcInvoice+'明细'" name="detail">
         <el-table
-          :height="height"
-          :data="dataList2"
+          :height="height" ref="cloDetailTable"
+          :data="dataList2" show-summary :summary-method="getDetailSummaries"
           border :cell-style="cellStyleDetail"
           style="width: 100%;">
           <el-table-column
@@ -1864,7 +1864,7 @@
       // 获取PN数据缺失的具体字段提示信息
       getPnIncompleteTooltip(row) {
         const missingFields = [];
-        
+
         // 检查每个字段是否缺失
         if (!(row.rollqty !== null && row.rollqty !== undefined && row.rollqty !== '')) {
           missingFields.push('每卷数量');
@@ -2670,7 +2670,37 @@
         this.$nextTick(() => this.$refs.detailTable.doLayout());// 强制刷新布局,  否则会被表格覆盖
         return sums;
       },
-
+      getDetailSummaries(param) {
+        const { columns } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          let sumDataList = this.dataList2.filter(item => item.qty>0);
+          const values = sumDataList.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            switch(column.property) {
+              case 'qty':
+                sums[index] = `${values.reduce((a, b) => a + b, 0)}`;
+                break;
+              case 'ttlAmount':
+                sums[index] = `${values.reduce((a, b) => a + b, 0).toFixed(2)}`;
+                break;
+              case 'sumPrice':
+                sums[index] = `${values.reduce((a, b) => a + b, 0).toFixed(2)}`;
+                break;
+              default:
+                sums[index] = '';
+            }
+          } else {
+            sums[index] = '';
+          }
+        });
+        this.$nextTick(() => this.$refs.cloDetailTable.doLayout());// 强制刷新布局,  否则会被表格覆盖
+        return sums;
+      },
       /**
        * 保存选中行到本地存储
        * 使用页面路径和用户名作为存储键的一部分，确保不同页面和用户的选择互不影响
diff --git a/src/views/modules/ecss/components/PackingDetailTab.vue b/src/views/modules/ecss/components/PackingDetailTab.vue
index 239f5c0..cba24bf 100644
--- a/src/views/modules/ecss/components/PackingDetailTab.vue
+++ b/src/views/modules/ecss/components/PackingDetailTab.vue
@@ -2,13 +2,15 @@
   <div class="packing-detail-tab">
     <el-table
       :data="dataListBoxes"
-      :max-height="height * 1.5"
+      :height="height"
       border
       v-loading="dataListLoading"
       style="width: 100%;"
       :expand-row-keys="expandedBoxRows"
       :row-key="getBoxRowKey"
-      @expand-change="handleBoxExpand">
+      @expand-change="handleBoxExpand"
+      show-summary
+      :summary-method="getSummaries">
       <el-table-column type="expand">
         <template slot-scope="props">
           <!-- 加载状态 -->
@@ -724,6 +726,66 @@ export default {
           }
         })
       });
+    },
+
+    // 计算合计行数据
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          // 第一列（展开列）显示"合计"
+          sums[index] = '合计';
+          return;
+        }
+
+        const values = data.map(item => Number(item[column.property]));
+
+        // 根据列属性计算合计
+        if (column.property === 'box_qty') {
+          // 箱数合计
+          const sum = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + value;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sum;
+        } else if (column.property === 'grossWeight') {
+          // 毛重合计
+          const sum = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + value;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sum.toFixed(3);
+        } else if (column.property === 'netWeight') {
+          // 净重合计
+          const sum = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + value;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sum.toFixed(3);
+        } else if (column.property === 'item_no') {
+          // 序号列显示空
+          sums[index] = '';
+        } else {
+          // 其他列显示空
+          sums[index] = '';
+        }
+      });
+
+      return sums;
     }
   }
 }