From 874a19bfb2d1437d8c1465263b76553a37835964 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 11 二月 2025 18:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue
index e5f323b..12d9b4c 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue
@@ -34,12 +34,12 @@
               return parseInt(index) + 1
             }
           },
-          { title: '璁惧鍚嶇О', dataIndex: 'deviceName', align: 'center' },
-          { title: '璁惧缂栧彿', dataIndex: 'deviceNo', align: 'center' },
-          { title: '璁惧鍨嬪彿', dataIndex: 'deviceModel', align: 'center' },
-          { title: '鎵�灞為儴闂�', dataIndex: 'departName', align: 'center' },
-          { title: '璁惧鍒嗙粍', dataIndex: 'groupName', align: 'center' },
-          { title: '鎺у埗绯荤粺', dataIndex: 'controlSystem', align: 'center' }
+          { title: '璁惧鍚嶇О', dataIndex: 'equipmentName', align: 'center' },
+          { title: '璁惧缂栧彿', dataIndex: 'equipmentId', align: 'center' },
+          { title: '璁惧绫诲瀷', dataIndex: 'equipmentType', align: 'center' },
+          { title: '璁惧鍨嬪彿', dataIndex: 'equipmentModel', align: 'center' },
+          { title: '鎵�灞炶溅闂�', dataIndex: 'productionName', align: 'center' },
+          { title: '鏁版帶绯荤粺', dataIndex: 'controlSystem', align: 'center' }
         ],
         url: {
           list: '/doc/relative/get/device'

--
Gitblit v1.9.3