From f015afe301cdfe40d9e37329ea0e2b155338deb7 Mon Sep 17 00:00:00 2001
From: haoliang <821644@qq.com>
Date: Thu, 30 Apr 2026 01:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=9C=B0=E5=9D=80=E7=A9=BF?=
 =?UTF-8?q?=E6=A2=AD=E6=A1=86=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA=E5=90=8C?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E5=85=A8=E9=83=A8=E6=9C=BA=E5=BA=8A=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=8E=E5=85=B6=E4=BB=96=E5=9C=B0=E5=9D=80=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E6=9C=BA=E5=BA=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CollectAddressListPage.vue                | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/frontend/src/views/collect-address/CollectAddressListPage.vue b/frontend/src/views/collect-address/CollectAddressListPage.vue
index 873bbce..9909dcc 100644
--- a/frontend/src/views/collect-address/CollectAddressListPage.vue
+++ b/frontend/src/views/collect-address/CollectAddressListPage.vue
@@ -34,7 +34,7 @@
           <el-transfer
             v-model="form.machineIds"
             :data="transferMachines"
-            :titles="['可关联机床', '已关联']"
+            :titles="['同品牌机床', '已关联']"
             :props="{ key: 'id', label: 'label' }"
             filterable
             filter-placeholder="搜索机床"
@@ -99,27 +99,22 @@ async function onBrandChange(){
   await loadTransferData(form.brandId, editingId.value ?? undefined)
 }
 
-/** 加载穿梭框：同品牌下未关联其他地址的机床 + 当前地址已关联的机床 */
+/** 加载穿梭框：同品牌全部机床 */
 async function loadTransferData(brandId?: number, addressId?: number){
   if(!brandId){ transferMachines.value=[]; return }
   try{
-    // 获取该品牌全部机床
     const brandName = brandList.value.find((b: any) => b.id === brandId)?.brandName ?? ''
     const rAll: any = await request.get('/admin/machine', {params: {brandName, pageSize: 999}})
     const allMachines = rAll.data?.items ?? []
-    // 未关联任何采集地址的机床ID
-    const freeMachines = allMachines.filter((m: any) => !m.collectAddressId || m.collectAddressId === 0)
-    const freeIds = new Set(freeMachines.map((m: any) => m.id))
     // 当前地址已关联的机床
-    let ownIds = new Set<number>()
     if(addressId){
-      const rOwn: any = await request.get(`/admin/collect-address/${addressId}/machines`)
-      const items = rOwn.data?.items ?? []
-      ownIds = new Set(items.map((m: any) => m.machineId))
-      form.machineIds = items.map((m: any) => m.machineId)
+      try{
+        const rOwn: any = await request.get(`/admin/collect-address/${addressId}/machines`)
+        const items = rOwn.data?.items ?? []
+        form.machineIds = items.map((m: any) => m.machineId)
+      }catch{}
     }
     transferMachines.value = allMachines
-      .filter((m: any) => freeIds.has(m.id) || ownIds.has(m.id))
       .map((m: any) => ({ id: m.id, name: m.name, label: m.name, deviceCode: m.deviceCode, isOnline: m.isOnline, isEnabled: m.isEnabled }))
   }catch{ transferMachines.value=[] }
 }