修改订单管理

src/views/account-management/enterprise-cards/index.vue

@@ -78,7 +78,7 @@
         <ElDialog
           v-model="allocateDialogVisible"
           title="授权卡给企业"
-          width="85%"
+          width="75%"
           @close="handleAllocateDialogClose"
         >
           <!-- 搜索过滤条件 -->
@@ -727,18 +727,6 @@
       label: '运营商',
       width: 100
     },
-    {
-      prop: 'cost_price',
-      label: '成本价',
-      width: 100,
-      formatter: (row: StandaloneIotCard) => `¥${(row.cost_price / 100).toFixed(2)}`
-    },
-    {
-      prop: 'distribute_price',
-      label: '分销价',
-      width: 100,
-      formatter: (row: StandaloneIotCard) => `¥${(row.distribute_price / 100).toFixed(2)}`
-    },
     {
       prop: 'status',
       label: '状态',

src/views/order-management/order-list/detail.vue

@@ -183,6 +183,18 @@
           prop: 'operator_name',
           formatter: (value) => value || '-'
         },
+        {
+          label: '是否超时',
+          formatter: (_, data) => {
+            if (data.is_expired === undefined || data.is_expired === null) return '-'
+            return data.is_expired ? '是' : '否'
+          }
+        },
+        {
+          label: '超时时间',
+          prop: 'expires_at',
+          formatter: (value) => (value ? formatDateTime(value) : '-')
+        },
         {
           label: t('orderManagement.table.commissionStatus'),
           formatter: (_, data) => getCommissionStatusText(data.commission_status)

src/views/order-management/order-list/index.vue

@@ -338,6 +338,7 @@
     payment_status: undefined,
     order_type: undefined,
     purchase_role: undefined,
+    is_expired: undefined,
     start_time: '',
     end_time: ''
   }
@@ -410,6 +411,19 @@
         clearable: true
       }
     },
+    {
+      label: '超时状态',
+      prop: 'is_expired',
+      type: 'select',
+      placeholder: '请选择超时状态',
+      options: [
+        { label: '已超时', value: true },
+        { label: '未超时', value: false }
+      ],
+      config: {
+        clearable: true
+      }
+    },
     {
       label: t('orderManagement.searchForm.dateRange'),
       prop: 'dateRange',
@@ -440,6 +454,8 @@
     { label: '购买备注', prop: 'purchase_remark' },
     { label: '操作者', prop: 'operator_name' },
     { label: t('orderManagement.table.paymentStatus'), prop: 'payment_status' },
+    { label: '超时状态', prop: 'is_expired' },
+    { label: '超时时间', prop: 'expires_at' },
     { label: t('orderManagement.table.totalAmount'), prop: 'total_amount' },
     { label: '实付金额', prop: 'actual_paid_amount' },
     { label: t('orderManagement.table.paymentMethod'), prop: 'payment_method' },
@@ -705,6 +721,25 @@
         )
       }
     },
+    {
+      prop: 'is_expired',
+      label: '超时状态',
+      width: 100,
+      formatter: (row: Order) => {
+        if (row.is_expired === undefined || row.is_expired === null) return '-'
+        if (row.is_expired) {
+          return h(ElTag, { type: 'danger', size: 'small' }, () => '已超时')
+        } else {
+          return h(ElTag, { type: 'success', size: 'small' }, () => '未超时')
+        }
+      }
+    },
+    {
+      prop: 'expires_at',
+      label: '超时时间',
+      width: 180,
+      formatter: (row: Order) => (row.expires_at ? formatDateTime(row.expires_at) : '-')
+    },
     {
       prop: 'total_amount',
       label: t('orderManagement.table.totalAmount'),
@@ -791,6 +826,7 @@
         payment_status: searchForm.payment_status,
         order_type: searchForm.order_type,
         purchase_role: searchForm.purchase_role,
+        is_expired: searchForm.is_expired,
         start_time: searchForm.start_time || undefined,
         end_time: searchForm.end_time || undefined
       }