From f5820f1c17bd48c25cabecb186a00c23029b05e6 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 6 Jan 2026 16:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cart/index.vue | 2 +-
 src/views/equip/list.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/cart/index.vue b/src/views/cart/index.vue
index 39cffa4..154ff8b 100644
--- a/src/views/cart/index.vue
+++ b/src/views/cart/index.vue
@@ -755,7 +755,7 @@ const allChecked = computed(() => {
     if (cardList.value.length < 1) {
         return false
     } else {
-        return cardList.value.every((e: any) => e.maStatus == 1 && e.isChecked === true)
+        return cardList.value.every((e: any) => e.isChecked === true)
     }
 })
 
diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue
index 74801a7..01dc814 100644
--- a/src/views/equip/list.vue
+++ b/src/views/equip/list.vue
@@ -507,14 +507,14 @@ const getDeviceListData = async (params: any = null, keyWord: any = null, index:
         const result: any = await getCompanyCountApi(searchParams_2)
         screenChooseList[4].list.forEach((e: any, index: any) => {
             if (index != 0) {
-                e.name = e.companyAbbreviationName + `(${0})`
+                e.name = (e.companyAbbreviationName || e.companyName) + `(${0})`
             }
         })
         for (let key in result.data) {
             screenChooseList[4].list.forEach((e: any, index: any) => {
                 if (e.companyId == key) {
                     e.name = ''
-                    e.name = e.companyName + `(${result.data[key]})`
+                    e.name = (e.companyAbbreviationName || e.companyName) + `(${result.data[key]})`
                 }
             })
         }