From 0b451a9fb9826d246c340c5cec4b1e8816a55104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 18 Mar 2026 15:59:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8A=A5=E8=A1=A8):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=92=8C=E5=8E=9A=E5=BA=A6=E5=88=97=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=88=97?=
 =?UTF-8?q?=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在合并报表页面中新增宽度和厚度显示列，同时将产品类型列的宽度从250调整为150以优化布局
---
 klp-ui/src/views/wms/report/merge/index.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/klp-ui/src/views/wms/report/merge/index.vue b/klp-ui/src/views/wms/report/merge/index.vue
index 9ccc702d..6231d613 100644
--- a/klp-ui/src/views/wms/report/merge/index.vue
+++ b/klp-ui/src/views/wms/report/merge/index.vue
@@ -80,12 +80,14 @@
           <el-table-column label="创建时间" align="center" prop="createTime" />
           <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
           <!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
-          <el-table-column label="产品类型" align="center" width="250">
+          <el-table-column label="产品类型" align="center" width="150">
             <template slot-scope="scope">
               <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
               <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
             </template>
           </el-table-column>
+          <el-table-column label="宽度(米)" align="center" prop="computedWidth" width="70" />
+          <el-table-column label="厚度(米)" align="center" prop="computedThickness" width="70" />
           <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
           <el-table-column label="长度 (米)" align="center" prop="length" />
           <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
@@ -108,12 +110,14 @@
           <el-table-column label="创建时间" align="center" prop="createTime" />
           <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
           <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
-          <el-table-column label="产品类型" align="center" width="250">
+          <el-table-column label="产品类型" align="center" width="150">
             <template slot-scope="scope">
               <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
               <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
             </template>
           </el-table-column>
+          <el-table-column label="宽度(米)" align="center" prop="computedWidth" width="70" />
+          <el-table-column label="厚度(米)" align="center" prop="computedThickness" width="70" />
           <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
           <el-table-column label="长度 (米)" align="center" prop="length" />
           <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
@@ -242,7 +246,7 @@ export default {
       this.loading = true;
       const res1 = await listPendingAction({ ...this.queryParams, actionType: 201, actionStatus: 2 });
       const res2 = await listPendingAction({ ...this.queryParams, actionType: 202, actionStatus: 2 });
-      
+
       const res3 = await listPendingAction({ ...this.queryParams, actionType: 203, actionStatus: 2 });
       const res4 = await listPendingAction({ ...this.queryParams, actionType: 204, actionStatus: 2 });
       const res5 = await listPendingAction({ ...this.queryParams, actionType: 205, actionStatus: 2 });