From b51a3f55370a24fcb74bc7ea47e80aa801f5390e Mon Sep 17 00:00:00 2001
From: luo <luo@qq.com>
Date: Tue, 28 Jul 2026 16:08:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/layouts/art-header-bar/index.vue     | 11 ++-----
 .../core/layouts/art-notification/index.vue   | 14 +--------
 src/config/constants/notification.ts          |  5 ----
 .../expiring-assets/index.vue                 | 28 ++++++++---------
 .../task-management/bulk-purchase/index.vue   | 30 +++++++++++++++++++
 .../device-batch-allocation/index.vue         |  5 +++-
 6 files changed, 50 insertions(+), 43 deletions(-)
 delete mode 100644 src/config/constants/notification.ts

diff --git a/src/components/core/layouts/art-header-bar/index.vue b/src/components/core/layouts/art-header-bar/index.vue
index c66a28b..0f4c68c 100644
--- a/src/components/core/layouts/art-header-bar/index.vue
+++ b/src/components/core/layouts/art-header-bar/index.vue
@@ -194,8 +194,6 @@
   import { mittBus } from '@/utils/sys'
   import { useMenuStore } from '@/store/modules/menu'
   import { useNotificationStore } from '@/store/modules/notification'
-  import { useAuth } from '@/composables/useAuth'
-  import { NOTIFICATION_PERMISSIONS } from '@/config/constants/notification'
   import AppConfig from '@/config'
   const isWindows = navigator.userAgent.includes('Windows')
   const { locale } = useI18n()
@@ -203,7 +201,6 @@
   const settingStore = useSettingStore()
   const userStore = useUserStore()
   const notificationStore = useNotificationStore()
-  const { hasAuth } = useAuth()
   const router = useRouter()
 
   const {
@@ -262,12 +259,10 @@
 
   onMounted(() => {
     initLanguage()
-    if (hasAuth(NOTIFICATION_PERMISSIONS.page)) {
+    void notificationStore.refreshUnreadCount().catch(() => undefined)
+    unreadTimer = window.setInterval(() => {
       void notificationStore.refreshUnreadCount().catch(() => undefined)
-      unreadTimer = window.setInterval(() => {
-        void notificationStore.refreshUnreadCount().catch(() => undefined)
-      }, 30_000)
-    }
+    }, 30_000)
   })
 
   let unreadTimer: number | undefined
diff --git a/src/components/core/layouts/art-notification/index.vue b/src/components/core/layouts/art-notification/index.vue
index 1eca133..dace245 100644
--- a/src/components/core/layouts/art-notification/index.vue
+++ b/src/components/core/layouts/art-notification/index.vue
@@ -3,12 +3,7 @@
     <div class="notice" @click.stop>
       <div class="header">
         <span class="text">通知</span>
-        <button
-          v-if="hasAuth(NOTIFICATION_PERMISSIONS.readAll)"
-          class="read-all"
-          type="button"
-          @click="handleMarkAllRead"
-        >
+        <button class="read-all" type="button" @click="handleMarkAllRead">
           全部已读
         </button>
       </div>
@@ -62,8 +57,6 @@
   import { NotificationService } from '@/api/modules'
   import type { NotificationCategory, NotificationItem } from '@/types/api'
   import { useNotificationStore } from '@/store/modules/notification'
-  import { useAuth } from '@/composables/useAuth'
-  import { NOTIFICATION_PERMISSIONS } from '@/config/constants/notification'
   import { navigateNotificationTarget } from '@/utils/business/notificationNavigation'
   import { formatDateTime } from '@/utils/business/format'
 
@@ -72,7 +65,6 @@
 
   const router = useRouter()
   const notificationStore = useNotificationStore()
-  const { hasAuth } = useAuth()
   const activeCategory = ref<'all' | NotificationCategory>('all')
   const visible = computed(() => props.modelValue)
 
@@ -116,10 +108,6 @@
   }
 
   const handleNotificationClick = async (item: NotificationItem) => {
-    if (!hasAuth(NOTIFICATION_PERMISSIONS.read)) {
-      ElMessage.warning('您没有标记通知已读的权限')
-      return
-    }
     try {
       const targetResponse = await NotificationService.getTarget(item.id)
       const readResponse = await notificationStore.markRead(item.id)
diff --git a/src/config/constants/notification.ts b/src/config/constants/notification.ts
deleted file mode 100644
index 56e21fc..0000000
--- a/src/config/constants/notification.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const NOTIFICATION_PERMISSIONS = {
-  page: 'notifications:view',
-  read: 'notifications:read',
-  readAll: 'notifications:read_all'
-} as const
diff --git a/src/views/asset-management/expiring-assets/index.vue b/src/views/asset-management/expiring-assets/index.vue
index 647d8f5..e8aa39a 100644
--- a/src/views/asset-management/expiring-assets/index.vue
+++ b/src/views/asset-management/expiring-assets/index.vue
@@ -33,8 +33,6 @@
           :pageSize="pagination.pageSize"
           :total="pagination.total"
           :marginTop="10"
-          :actions="getActions"
-          :actionsWidth="140"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
@@ -50,7 +48,7 @@
 <script setup lang="ts">
   import { h, onMounted, reactive, ref, computed } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
-  import { ElMessage, ElTag } from 'element-plus'
+  import { ElButton, ElMessage, ElTag } from 'element-plus'
   import { AssetService, PackageManageService, ShopService } from '@/api/modules'
   import type {
     ExpiringAssetItem,
@@ -187,8 +185,7 @@
     { label: '店铺', prop: 'shop_name' },
     { label: '当前套餐', prop: 'package_name' },
     { label: '预计最终到期', prop: 'estimated_final_expires_at' },
-    { label: '剩余天数', prop: 'days_until_final_expiry' },
-    { label: '临期等级', prop: 'expiry_level_name' }
+    { label: '剩余天数', prop: 'days_until_final_expiry' }
   ]
 
   const getExpiryClass = (level?: string | null) => {
@@ -244,7 +241,16 @@
       label: '资产标识',
       minWidth: 180,
       showOverflowTooltip: true,
-      formatter: (row: ExpiringAssetItem) => row.identifier || '-'
+      formatter: (row: ExpiringAssetItem) =>
+        h(
+          ElButton,
+          {
+            type: 'primary',
+            link: true,
+            onClick: () => goToAsset(row)
+          },
+          () => row.identifier || '-'
+        )
     },
     {
       prop: 'shop_name',
@@ -279,12 +285,6 @@
         h(ElTag, { type: getExpiryTagType(row.expiry_level), size: 'small' }, () =>
           row.days_until_final_expiry == null ? '-' : `${row.days_until_final_expiry}天`
         )
-    },
-    {
-      prop: 'expiry_level_name',
-      label: '临期等级',
-      width: 120,
-      formatter: (row: ExpiringAssetItem) => row.expiry_level_name || '-'
     }
   ])
 
@@ -371,10 +371,6 @@
     })
   }
 
-  const getActions = (row: ExpiringAssetItem) => [
-    { label: '查看资产', type: 'primary' as const, handler: () => goToAsset(row) }
-  ]
-
   onMounted(() => {
     const assetType = route.query.asset_type
     if (assetType === 'card' || assetType === 'iot_card' || assetType === 'device') {
diff --git a/src/views/asset-management/task-management/bulk-purchase/index.vue b/src/views/asset-management/task-management/bulk-purchase/index.vue
index 1a95661..79adfe8 100644
--- a/src/views/asset-management/task-management/bulk-purchase/index.vue
+++ b/src/views/asset-management/task-management/bulk-purchase/index.vue
@@ -54,7 +54,24 @@
               >
                 <span class="package-option">{{ pkg.package_name }}</span>
               </ElOption>
+              <template #empty>
+                <div class="package-empty">
+                  {{
+                    packageLoading
+                      ? '正在加载套餐...'
+                      : form.series_id
+                        ? '该套餐系列下暂无可用套餐'
+                        : '请先选择套餐系列'
+                  }}
+                </div>
+              </template>
             </ElSelect>
+            <div
+              v-if="form.series_id && !packageLoading && packageOptions.length === 0"
+              class="package-empty-tip"
+            >
+              该套餐系列下暂无可用套餐
+            </div>
           </ElFormItem>
 
           <ElFormItem label="支付方式" prop="payment_method">
@@ -547,6 +564,19 @@
       text-overflow: ellipsis;
     }
 
+    .package-empty {
+      padding: 8px 0;
+      color: var(--el-color-danger);
+      text-align: center;
+    }
+
+    .package-empty-tip {
+      margin-top: 4px;
+      font-size: 12px;
+      line-height: 1.5;
+      color: var(--el-color-danger);
+    }
+
     .create-form {
       padding-bottom: 8px;
     }
diff --git a/src/views/asset-management/task-management/device-batch-allocation/index.vue b/src/views/asset-management/task-management/device-batch-allocation/index.vue
index 868c3a0..ef5baf1 100644
--- a/src/views/asset-management/task-management/device-batch-allocation/index.vue
+++ b/src/views/asset-management/task-management/device-batch-allocation/index.vue
@@ -23,7 +23,7 @@
             </ElSelect>
           </ElFormItem>
 
-          <ElFormItem v-if="requiresTargetId" label="目标 ID" prop="target_id">
+          <ElFormItem v-if="requiresTargetId" :label="targetLabel" prop="target_id">
             <ElSelect
               v-model="form.target_id"
               filterable
@@ -284,6 +284,9 @@
   const targetPlaceholder = computed(() =>
     form.operation_type === 'assign_shop' ? '请选择启用的目标店铺' : '请选择启用的套餐系列'
   )
+  const targetLabel = computed(() =>
+    form.operation_type === 'assign_shop' ? '选择店铺' : '选择套餐系列'
+  )
   const createDrawerBusy = computed(() => submitting.value || fileUploading.value)
 
   const getOperationLabel = (operationType: DeviceImportTaskOperationType) => {