From 5ee730bffa337090c39f35f0ce84946c1be1cd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 13 Apr 2026 14:37:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8A=A5=E8=A1=A8):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=92=A2=E5=8D=B7=E8=A1=A8=E6=A0=BC=E8=A1=8C=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A5=E6=A0=87=E8=AE=B0=E5=85=B1=E7=94=A8?=
 =?UTF-8?q?=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在分条线报表中，产出钢卷和投入钢卷可能存在共用卷的情况。添加高亮功能以便直观区分这些共用卷：
1. 在day.vue中计算共用卷ID列表
2. 在coilTable组件中实现行高亮逻辑和样式
---
 .../wms/report/components/coilTable/index.vue | 56 ++++++++++++++++++-
 klp-ui/src/views/wms/report/template/day.vue  | 25 ++++++++-
 2 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/klp-ui/src/views/wms/report/components/coilTable/index.vue b/klp-ui/src/views/wms/report/components/coilTable/index.vue
index 59cd8e94..23c3cdde 100644
--- a/klp-ui/src/views/wms/report/components/coilTable/index.vue
+++ b/klp-ui/src/views/wms/report/components/coilTable/index.vue
@@ -24,7 +24,7 @@
         @current-change="handleCurrentChange" />
     </div>
 
-    <el-table :data="tableData" style="width: 100%" height="calc(100vh - 320px)" border>
+    <el-table :data="tableData" style="width: 100%" height="calc(100vh - 320px)" border row-key="coilId" :row-class-name="getRowClassName">
       <el-table-column v-for="column in columns" :key="column.prop" :prop="column.prop" :label="column.title"
         :width="column.width" :align="column.align">
         <template slot-scope="scope">
@@ -93,6 +93,18 @@ export default {
       type: Array,
       default: () => [],
     },
+    // 高亮配置
+    highlightConfig: {
+      type: Object,
+      default: () => ({
+        // 需要高亮的行的条件函数或行ID数组
+        rows: [],
+        // 高亮样式类名
+        className: 'highlight-row',
+        // 自定义高亮样式
+        style: {}
+      })
+    }
   },
   dicts: ['coil_quality_status', 'coil_abnormal_code', 'coil_abnormal_degree'],
   data() {
@@ -235,6 +247,43 @@ export default {
       }).finally(() => {
         this.abmornal.loading = false
       })
+    },
+    // 获取行类名
+    getRowClassName({ row, rowIndex }) {
+      const { rows } = this.highlightConfig
+      if (!rows || (Array.isArray(rows) && rows.length === 0)) {
+        return ''
+      }
+      
+      // 检查是否需要高亮
+      let shouldHighlight = false
+      if (typeof rows === 'function') {
+        // 如果是函数，调用函数判断
+        shouldHighlight = rows(row, rowIndex)
+      } else if (Array.isArray(rows)) {
+        // 如果是数组，检查row.coilId是否在数组中
+        shouldHighlight = rows.includes(row.coilId)
+        console.log('判断是否应该高亮', shouldHighlight, rows, row.coilId)
+      }
+      
+      return shouldHighlight ? 'warning-row' : ''
+    },
+    // 获取行样式
+    getRowStyle({ row, rowIndex }) {
+      const { rows, style } = this.highlightConfig
+      if (!rows || (Array.isArray(rows) && rows.length === 0)) {
+        return {}
+      }
+      
+      // 检查是否需要高亮
+      let shouldHighlight = false
+      if (typeof rows === 'function') {
+        shouldHighlight = rows(row, rowIndex)
+      } else if (Array.isArray(rows)) {
+        shouldHighlight = rows.includes(row.coilId)
+      }
+      
+      return shouldHighlight ? style : {}
     }
   }
 }
@@ -276,4 +325,9 @@ export default {
     width: 100%;
   }
 }
+
+/* 行高亮样式 */
+::v-deep .el-table__row.warning-row {
+  background: oldlace !important;
+}
 </style>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/report/template/day.vue b/klp-ui/src/views/wms/report/template/day.vue
index 1a340f7b..93815bf3 100644
--- a/klp-ui/src/views/wms/report/template/day.vue
+++ b/klp-ui/src/views/wms/report/template/day.vue
@@ -101,10 +101,10 @@
     </el-descriptions>
     <el-tabs v-model="activeTab">
       <el-tab-pane label="产出钢卷" name="output">
-        <coil-table :columns="outputColumns" :data="list"></coil-table>
+        <coil-table :columns="outputColumns" :data="list" :highlight-config="{ rows: commonCoilIds }"></coil-table>
       </el-tab-pane>
       <el-tab-pane label="投入钢卷" name="loss">
-        <coil-table :columns="lossColumns" :data="lossList"></coil-table>
+        <coil-table :columns="lossColumns" :data="lossList" :highlight-config="{ rows: commonCoilIds }"></coil-table>
       </el-tab-pane>
     </el-tabs>
 
@@ -243,6 +243,27 @@ export default {
     mSummary() {
       return calcMSummary(this.list, this.lossList)
     },
+    // 找出list和lossList中id相同的卷
+    commonCoilIds() {
+      if (this.productionLine !== '分条线') {
+        return []
+      }
+      
+      // 获取list中的coilId集合
+      const outputCoilIds = new Set(this.list.map(item => item.coilId))
+      // 获取lossList中的coilId集合
+      const lossCoilIds = new Set(this.lossList.map(item => item.coilId))
+      
+      // 找出两个集合中相同的coilId
+      const commonIds = []
+      outputCoilIds.forEach(id => {
+        if (lossCoilIds.has(id)) {
+          commonIds.push(id)
+        }
+      })
+      
+      return commonIds
+    },
   },
   methods: {
     // 加载列设置