feat: 新增设备激活时间

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) => {