From d1ea3cf35cff29b661526bc40187e91bfa6b7c90 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 23 Dec 2025 11:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=83=E5=B0=94=E7=8E=9B=E8=A3=85=E7=AE=B1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecss/ecss.js                          |   2 +
 src/utils/export-options.js                   |  30 +-
 src/views/modules/ecss/codelnotifyConfirm.vue |  24 +-
 .../ecss/components/PackingDetailTab.vue      | 964 ++++++++++++------
 .../modules/ecss/pallet_upload_excel.vue      |   2 +-
 5 files changed, 676 insertions(+), 346 deletions(-)

diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js
index f66e27f..b58b299 100644
--- a/src/api/ecss/ecss.js
+++ b/src/api/ecss/ecss.js
@@ -110,6 +110,8 @@ export const updateDetailInfo = data => createAPI(`/ecss/coDel/updateDetailInfo`
 export const deleteDetailInfo = data => createAPI(`/ecss/coDel/deleteDetailInfo`,'post',data)
 // 批量修改装箱明细
 export const batchUpdatePackingInfo = data => createAPI(`/ecss/coDel/batchUpdatePackingInfo`,'post',data)
+// 批量删除箱
+export const batchDeleteBoxes = data => createAPI(`/ecss/coDel/batchDeleteBoxes`,'post',data)
 // 调整总毛重
 export const adjustTotalGrossWeight = data => createAPI(`/ecss/coDel/adjustTotalGrossWeight`,'post',data)
 
diff --git a/src/utils/export-options.js b/src/utils/export-options.js
index 7e4a3bb..1074e9c 100644
--- a/src/utils/export-options.js
+++ b/src/utils/export-options.js
@@ -1,32 +1,20 @@
 const PalletSku = {
     columnMapping: [
       {
-        columnProp: "seqNo",
+        columnProp: "item_no",
         columnLabel: "序号",
       },
-      {
-        columnProp: "cmcInvoice",
-        columnLabel: "发票号",
-      },
       {
         columnProp: "boxQty",
         columnLabel: "箱数",
       },
       {
-        columnProp: "grossWeight",
-        columnLabel: "毛重",
-      },
-      {
-        columnProp: "netWeight",
-        columnLabel: "净重",
-      },
-      {
-        columnProp: "customerPO",
-        columnLabel: "PO",
+        columnProp: "pn",
+        columnLabel: "SKU",
       },
       {
-        columnProp: "pn",
-        columnLabel: "PN",
+        columnProp: "salesOrder",
+        columnLabel: "SO",
       },
       {
         columnProp: "qty",
@@ -37,12 +25,12 @@ const PalletSku = {
         columnLabel: "Rolls",
       },
       {
-        columnProp: "shippingMode",
-        columnLabel: "运输方式",
+        columnProp: "grossWeight",
+        columnLabel: "毛重",
       },
       {
-        columnProp: "destination",
-        columnLabel: "客户目的地",
+        columnProp: "cmcInvoice",
+        columnLabel: "发票号",
       },
     ],
     mergeSetting: {
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 372056e..da777f7 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -161,12 +161,12 @@
       </el-tab-pane>
 
       <el-tab-pane label="手工装箱" name="box">
-        <el-button @click="oneClickPacking()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'一键装箱'}}</el-button>
-        <el-button @click="upLoadPallet()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'导入装箱单'}}</el-button>
-        <el-button @click="newPalletModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'装箱'}}</el-button>
-        <el-button @click="openMergeBoxDialog()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'批量装箱'}}</el-button>
+<!--        <el-button @click="oneClickPacking()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'一键装箱'}}</el-button>
+        <el-button @click="newPalletModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'装箱'}}</el-button>-->
+        <el-button @click="openMergeBoxDialog()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'装箱'}}</el-button>
         <el-button @click="palletMaintenance()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'栈板维护'}}</el-button>
         <el-button @click="exportExcel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'导出装箱数据'}}</el-button>
+        <el-button @click="upLoadPallet()" type="success" style="margin-left: 2px;margin-top: 0px">{{'导入装箱单'}}</el-button>
         <el-table ref="detailTable"
           :data="dataList4"
           :height="height"
@@ -601,13 +601,13 @@
           </el-table-column>
 
           <!-- 明细信息列（不合并） -->
-          <el-table-column label="PO" prop="poNo" min-width="120" align="left">
+          <el-table-column label="PO" prop="poNo" min-width="120" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.poNo || '-' }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column label="PN" prop="pn" min-width="120" align="left">
+          <el-table-column label="PN" prop="pn" min-width="120" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.pn || '-' }}</span>
             </template>
@@ -703,7 +703,7 @@
         </div>
       </div>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
-        <el-button type="primary" @click="savePalletMaintenance()">确定</el-button>
+        <el-button type="primary" :loading="saveLoading" :disabled="saveLoading"  @click="savePalletMaintenance()">确定</el-button>
         <el-button type="primary" @click="palletMaintenanceModelFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -909,6 +909,7 @@
 
         // 栈板维护相关
         palletMaintenanceModelFlag: false,
+        saveLoading: false,
         palletMaintenanceRecords: [],
         palletModelFlag:false,
         palletEditFlag:false,
@@ -4217,7 +4218,7 @@
             return false
           }
         }
-
+        this.saveLoading = true
         // 这里只新增栈板记录，不做其他事情
         let saveData = {
           site: this.currentRow.site,
@@ -4238,11 +4239,18 @@
               duration: 1500,
               onClose: () => {}
             })
+            this.saveLoading = false
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
+            this.saveLoading = false
           }
+        }).catch((error) => {
+          console.error('保存失败:', error)
+          this.$message.error('保存失败，请重试')
+        }).finally(() => {
+          this.saveLoading = false
         })
       },
       getSummaries(param) {
diff --git a/src/views/modules/ecss/components/PackingDetailTab.vue b/src/views/modules/ecss/components/PackingDetailTab.vue
index 1c6eb85..488b5fb 100644
--- a/src/views/modules/ecss/components/PackingDetailTab.vue
+++ b/src/views/modules/ecss/components/PackingDetailTab.vue
@@ -1,111 +1,101 @@
 <template>
   <div class="packing-detail-tab">
-    <!-- 批量编辑按钮 -->
+    <!-- 批量操作按钮 -->
     <div class="batch-edit-toolbar" v-if="showActions">
       <el-button type="primary" size="small" icon="el-icon-edit" @click="openBatchEditDialog">
         批量编辑
       </el-button>
+      <el-button type="danger" size="small" icon="el-icon-delete" @click="batchDeleteBoxes" :disabled="selectedBoxes.length === 0">
+        批量删除 ({{ selectedBoxes.length }})
+      </el-button>
       <el-button type="warning" size="small" icon="el-icon-s-operation" @click="openAdjustWeightDialog">
         调整总毛重
       </el-button>
     </div>
 
+    <!-- 行合并表格 - 箱信息和明细一目了然 -->
     <el-table
-      :data="dataListBoxes"
-      :height="height"
+      :data="flattenedTableData"
+      :max-height="300"
       border
       v-loading="dataListLoading"
+      :element-loading-text="loadingText"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.6)"
       style="width: 100%;"
-      :expand-row-keys="expandedBoxRows"
-      :row-key="getBoxRowKey"
-      @expand-change="handleBoxExpand"
+      :span-method="mainTableSpanMethod"
       show-summary
-      :summary-method="getSummaries">
-      <el-table-column type="expand" width="70px">
-        <template slot-scope="props">
-          <!-- 加载状态 -->
-          <div v-if="props.row.loading" class="expand-loading">
-            <i class="el-icon-loading"></i>
-            <span>正在加载明细数据...</span>
-          </div>
+      :summary-method="getSummaries"
+      :header-cell-style="{background:'#f5f7fa', color:'#606266', fontWeight:'600'}"
+      @selection-change="handleSelectionChange">
 
-          <!-- 明细内容区域 -->
-          <div v-else class="expand-detail-container">
-            <!-- 明细表格 -->
-            <el-table
-              v-if="props.row.palletDetails && props.row.palletDetails.length > 0"
-              :data="props.row.palletDetails"
-              :max-height="300"
-              size="mini"
-              stripe
-              class="expand-detail-table">
-              <el-table-column
-                v-for="(item,index) in columnList3" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :min-width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden">
-                    {{ formatDetailValue(scope.row[item.columnProp], item.columnProp) }}
-                  </span>
-                  <span v-if="item.columnImage">
-                    <img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/>
-                  </span>
-                </template>
-              </el-table-column>
-
-              <!-- 明细操作列 -->
-              <el-table-column
-                label="操作"
-                width="120"
-                align="center"
-                fixed="right">
-                <template slot-scope="scope">
-                  <a type="text" size="small" v-if="showActions" @click="handleEditDetail(scope.row, props.row)">修改</a>
-                  <a type="text" size="small" v-if="showActions" @click="handleDeleteDetail(scope.row, props.row)">删除</a>
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <!-- 空数据状态 -->
-            <div v-else class="expand-empty-state">
-              <i class="el-icon-box"></i>
-              <p>暂无明细数据</p>
-              <span>该栈板下暂时没有装箱明细信息</span>
-            </div>
-          </div>
+      <!-- 勾选列 -->
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center"
+        :selectable="checkBoxSelectable">
+      </el-table-column>
+
+      <!-- 箱信息列（会合并） -->
+      <el-table-column label="序号" prop="item_no" width="80" align="center">
+        <template slot-scope="scope">
+          <span class="box-info-text">{{ scope.row.item_no }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-for="(item,index) in columnListBoxes" :key="index"
-        :sortable="item.columnSortable"
-        :prop="item.columnProp"
-        :header-align="item.headerAlign"
-        :show-overflow-tooltip="item.showOverflowTooltip"
-        :align="item.align"
-        :fixed="item.fixed==''?false:item.fixed"
-        :min-width="item.columnWidth"
-        :label="item.columnLabel">
+
+      <el-table-column label="箱数" prop="box_qty" width="185" align="center">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
+          <span class="box-info-text">{{ scope.row.box_qty }}</span>
         </template>
       </el-table-column>
 
-      <!-- 主表格操作列 -->
-      <el-table-column
-        label="操作"
-        width="120"
-        align="center"
-        fixed="right">
+      <el-table-column label="毛重" prop="grossWeight" width="185" align="center">
+        <template slot-scope="scope">
+          <span class="box-info-text">{{ scope.row.grossWeight }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="净重" prop="netWeight" width="100" align="center">
+        <template slot-scope="scope">
+            <span class="box-info-text" :style="{ color: scope.row.netWeight < 0 ? 'red' : '' }">{{ scope.row.netWeight }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="总Rolls" prop="rolls" width="100" align="center">
+        <template slot-scope="scope">
+          <span class="box-info-text">{{ scope.row.rolls || '-' }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column v-if="currentRow.boxSizeFlag==='Y'" label="备注" prop="remark" width="120" align="center">
+        <template slot-scope="scope">
+          <span class="box-info-text">{{ scope.row.remark || '-' }}</span>
+        </template>
+      </el-table-column>
+
+      <!-- 明细信息列（不合并） -->
+      <el-table-column label="PO" prop="poNo" min-width="120" align="left">
+        <template slot-scope="scope">
+          <span class="detail-text">{{ scope.row.poNo || '-' }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="PN" prop="pn" min-width="120" align="left">
+        <template slot-scope="scope">
+          <span class="detail-text">{{ scope.row.pn || '-' }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="数量" prop="qty" width="100" align="center">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="showActions"  @click="handleEditBox(scope.row)">修改</a>
-          <a type="text" size="small" v-if="showActions"  @click="handleDeleteBox(scope.row)">删除</a>
+          <span class="detail-text">{{ formatDetailValue(scope.row.qty, 'qty') }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="Rolls" prop="detailRolls" width="100" align="center">
+        <template slot-scope="scope">
+          <span class="detail-text">{{ formatDetailValue(scope.row.detailRolls, 'rolls') }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -113,22 +103,30 @@
     <!-- 托盘重量和总毛重显示（模拟表格行布局） -->
     <div class="weight-summary-table">
       <div class="weight-row">
-        <div class="weight-cell cell-expand label-cell" >托盘重量</div>
-        <div class="weight-cell cell-data "></div>
-        <div class="weight-cell cell-data"></div>
-        <div class="weight-cell cell-data value-cell">{{ palletWeight }}</div>
-        <div class="weight-cell cell-data"></div>
-        <div class="weight-cell cell-data"></div>
-        <div class="weight-cell cell-action"></div>
+        <div class="weight-cell cell-checkbox"></div>
+        <div class="weight-cell cell-label">托盘重量</div>
+        <div class="weight-cell cell-value"></div>
+        <div class="weight-cell cell-value">{{ palletWeight }}</div>
+        <div class="weight-cell cell-empty"></div>
+        <div v-if="currentRow.boxSizeFlag==='Y'" class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
       </div>
       <div class="weight-row">
-        <div class="weight-cell cell-expand label-cell">总毛重</div>
-        <div class="weight-cell cell-data "></div>
-        <div class="weight-cell cell-data"></div>
-        <div class="weight-cell cell-data value-cell">{{ totalGrossWeight.toFixed(2) }}</div>
-        <div class="weight-cell cell-data"></div>
-        <div class="weight-cell cell-data"></div>
-        <div class="weight-cell cell-action"></div>
+        <div class="weight-cell cell-checkbox"></div>
+        <div class="weight-cell cell-label">总毛重</div>
+        <div class="weight-cell cell-value"></div>
+        <div class="weight-cell cell-value">{{ totalGrossWeight.toFixed(2) }}</div>
+        <div class="weight-cell cell-empty"></div>
+        <div v-if="currentRow.boxSizeFlag==='Y'" class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
+        <div class="weight-cell cell-empty"></div>
       </div>
     </div>
 
@@ -422,7 +420,7 @@
 </template>
 
 <script>
-import { selectBoxList, searchCoDelPalletDataNew, updateBoxInfo, deleteBoxInfo, updateDetailInfo, deleteDetailInfo, batchUpdatePackingInfo, searchEcssCoDelPalletHeaderData, adjustTotalGrossWeight } from "@/api/ecss/ecss.js"
+import { selectBoxList, searchCoDelPalletDataNew, updateBoxInfo, deleteBoxInfo, updateDetailInfo, deleteDetailInfo, batchUpdatePackingInfo, batchDeleteBoxes, searchEcssCoDelPalletHeaderData, adjustTotalGrossWeight } from "@/api/ecss/ecss.js"
 
 export default {
   name: "PackingDetailTab",
@@ -443,8 +441,12 @@ export default {
   data() {
     return {
       dataListBoxes: [], // 箱数据列表
+      flattenedTableData: [], // 扁平化的表格数据（用于主表格显示）
       expandedBoxRows: [], // 展开的行
       dataListLoading: false,
+      loadingText: '加载中...', // 加载提示文本
+      selectedBoxes: [], // 选中的箱列表
+      currentLoadingId: null, // 当前加载请求的唯一标识（避免竞态条件）
 
       // 托盘重量相关
       palletWeight: 0, // 托盘重量合计
@@ -697,7 +699,15 @@ export default {
   },
   watch: {
     currentRow: {
-      handler(newVal) {
+      handler(newVal, oldVal) {
+        // 如果发货通知单发生变化，立即清空旧数据
+        if (oldVal && newVal && oldVal.delNo !== newVal.delNo) {
+          console.log(`发货通知单切换: ${oldVal.delNo} -> ${newVal.delNo}`);
+          this.flattenedTableData = [];
+          this.dataListBoxes = [];
+          this.selectedBoxes = [];
+        }
+
         if (newVal && newVal.site) {
           this.loadBoxList();
         }
@@ -708,23 +718,42 @@ export default {
   },
   methods: {
     // 装箱明细相关方法
-    loadBoxList() {
+    async loadBoxList() {
       if (!this.currentRow || !this.currentRow.site) {
         this.dataListBoxes = [];
+        this.flattenedTableData = [];
         this.palletWeight = 0;
         this.totalGrossWeight = 0;
+        this.selectedBoxes = [];
+        this.currentLoadingId = null;
         return;
       }
 
-      // 清理之前的展开状态
+      // 生成唯一的加载ID，用于识别本次请求
+      const loadingId = Date.now() + '_' + Math.random();
+      this.currentLoadingId = loadingId;
+
+      // 立即清空旧数据，避免显示缓存
+      this.flattenedTableData = [];
       this.expandedBoxRows = [];
+      this.selectedBoxes = [];
       this.dataListLoading = true;
 
-      // 同时获取箱数据和托盘数据
-      Promise.all([
-        selectBoxList(this.currentRow),
-        searchEcssCoDelPalletHeaderData(this.currentRow)
-      ]).then(([boxResponse, palletResponse]) => {
+      console.log(`[${loadingId}] 开始加载发货通知单: ${this.currentRow.delNo}`);
+
+      try {
+        // 同时获取箱数据和托盘数据
+        const [boxResponse, palletResponse] = await Promise.all([
+          selectBoxList(this.currentRow),
+          searchEcssCoDelPalletHeaderData(this.currentRow)
+        ]);
+
+        // 检查是否是最新的请求，如果不是则丢弃结果
+        if (this.currentLoadingId !== loadingId) {
+          console.log(`[${loadingId}] 请求已过期，丢弃结果`);
+          return;
+        }
+
         // 处理箱数据
         if (boxResponse.data && boxResponse.data.code == 0) {
           this.dataListBoxes = boxResponse.data.rows.map(row => ({
@@ -748,95 +777,313 @@ export default {
           this.palletWeight = 0;
         }
 
+        // 加载所有明细数据并生成扁平化表格数据
+        await this.loadAllDetailsAndFlatten(loadingId);
+
+        // 再次检查是否是最新的请求
+        if (this.currentLoadingId !== loadingId) {
+          console.log(`[${loadingId}] 请求已过期，停止处理`);
+          return;
+        }
+
         // 计算总毛重 = 合计毛重 + 托盘重量
         this.calculateTotalGrossWeight();
-      }).catch(error => {
-        console.error('加载数据失败:', error);
-        this.dataListBoxes = [];
-        this.palletWeight = 0;
-        this.totalGrossWeight = 0;
-      }).finally(() => {
-        this.dataListLoading = false;
-      });
-    },
 
-    // 计算总毛重
-    calculateTotalGrossWeight() {
-      const boxGrossWeight = this.dataListBoxes.reduce((sum, item) => {
-        return sum + (Number(item.grossWeight) || 0);
-      }, 0);
-      this.totalGrossWeight = boxGrossWeight + this.palletWeight;
-    },
+        console.log(`[${loadingId}] 加载完成`);
+      } catch (error) {
+        console.error(`[${loadingId}] 加载数据失败:`, error);
 
-    // 获取行的唯一标识
-    getBoxRowKey(row) {
-      // 使用多个字段组合确保唯一性
-      return `${row.item_no || ''}_${row.palletRemark || ''}_${row.box_qty || ''}`;
+        // 只有在是最新请求时才清空数据
+        if (this.currentLoadingId === loadingId) {
+          this.dataListBoxes = [];
+          this.flattenedTableData = [];
+          this.palletWeight = 0;
+          this.totalGrossWeight = 0;
+        }
+      } finally {
+        // 只有在是最新请求时才关闭loading
+        if (this.currentLoadingId === loadingId) {
+          this.dataListLoading = false;
+        }
+      }
     },
 
-    // 处理行展开事件
-    handleBoxExpand(row, expandedRows) {
-      // 判断当前操作是展开还是收起
-      const isExpanding = expandedRows.includes(row);
+    // 加载所有明细数据并生成扁平化表格数据（并行加载优化 + 分批处理 + 防竞态）
+    async loadAllDetailsAndFlatten(loadingId) {
+      const startTime = performance.now();
+      const boxCount = this.dataListBoxes.length;
 
-      if (isExpanding) {
-        // 如果是展开操作，则展开所有行
-        this.expandAll();
-      } else {
-        // 如果是收起操作，则收起所有行
-        this.collapseAll();
+      this.loadingText = `正在加载${boxCount}个箱的明细数据...`;
+      console.log(`[${loadingId}] 开始加载${boxCount}个箱的明细数据（并行模式）...`);
+
+      // 分批并行加载（每批最多20个请求，避免一次性请求过多）
+      const batchSize = 20;
+      const boxDetailsResults = [];
+
+      for (let i = 0; i < this.dataListBoxes.length; i += batchSize) {
+        // 每批次开始前检查是否还是最新请求
+        if (this.currentLoadingId !== loadingId) {
+          console.log(`[${loadingId}] 检测到新请求，停止当前加载`);
+          return;
+        }
+
+        const batch = this.dataListBoxes.slice(i, i + batchSize);
+        const batchPromises = batch.map(box => {
+          const detailParams = {
+            site: this.currentRow.site,
+            buNo: this.currentRow.buNo,
+            delNo: this.currentRow.delNo,
+            seqNo: box.item_no,
+            palletRemark: box.palletRemark
+          };
+
+          return searchCoDelPalletDataNew(detailParams)
+            .then(detailResponse => {
+              const details = (detailResponse.data && detailResponse.data.code === 0)
+                ? detailResponse.data.rows || []
+                : [];
+              return { box, details };
+            })
+            .catch(error => {
+              console.error(`[${loadingId}] 加载箱${box.item_no}明细数据失败:`, error);
+              return { box, details: [] };
+            });
+        });
+
+        // 等待当前批次完成
+        const batchResults = await Promise.all(batchPromises);
+
+        // 批次完成后再次检查
+        if (this.currentLoadingId !== loadingId) {
+          console.log(`[${loadingId}] 检测到新请求，丢弃批次结果`);
+          return;
+        }
+
+        boxDetailsResults.push(...batchResults);
+
+        // 更新进度显示
+        if (this.dataListBoxes.length > batchSize) {
+          const loaded = i + batch.length;
+          const progress = Math.min(100, Math.round(loaded / this.dataListBoxes.length * 100));
+          this.loadingText = `正在加载明细数据... ${progress}% (${loaded}/${boxCount})`;
+          console.log(`[${loadingId}] 加载进度: ${progress}% (${loaded}/${boxCount})`);
+        }
       }
-    },
 
-    // 加载栈板明细数据
-    loadPalletDetails(boxRow) {
-      if (boxRow.palletDetails && boxRow.palletDetails.length > 0) {
-        // 如果已经加载过，直接返回
+      // 渲染前最后检查一次
+      if (this.currentLoadingId !== loadingId) {
+        console.log(`[${loadingId}] 检测到新请求，停止渲染`);
         return;
       }
 
-      // 设置加载状态
-      this.$set(boxRow, 'loading', true);
+      this.loadingText = '正在渲染数据...';
 
-      // 构造查询参数
-      let detailParams = {
-        site: this.currentRow.site,
-        buNo: this.currentRow.buNo,
-        delNo: this.currentRow.delNo,
-        seqNo: boxRow.item_no,
-        palletRemark: boxRow.palletRemark
-      };
+      const loadTime = performance.now() - startTime;
+      console.log(`[${loadingId}] 明细数据加载完成，耗时：${loadTime.toFixed(0)}ms，平均每个箱：${(loadTime/boxCount).toFixed(0)}ms`);
 
-      // 调用API获取明细数据
-      searchCoDelPalletDataNew(detailParams).then(({data}) => {
-        if (data && data.code == 0) {
-          // 将明细数据赋值给当前行
-          this.$set(boxRow, 'palletDetails', data.rows);
-
-          // 如果明细为空，且之前有明细数据，说明明细被删除了，需要检查box是否也应该被删除
-          if (data.rows.length === 0 && boxRow.hadDetails) {
-            // 延迟刷新列表，让后端有时间处理删除逻辑
-            setTimeout(() => {
-              this.loadBoxList();
-            }, 500);
-          }
 
-          // 标记是否有过明细数据
-          this.$set(boxRow, 'hadDetails', data.rows.length > 0);
+      // 生成扁平化数据前最后检查
+      if (this.currentLoadingId !== loadingId) {
+        console.log(`[${loadingId}] 检测到新请求，停止生成数据`);
+        return;
+      }
+
+      // 生成扁平化数据
+      const flattenedData = [];
+
+      boxDetailsResults.forEach(({ box, details }) => {
+        // 将明细数据赋值给box
+        box.palletDetails = details;
+
+        if (details.length > 0) {
+          // 有明细时，为每个明细创建一行
+          details.forEach((detail, idx) => {
+            flattenedData.push({
+              // Box信息
+              _boxKey: this.getBoxRowKey(box),
+              _isFirstRowOfBox: idx === 0,
+              _rowSpan: idx === 0 ? details.length : 0,
+              item_no: box.item_no,
+              palletRemark: box.palletRemark,
+              box_qty: box.box_qty,
+              grossWeight: box.grossWeight,
+              netWeight: box.netWeight,
+              rolls: box.rolls,
+              remark: box.remark,
+              boxWeight: box.boxWeight,
+              // 明细信息
+              _hasDetail: true,
+              seqNo: detail.seqNo,
+              itemNo: detail.itemNo,
+              notifyDetailItemNo: detail.notifyDetailItemNo,
+              poNo: detail.poNo,
+              pn: detail.pn,
+              qty: detail.qty,
+              detailRolls: detail.rolls,
+              part_no: detail.part_no
+            });
+          });
         } else {
-          this.$set(boxRow, 'palletDetails', []);
-          this.$set(boxRow, 'hadDetails', false);
+          // 没有明细时，创建一行空明细的数据
+          flattenedData.push({
+            _boxKey: this.getBoxRowKey(box),
+            _isFirstRowOfBox: true,
+            _rowSpan: 1,
+            item_no: box.item_no,
+            palletRemark: box.palletRemark,
+            box_qty: box.box_qty,
+            grossWeight: box.grossWeight,
+            netWeight: box.netWeight,
+            rolls: box.rolls,
+            remark: box.remark,
+            boxWeight: box.boxWeight,
+            _hasDetail: false,
+            poNo: '',
+            pn: '',
+            qty: '',
+            detailRolls: ''
+          });
         }
-      }).catch(error => {
-        console.error('加载栈板明细数据失败:', error);
-        this.$set(boxRow, 'palletDetails', []);
-        this.$set(boxRow, 'hadDetails', false);
-      }).finally(() => {
-        // 清除加载状态
-        this.$set(boxRow, 'loading', false);
+      });
+
+      // 赋值前最终检查
+      if (this.currentLoadingId !== loadingId) {
+        console.log(`[${loadingId}] 检测到新请求，丢弃生成的数据`);
+        return;
+      }
+
+      this.flattenedTableData = flattenedData;
+      this.loadingText = '加载中...'; // 重置加载文本
+
+      console.log(`[${loadingId}] 数据渲染完成，共${flattenedData.length}行`);
+
+      // 强制刷新表格，确保合计行显示
+      this.$nextTick(() => {
+        console.log('表格数据已更新，当前行数:', this.flattenedTableData.length);
       });
     },
 
+    // 主表格行合并方法
+    mainTableSpanMethod({ row, column, rowIndex, columnIndex }) {
+      // 检查是否是合计行（合计行没有 _boxKey 属性）
+      if (!row._boxKey) {
+        // 合计行不进行合并，正常显示
+        return {
+          rowspan: 1,
+          colspan: 1
+        };
+      }
+
+      // 根据是否有备注列来确定需要合并的列数
+      // 第0列是复选框，第1列开始是箱信息，所以箱信息列索引需要+1
+      const boxInfoColumnCount = this.currentRow.boxSizeFlag === 'Y' ? 7 : 6;
+
+      // 复选框列和Box信息列需要合并
+      if (columnIndex < boxInfoColumnCount) {
+        if (row._isFirstRowOfBox) {
+          return {
+            rowspan: row._rowSpan,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
+      return {
+        rowspan: 1,
+        colspan: 1
+      };
+    },
+
+    // 复选框可选择性控制 - 只有箱的第一行才能勾选
+    checkBoxSelectable(row) {
+      return row._isFirstRowOfBox === true;
+    },
+
+    // 处理选择变化
+    handleSelectionChange(selection) {
+      // 只保留箱的第一行数据
+      this.selectedBoxes = selection.filter(row => row._isFirstRowOfBox);
+    },
+
+    // 批量删除箱
+    batchDeleteBoxes() {
+      if (this.selectedBoxes.length === 0) {
+        this.$message.warning('请先勾选要删除的箱');
+        return;
+      }
+
+      const boxCount = this.selectedBoxes.length;
+      const boxNos = this.selectedBoxes.map(box => box.item_no).join('、');
+
+      this.$confirm(`确定要删除选中的 ${boxCount} 个箱（序号：${boxNos}）吗？删除后无法恢复！`, '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: `正在删除 ${boxCount} 个箱...`,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+        // 构造批量删除参数
+        const batchParams = {
+          site: this.currentRow.site,
+          buNo: this.currentRow.buNo,
+          delNo: this.currentRow.delNo,
+          boxList: this.selectedBoxes.map(box => ({
+            item_no: box.item_no,
+            palletRemark: box.palletRemark
+          }))
+        };
+
+        // 调用批量删除API
+        batchDeleteBoxes(batchParams).then(({data}) => {
+          loading.close();
+
+          if (data && data.code === 0) {
+            this.$message.success(`成功删除 ${boxCount} 个箱`);
+
+            // 清空选择
+            this.selectedBoxes = [];
+
+            // 刷新列表
+            this.loadBoxList();
+            this.$emit('refresh'); // 刷新父页面列表
+          } else {
+            this.$alert(data.msg || '批量删除失败', '错误', {
+              confirmButtonText: '确定'
+            });
+          }
+        }).catch(error => {
+          loading.close();
+          console.error('批量删除箱失败:', error);
+          this.$message.error('批量删除失败');
+        });
+      }).catch(() => {
+        // 用户取消
+      });
+    },
+
+    // 计算总毛重
+    calculateTotalGrossWeight() {
+      const boxGrossWeight = this.dataListBoxes.reduce((sum, item) => {
+        return sum + (Number(item.grossWeight) || 0);
+      }, 0);
+      this.totalGrossWeight = boxGrossWeight + this.palletWeight;
+    },
+
+    // 获取行的唯一标识
+    getBoxRowKey(row) {
+      // 使用多个字段组合确保唯一性
+      return `${row.item_no || ''}_${row.palletRemark || ''}_${row.box_qty || ''}`;
+    },
+
     // 格式化明细值显示
     formatDetailValue(value, columnProp) {
       if (value === null || value === undefined || value === '') {
@@ -844,29 +1091,16 @@ export default {
       }
 
       // 数字类型格式化
-      if (columnProp === 'qty' || columnProp === 'rolls') {
+      if (columnProp === 'qty' ) {
         return parseInt(value).toLocaleString();
       }
+      if (columnProp === 'rolls') {
+        return value.toFixed(3);
+      }
 
       return value;
     },
 
-    // 展开所有行
-    expandAll() {
-      // 获取所有行的key
-      this.expandedBoxRows = this.dataListBoxes.map(row => this.getBoxRowKey(row));
-
-      // 为每个行加载明细数据
-      this.dataListBoxes.forEach(row => {
-        this.loadPalletDetails(row);
-      });
-    },
-
-    // 收起所有行
-    collapseAll() {
-      this.expandedBoxRows = [];
-    },
-
     // 刷新数据的公共方法
     refresh() {
       this.loadBoxList();
@@ -886,20 +1120,35 @@ export default {
      */
 
     // 处理修改箱信息
-    handleEditBox(boxRow) {
-      this.currentEditBox = boxRow;
-      this.editBoxForm.item_no = boxRow.item_no;
-      this.editBoxForm.box_qty = boxRow.box_qty;
-      this.editBoxForm.grossWeight = boxRow.grossWeight;
-      this.editBoxForm.netWeight = boxRow.netWeight;
-      this.editBoxForm.rolls = boxRow.rolls;
-      this.editBoxForm.remark = boxRow.remark;
-      this.editBoxForm.boxWeight = boxRow.boxWeight || 0; // 保存物料的箱重量
+    handleEditBox(row) {
+      // 从扁平化数据中提取箱信息
+      this.currentEditBox = {
+        item_no: row.item_no,
+        palletRemark: row.palletRemark,
+        box_qty: row.box_qty,
+        grossWeight: row.grossWeight,
+        netWeight: row.netWeight,
+        rolls: row.rolls,
+        remark: row.remark,
+        boxWeight: row.boxWeight
+      };
+      this.editBoxForm.item_no = row.item_no;
+      this.editBoxForm.box_qty = row.box_qty;
+      this.editBoxForm.grossWeight = row.grossWeight;
+      this.editBoxForm.netWeight = row.netWeight;
+      this.editBoxForm.rolls = row.rolls;
+      this.editBoxForm.remark = row.remark;
+      this.editBoxForm.boxWeight = row.boxWeight || 0; // 保存物料的箱重量
       this.editBoxDialogVisible = true;
     },
 
     // 处理删除箱信息
-    handleDeleteBox(boxRow) {
+    handleDeleteBox(row) {
+      // 从扁平化数据中提取箱信息
+      const boxRow = {
+        item_no: row.item_no,
+        palletRemark: row.palletRemark
+      };
       // 直接删除box及其所有明细，无需校验
       this.deleteBoxWithDetails(boxRow);
     },
@@ -939,14 +1188,25 @@ export default {
     },
 
     // 处理修改明细
-    handleEditDetail(detailRow, boxRow) {
-      this.currentEditDetail = detailRow;
-      this.currentEditBoxForDetail = boxRow;
-      this.editDetailForm.itemNo = detailRow.itemNo;
-      this.editDetailForm.poNo = detailRow.poNo;
-      this.editDetailForm.pn = detailRow.pn;
-      this.editDetailForm.qty = detailRow.qty;
-      this.editDetailForm.rolls = detailRow.rolls;
+    handleEditDetail(row) {
+      // 从扁平化数据中提取明细信息
+      this.currentEditDetail = {
+        seqNo: row.seqNo,
+        itemNo: row.itemNo,
+        notifyDetailItemNo: row.notifyDetailItemNo,
+        poNo: row.poNo,
+        pn: row.pn,
+        qty: row.qty
+      };
+      this.currentEditBoxForDetail = {
+        item_no: row.item_no,
+        palletRemark: row.palletRemark
+      };
+      this.editDetailForm.itemNo = row.itemNo;
+      this.editDetailForm.poNo = row.poNo;
+      this.editDetailForm.pn = row.pn;
+      this.editDetailForm.qty = row.qty;
+      this.editDetailForm.rolls = row.detailRolls;
       this.editDetailDialogVisible = true;
     },
 
@@ -1126,7 +1386,7 @@ export default {
     },
 
     // 删除明细
-    handleDeleteDetail(detailRow, boxRow) {
+    handleDeleteDetail(row) {
       this.$confirm(`确定要删除这个明细信息吗？删除后无法恢复！`, '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1137,11 +1397,11 @@ export default {
           site: this.currentRow.site,
           buNo: this.currentRow.buNo,
           delNo: this.currentRow.delNo,
-          seqNo: detailRow.seqNo,
-          itemNo: detailRow.itemNo,
-          notifyDetailItemNo: detailRow.notifyDetailItemNo,
-          partNo: detailRow.part_no,
-          qty: detailRow.qty
+          seqNo: row.seqNo,
+          itemNo: row.itemNo,
+          notifyDetailItemNo: row.notifyDetailItemNo,
+          partNo: row.part_no,
+          qty: row.qty
         };
         deleteDetailInfo(deleteParams).then(({data}) => {
           if (data && data.code === 0) {
@@ -1167,20 +1427,29 @@ export default {
       const { columns, data } = param;
       const sums = [];
 
+      console.log('getSummaries 被调用，数据行数:', data.length, '列数:', columns.length);
+
       columns.forEach((column, index) => {
         if (index === 0) {
-          // 第一列（展开列）显示"合计"
+          // 第一列是复选框，显示空
+          sums[index] = '';
+          return;
+        }
+
+        if (index === 1) {
+          // 第二列（序号列）显示"合计"
           sums[index] = '合计';
           return;
         }
 
-        const values = data.map(item => Number(item[column.property]));
+        // 只对每个箱的第一行进行合计（避免重复计算）
+        const boxFirstRows = data.filter(item => item._isFirstRowOfBox);
 
         // 根据列属性计算合计
         if (column.property === 'box_qty') {
           // 箱数合计
-          const sum = values.reduce((prev, curr) => {
-            const value = Number(curr);
+          const sum = boxFirstRows.reduce((prev, curr) => {
+            const value = Number(curr.box_qty);
             if (!isNaN(value)) {
               return prev + value;
             } else {
@@ -1190,8 +1459,8 @@ export default {
           sums[index] = sum;
         } else if (column.property === 'grossWeight') {
           // 毛重合计
-          const sum = values.reduce((prev, curr) => {
-            const value = Number(curr);
+          const sum = boxFirstRows.reduce((prev, curr) => {
+            const value = Number(curr.grossWeight);
             if (!isNaN(value)) {
               return prev + value;
             } else {
@@ -1201,8 +1470,8 @@ export default {
           sums[index] = sum.toFixed(3);
         } else if (column.property === 'netWeight') {
           // 净重合计
-          const sum = values.reduce((prev, curr) => {
-            const value = Number(curr);
+          const sum = boxFirstRows.reduce((prev, curr) => {
+            const value = Number(curr.netWeight);
             if (!isNaN(value)) {
               return prev + value;
             } else {
@@ -1211,9 +1480,9 @@ export default {
           }, 0);
           sums[index] = sum.toFixed(3);
         } else if (column.property === 'rolls') {
-          // 净重合计
-          const sum = values.reduce((prev, curr) => {
-            const value = Number(curr);
+          // Rolls合计
+          const sum = boxFirstRows.reduce((prev, curr) => {
+            const value = Number(curr.rolls);
             if (!isNaN(value)) {
               return prev + value;
             } else {
@@ -1221,15 +1490,24 @@ export default {
             }
           }, 0);
           sums[index] = sum.toFixed(3);
-        } else if (column.property === 'item_no') {
-          // 序号列显示空
-          sums[index] = '';
+        } else if (column.property === 'qty') {
+          // 明细数量合计（所有行）
+          const sum = data.filter(item => item._hasDetail).reduce((prev, curr) => {
+            const value = Number(curr.qty);
+            if (!isNaN(value)) {
+              return prev + value;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sum > 0 ? sum.toLocaleString() : '';
         } else {
           // 其他列显示空
           sums[index] = '';
         }
       });
 
+      console.log('getSummaries 计算结果:', sums);
       return sums;
     },
 
@@ -1869,150 +2147,198 @@ export default {
 }
 
 .weight-cell {
-  padding: 8px 10px;
+  padding: 5px;
   border-right: 1px solid #ebeef5;
-  min-height: 23px;
+  min-height: 30px;
   box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .weight-cell:last-child {
   border-right: none;
 }
 
-/* 展开列 - 固定宽度50px */
-.cell-expand {
-  width: 70px;
-  min-width: 50px;
-  max-width: 70px;
+/* 复选框列 */
+.cell-checkbox {
+  width: 55px;
+  min-width: 55px;
+  max-width: 55px;
 }
 
-/* 标签列（序号列位置） - flex分配 */
+/* 标签列 - 对应序号列 */
 .cell-label {
+  width: 80px;
+  min-width: 80px;
+  color: #19be6b;
+  font-weight: bold;
+  font-size: 14px;
+  text-align: center;
+}
+
+/* 空列 - 对应各个数据列 */
+.cell-empty {
   flex: 1;
-  min-width: 100px;
+  min-width: 120px;
 }
 
-/* 数据列（箱数、毛重、净重、总Rolls） - flex分配 */
-.cell-data {
+/* 值列 - 对应毛重列 */
+.cell-value {
   flex: 1;
-  min-width: 80px;
-  text-align: right;
+  width: 100px;
+  color: #19be6b;
+  font-weight: bold;
+  font-size: 14px;
+  text-align: center;
 }
 
-/* 操作列 - 固定宽度120px */
+/* 操作列 - 固定宽度 */
 .cell-action {
-  width: 120px;
-  min-width: 120px;
-  max-width: 120px;
+  width: 200px;
+  min-width: 200px;
+  max-width: 200px;
 }
 
-.label-cell {
-  color: #19be6b;
-  font-weight: bold;
+/* 主表格样式优化 */
+/deep/ .el-table {
+  font-size: 13px;
 }
 
-.value-cell {
-  color: #19be6b;
-  font-weight: bold;
+/deep/ .el-table th {
+  background-color: #f5f7fa !important;
+  padding: 5px 0;
 }
 
-/* 展开明细容器样式 */
-.expand-detail-container {
-  background: #fafafa;
-  border-radius: 6px;
-  overflow: visible;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+/deep/ .el-table td {
+  padding: 8px 0;
+}
+
+/* 箱信息单元格样式 - 合并单元格的垂直居中 */
+/deep/ .el-table__body td[rowspan] {
+  vertical-align: middle;
+  background-color: #f0f9ff !important;
 }
 
-/* 加载状态样式 */
-.expand-loading {
+/deep/ .el-table__body td[rowspan]:hover {
+  background-color: #e6f4ff !important;
+}
+
+/* 复选框列样式 */
+/deep/ .el-table__body .el-table-column--selection .cell {
+  padding: 0;
   text-align: center;
-  padding: 30px;
-  color: #666;
-  background: #fafafa;
-  margin: 8px 16px;
-  border-radius: 6px;
 }
 
-.expand-loading i {
-  font-size: 18px;
-  margin-right: 8px;
+/* 箱信息文本样式 */
+.box-info-text {
+  font-weight: 600;
   color: #409eff;
+  font-size: 14px;
 }
 
-/* 明细表格样式 */
-.expand-detail-table {
+/* 明细信息文本样式 */
+.detail-text {
+  color: #606266;
+  font-size: 13px;
+}
+
+/* 操作按钮容器样式 */
+.operation-buttons {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding: 4px 0;
+  min-height: 40px;
+  justify-content: center;
+}
+
+.box-operations,
+.detail-operations {
+  display: flex;
+  gap: 4px;
+  justify-content: center;
+  flex-wrap: nowrap;
+}
+
+/* 操作按钮样式 */
+/deep/ .operation-buttons .el-button--text {
+  padding: 3px 6px;
+  font-size: 12px;
   margin: 0;
-  border: none;
+  white-space: nowrap;
 }
 
-/deep/ .expand-detail-table .el-table__body-wrapper {
-  overflow-y: auto;
+/deep/ .operation-buttons .el-button--text i {
+  font-size: 12px;
+  margin-right: 2px;
 }
 
-/deep/ .expand-detail-table .el-table__header {
-  background: #f8f9fa;
+.btn-box-edit {
+  color: #409eff !important;
 }
 
-/deep/ .expand-detail-table .el-table__header th {
-  background: #e6e8eb;
-  color: #333;
-  font-weight: 500;
-  border-bottom: 2px solid #e9ecef;
+.btn-box-edit:hover {
+  color: #66b1ff !important;
 }
 
-/deep/ .expand-detail-table .el-table__row:hover > td {
-  background-color: #f0f9ff;
+.btn-box-delete {
+  color: #f56c6c !important;
 }
 
-/deep/ .expand-detail-table .el-table__row.el-table__row--striped {
-  background: #fbfcfd;
+.btn-box-delete:hover {
+  color: #f78989 !important;
 }
 
-/deep/ .expand-detail-table .el-table__row.el-table__row--striped:hover > td {
-  background-color: #f0f9ff;
+.btn-detail-edit {
+  color: #67c23a !important;
 }
 
-/* 空数据状态样式 */
-.expand-empty-state {
-  text-align: center;
-  padding: 40px 20px;
-  color: #999;
+.btn-detail-edit:hover {
+  color: #85ce61 !important;
 }
 
-.expand-empty-state i {
-  font-size: 70px;
-  color: #ddd;
-  margin-bottom: 12px;
-  display: block;
+.btn-detail-delete {
+  color: #f56c6c !important;
 }
 
-.expand-empty-state p {
-  font-size: 16px;
-  margin: 0 0 8px 0;
-  color: #666;
+.btn-detail-delete:hover {
+  color: #f78989 !important;
 }
 
-.expand-empty-state span {
-  font-size: 13px;
-  color: #999;
+/* 行悬停效果 */
+/deep/ .el-table__body tr:hover > td {
+  background-color: #f5f7fa !important;
 }
 
-/* 响应式调整 */
-@media (max-width: 768px) {
-  .expand-detail-container {
-    margin: 8px 8px;
-    padding: 6px;
-  }
+/* 合并单元格的边框优化 */
+/deep/ .el-table td {
+  border-bottom: 1px solid #ebeef5;
 }
 
-/* 确保主表格容器的滚动行为 */
-/deep/ .el-table__expanded-cell {
-  padding: 0 !important;
+/* 确保合并单元格内容居中显示 */
+/deep/ .el-table__body td[rowspan] .cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 40px;
 }
 
-/deep/ .el-table__expand-column .cell {
-  padding: 0;
+/* 确保合计行显示 */
+/deep/ .el-table__footer-wrapper {
+  display: block !important;
+  visibility: visible !important;
+  opacity: 1 !important;
+}
+
+/deep/ .el-table__footer {
+  background-color: #fafafa !important;
+}
+
+/deep/ .el-table__footer td {
+  background-color: #fafafa !important;
+  font-weight: 600;
+  color: #303133;
 }
 
 /* 确保表格滚动条正常显示 */
@@ -2043,6 +2369,12 @@ export default {
   margin-bottom: 10px;
   display: flex;
   justify-content: flex-start;
+  gap: 10px;
+}
+
+/* 批量删除按钮 - 禁用状态 */
+.batch-edit-toolbar .el-button.is-disabled {
+  opacity: 0.5;
 }
 
 /* 批量编辑弹窗样式 */
diff --git a/src/views/modules/ecss/pallet_upload_excel.vue b/src/views/modules/ecss/pallet_upload_excel.vue
index cdae60c..017286c 100644
--- a/src/views/modules/ecss/pallet_upload_excel.vue
+++ b/src/views/modules/ecss/pallet_upload_excel.vue
@@ -204,7 +204,7 @@
 
         updateExportFlag(updateData).then(({data}) => {
           if (data.code === 0) {
-            console.info('更新采购:');
+            console.info('更新成功:');
           }
         }).catch(error => {
           this.$message.warning('导出成功，但更新导出状态失败');