feat: 新增设备激活时间

src/views/asset-management/asset-information/components/BasicInfoCard.vue

@@ -102,6 +102,9 @@
             {{ getRealNameStatusName(currentCard?.real_name_status) }}
           </ElTag>
         </ElDescriptionsItem>
+        <ElDescriptionsItem label="激活状态">
+          {{ cardInfo?.activation_status_name || '-' }}
+        </ElDescriptionsItem>
 
         <ElDescriptionsItem label="设备型号">{{
           cardInfo?.device_model || '-'
@@ -457,6 +460,7 @@
     msisdn?: string
     carrier_name?: string
     real_name_status?: number
+    activation_status_name?: string
     realname_policy?: string
     network_status?: number
     current_month_usage_mb?: number

src/views/asset-management/asset-information/composables/useAssetInfo.ts

@@ -106,6 +106,7 @@ export function useAssetInfo() {
           real_name_status: data.real_name_status,
           realname_policy: data.realname_policy,
           real_name_at: data.real_name_at,
+          activation_status_name: data.activation_status_name || '',
           activated_at: data.activated_at,
           created_at: data.created_at,
           updated_at: data.updated_at,

src/views/asset-management/asset-information/types.ts

@@ -16,6 +16,7 @@ export interface AssetInfo {
   msisdn?: string
   carrier_name?: string
   real_name_status?: number
+  activation_status_name?: string
   realname_policy?: string
   network_status?: string
   current_month_used_data?: number

src/views/asset-management/device-list/index.vue

@@ -904,6 +904,7 @@
     virtual_no: '',
     device_name: '',
     status: undefined as DeviceStatus | undefined,
+    activation_status: undefined as number | undefined,
     batch_no: '',
     device_type: '',
     manufacturer: '',
@@ -980,6 +981,19 @@
         { label: '已停用', value: 4 }
       ]
     },
+    {
+      label: '激活状态',
+      prop: 'activation_status',
+      type: 'select',
+      config: {
+        clearable: true,
+        placeholder: '请选择激活状态'
+      },
+      options: () => [
+        { label: '未激活', value: 0 },
+        { label: '已激活', value: 1 }
+      ]
+    },
     {
       label: '批次号',
       prop: 'batch_no',
@@ -1084,6 +1098,7 @@
     { label: '设备类型', prop: 'device_type' },
     { label: '状态', prop: 'status' },
     { label: '状态名称', prop: 'status_name' },
+    { label: '激活状态', prop: 'activation_status_name' },
     { label: '在线状态', prop: 'online_status' },
     { label: '实名策略', prop: 'realname_policy' },
     { label: '切卡模式', prop: 'switch_mode' },
@@ -1391,6 +1406,12 @@
       width: 100,
       formatter: (row: Device) => row.status_name || '-'
     },
+    {
+      prop: 'activation_status_name',
+      label: '激活状态',
+      width: 120,
+      formatter: (row: Device) => row.activation_status_name || '-'
+    },
     {
       prop: 'online_status',
       label: '在线状态',
@@ -1561,6 +1582,7 @@
         virtual_no: searchForm.virtual_no || undefined,
         device_name: searchForm.device_name || undefined,
         status: searchForm.status,
+        activation_status: searchForm.activation_status ?? undefined,
         batch_no: searchForm.batch_no || undefined,
         device_type: searchForm.device_type || undefined,
         manufacturer: searchForm.manufacturer || undefined,

src/views/asset-management/enterprise-devices/index.vue

@@ -79,7 +79,7 @@
             v-model:filter="deviceSearchForm"
             :items="deviceSearchFormItems"
             label-width="85"
-            :show-expand="false"
+            show-expand
             @reset="handleDeviceSearchReset"
             @search="handleDeviceSearch"
           ></ArtSearchBar>
@@ -108,6 +108,7 @@
             :pageSize="devicePagination.pageSize"
             :total="devicePagination.total"
             :marginTop="10"
+            height="40vh"
             @size-change="handleDevicePageSizeChange"
             @current-change="handleDevicePageChange"
             @selection-change="handleAvailableDevicesSelectionChange"
@@ -261,9 +262,9 @@
 
   // 设备搜索表单初始值
   const initialDeviceSearchState = {
-    status: 2,
     virtual_no: '',
     device_name: '',
+    activation_status: undefined as number | undefined,
     device_type: '',
     manufacturer: '',
     batch_no: undefined,
@@ -334,18 +335,16 @@
       }
     },
     {
-      label: '状态',
-      prop: 'status',
+      label: '激活状态',
+      prop: 'activation_status',
       type: 'select',
       config: {
         clearable: true,
-        placeholder: '请选择状态'
+        placeholder: '请选择激活状态'
       },
       options: () => [
-        { label: '在库', value: 1 },
-        { label: '已分销', value: 2 },
-        { label: '已激活', value: 3 },
-        { label: '已停用', value: 4 }
+        { label: '未激活', value: 0 },
+        { label: '已激活', value: 1 }
       ]
     },
     {
@@ -644,6 +643,12 @@
         )
       }
     },
+    {
+      prop: 'activation_status_name',
+      label: '激活状态',
+      width: 120,
+      formatter: (row: Device) => row.activation_status_name || '-'
+    },
     {
       prop: 'online_status',
       label: '在线状态',
@@ -791,7 +796,8 @@
       const params: any = {
         page: devicePagination.page,
         page_size: devicePagination.pageSize,
-        ...deviceSearchForm
+        ...deviceSearchForm,
+        status: 2
       }
       // 清理空值
       Object.keys(params).forEach((key) => {