From fba896b6e195b987365abcb6a6e7aa46110eae79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 5 Dec 2025 15:47:05 +0800
Subject: [PATCH] =?UTF-8?q?style(ui):=20=E8=B0=83=E6=95=B4=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E5=92=8C=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加对话框主体的最大高度
- 修改表格高度属性为固定值
- 合并重量列并调整格式
- 优化入场卷号列的宽度
- 格式化更新时间显示
---
 klp-ui/src/assets/styles/element-ui.scss       |  2 +-
 .../views/wms/coil/panels/DrillDownTable.vue   | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss
index 001e94e2..6fa58aa5 100644
--- a/klp-ui/src/assets/styles/element-ui.scss
+++ b/klp-ui/src/assets/styles/element-ui.scss
@@ -932,7 +932,7 @@ body {
   // 对话框主体
   .el-dialog__body {
     padding: $--spacing-lg;
-    max-height: 60vh;
+    max-height: 80vh;
     overflow-y: auto;
   }
 
diff --git a/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue b/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
index 7ea579c4..21473b62 100644
--- a/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
+++ b/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
@@ -28,7 +28,7 @@
 
       <!-- 钻取表格 -->
       <el-table 
-        max-height="400" 
+        height="400" 
         v-loading="loading" 
         :data="list" 
         border 
@@ -39,7 +39,7 @@
         <el-table-column prop="warehouseName" label="库位" align="center" min-width="150"></el-table-column>
         <el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery"/>
         <el-table-column prop="currentCoilNo" label="当前卷号" align="center" min-width="120"></el-table-column>
-        <el-table-column prop="enterCoilNo" label="入场卷号" align="center" min-width="180"></el-table-column>
+        <el-table-column prop="enterCoilNo" label="入场卷号" align="center"></el-table-column>
         <el-table-column label="物料类型" align="center" prop="itemType">
           <template slot-scope="scope">
             {{ scope.row.itemType == 'product' ? '成品' : '原料' }}
@@ -51,9 +51,17 @@
             <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
           </template>
         </el-table-column>
-        <el-table-column label="更新时间" align="center" prop="updateTime" />
-        <el-table-column prop="grossWeight" label="毛重(kg)" align="center" min-width="100"></el-table-column>
-        <el-table-column prop="netWeight" label="净重(kg)" align="center" min-width="100"></el-table-column>
+        <el-table-column label="更新时间" align="center" prop="updateTime">
+          <template slot-scope="scope">
+            {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="grossWeight" label="重量(t)" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.netWeight }} / {{ scope.row.grossWeight }} 
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="netWeight" label="净重(kg)" align="center" min-width="100"></el-table-column> -->
       </el-table>
     </el-skeleton>