From cdf5a060e8af5ae9c1898ee33d6166f1afdbacf4 Mon Sep 17 00:00:00 2001
From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com>
Date: Mon, 16 Mar 2026 14:47:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(eam):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=B8=85=E5=8D=95=E8=A1=A8=E5=88=86=E7=BB=84=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在设备清单表中新增分组编码列配置
- 添加分组编码列的显示属性设置
- 实现动态插入分组编码列到分组描述前列
- 添加列存在性检查避免重复插入
- 当找不到分组描述列时自动插入到序号列后
---
 src/views/modules/eam/eam_device_list.vue | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index f12e937..abfe2b6 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -2337,6 +2337,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101001008,
+            serialNumber: '101001008Table1GroupID',
+            tableId: "101001008Table1",
+            tableName: "设备清单表",
+            columnProp: 'groupID',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '分组编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 101001008,
@@ -4575,6 +4593,38 @@
             switch (columnId) {
               case 1:
                 this.columnList = data.rows
+                // 检查是否存在 GroupID 列，不存在则插入到 GroupDesc 前面
+                const hasGroupID = this.columnList.some(col => col.columnProp === 'groupID' || col.columnProp === 'GroupID')
+                if (!hasGroupID) {
+                  const groupDescIndex = this.columnList.findIndex(col => col.columnProp === 'groupDesc' || col.columnProp === 'GroupDesc')
+                  const groupIDColumn = {
+                    userId: this.$store.state.user.name,
+                    functionId: 101001008,
+                    serialNumber: '101001008Table1GroupID',
+                    tableId: "101001008Table1",
+                    tableName: "设备清单表",
+                    columnProp: 'groupID',
+                    headerAlign: 'center',
+                    align: 'center',
+                    columnLabel: '分组编码',
+                    columnHidden: false,
+                    columnImage: false,
+                    columnSortable: false,
+                    sortLv: 0,
+                    status: true,
+                    fixed: '',
+                    columnWidth: 120,
+                  }
+                  if (groupDescIndex !== -1) {
+                    this.columnList.splice(groupDescIndex, 0, groupIDColumn)
+                  } else {
+                    // 如果找不到 groupDesc，就插入到 seqNo 后面
+                    const seqNoIndex = this.columnList.findIndex(col => col.columnProp === 'seqNo' || col.columnProp === 'SeqNo')
+                    if (seqNoIndex !== -1) {
+                      this.columnList.splice(seqNoIndex + 1, 0, groupIDColumn)
+                    }
+                  }
+                }
                 break;
               // case 2:
               //   this.detailColumnList = data.rows