From 89867e8d7079e57bc772a9e5acc87a1e2e9f1797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Wed, 29 Apr 2026 17:25:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E5=88=97=E6=98=BE=E7=A4=BA=E9=80=89=E9=A1=B9=E5=92=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在delivery/canuse页面添加moreColumn属性控制额外列显示
- 在coil/panels/base页面添加moreColumn属性和相关列显示逻辑
- 优化表格容器样式防止内容溢出
- 为表格添加边框样式
---
 klp-ui/src/views/wms/coil/panels/base.vue     | 21 +++++++++++++++----
 .../src/views/wms/delivery/canuse/index.vue   |  4 +++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 25232068..1dfcb719 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -117,10 +117,10 @@
           overflowX: 'hidden' }">
         <warehouse-tree warehouseType="logic" @node-click="handleWarehouseNodeClick" />
       </div>
-      <div style="flex: 1;">
+      <div style="flex: 1; width: 100%; overflow: hidden;">
         <KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange"
           :floatLayer="true" :floatLayerConfig="floatLayerConfig" @row-click="handleRowClick"
-          :height="showAbnormal ? 'calc(100vh - 400px)' : 'calc(100vh - 300px)'">
+          :height="showAbnormal ? 'calc(100vh - 400px)' : 'calc(100vh - 300px)'" border>
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
             <template slot-scope="scope">
@@ -136,7 +136,7 @@
           <el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
           <el-table-column label="实际库区" align="center" prop="actualWarehouseName"
             v-if="!hideWarehouseQuery && !showExportTime" />
-          <el-table-column label="产品类型" align="center" width="180">
+          <el-table-column label="产品类型" align="center" width="180" v-if="!moreColumn">
             <template slot-scope="scope">
               <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
               <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
@@ -302,8 +302,17 @@
               {{ formatDuration(scope.row.productionDuration * 60 * 1000) }}
             </template>
           </el-table-column>
+          <el-table-column v-if="moreColumn" label="物料" prop="itemName"></el-table-column>
+          <el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
+          <el-table-column v-if="moreColumn" label="材质" prop="material"></el-table-column>
+          <el-table-column v-if="moreColumn" label="厂家" prop="manufacturer"></el-table-column>
+          <el-table-column v-if="moreColumn" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
+          <el-table-column v-if="moreColumn" label="品质" prop="qualityStatus"></el-table-column>
+          <el-table-column v-if="moreColumn" label="切边" prop="trimmingRequirement"></el-table-column>
+          <el-table-column v-if="moreColumn" label="包装" prop="packagingRequirement"></el-table-column>
+          <el-table-column v-if="moreColumn" label="镀层质量" prop="zincLayer"></el-table-column>
 
-          <el-table-column prop="action" label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column prop="action" label="操作" align="center" class-name="small-padding fixed-width" v-if="!moreColumn">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
                 预览标签
@@ -786,6 +795,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    moreColumn: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
diff --git a/klp-ui/src/views/wms/delivery/canuse/index.vue b/klp-ui/src/views/wms/delivery/canuse/index.vue
index 312396da..617cc2f6 100644
--- a/klp-ui/src/views/wms/delivery/canuse/index.vue
+++ b/klp-ui/src/views/wms/delivery/canuse/index.vue
@@ -7,6 +7,7 @@
     :showLength="showLength" 
     :canExportAll="canExportAll"
     :leftWarehouseQuery="leftWarehouseQuery"
+    :moreColumn="moreColumn"
   />
 </template>
 
@@ -33,7 +34,8 @@ export default {
       showLength: true,
       canExportAll: true,
       showOrderBy: false,
-      leftWarehouseQuery: true
+      leftWarehouseQuery: true,
+      moreColumn: true,
     }
   }
 }