From a770984ef73b9b997cdfbc773dc9be0b38407da5 Mon Sep 17 00:00:00 2001 From: sexygoat <1538832180@qq.com> Date: Sat, 25 Apr 2026 15:51:24 +0800 Subject: [PATCH] fix: bug --- .../enterprise-cards/index.vue | 1 + .../enterprise-devices/index.vue | 18 ++++++++++-------- src/views/finance/refund/detail.vue | 12 +++++++++++- src/views/finance/refund/index.vue | 14 +++++++++----- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/views/asset-management/enterprise-cards/index.vue b/src/views/asset-management/enterprise-cards/index.vue index d831e30..a976c71 100644 --- a/src/views/asset-management/enterprise-cards/index.vue +++ b/src/views/asset-management/enterprise-cards/index.vue @@ -78,6 +78,7 @@ v-model:filter="cardSearchForm" :items="cardSearchFormItems" label-width="120" + :show-expand="false" @reset="handleCardSearchReset" @search="handleCardSearch" > diff --git a/src/views/asset-management/enterprise-devices/index.vue b/src/views/asset-management/enterprise-devices/index.vue index 38b55e7..3a70575 100644 --- a/src/views/asset-management/enterprise-devices/index.vue +++ b/src/views/asset-management/enterprise-devices/index.vue @@ -79,6 +79,7 @@ v-model:filter="deviceSearchForm" :items="deviceSearchFormItems" label-width="85" + :show-expand="false" @reset="handleDeviceSearchReset" @search="handleDeviceSearch" > @@ -218,9 +219,7 @@ import type { EnterpriseDeviceItem, AllocateDevicesResponse, - RecallDevicesResponse, - AuthorizedDeviceItem, - FailedDeviceItem + RecallDevicesResponse } from '@/types/api/enterpriseDevice' import type { EnterpriseItem } from '@/types/api' import type { Device, DeviceStatus } from '@/types/api/device' @@ -544,7 +543,10 @@ 1: { text: '在线', type: 'success' }, 2: { text: '离线', type: 'danger' } } - const status = onlineStatusMap[(row as any).online_status ?? 0] || { text: '未知', type: 'info' } + const status = onlineStatusMap[(row as any).online_status ?? 0] || { + text: '未知', + type: 'info' + } return h(ElTag, { type: status.type }, () => status.text) } }, @@ -908,9 +910,9 @@ devicePagination.page = 1 devicePagination.pageSize = 20 // 预加载下拉选项 - handleSearchBatchNo('') - searchShops('') - searchSeries('') + await handleSearchBatchNo('') + await searchShops('') + await searchSeries('') // 加载可用设备列表 await getAvailableDevicesList() // 预选已授权的设备 @@ -919,7 +921,7 @@ ) selectedAvailableDevices.value = preSelectedDevices // 等待表格渲染完成后,设置已选项 - nextTick(() => { + await nextTick(() => { preSelectedDevices.forEach((device) => { const row = availableDevicesTableRef.value?.tableRef?.getRowByKey(device.id) if (row) { diff --git a/src/views/finance/refund/detail.vue b/src/views/finance/refund/detail.vue index 0f9dd4b..aa19fb2 100644 --- a/src/views/finance/refund/detail.vue +++ b/src/views/finance/refund/detail.vue @@ -299,7 +299,17 @@ { label: '店铺名称', prop: 'shop_name' }, { label: '订单号', prop: 'order_no' }, { label: '资产标识符', prop: 'asset_identifier' }, - { label: '资产类型', prop: 'asset_type' }, + { + label: '资产类型', + formatter: (_, data) => + data.asset_type === 'device' + ? '设备' + : data.asset_type === 'card' + ? '单卡' + : data.asset_type === 'iot_card' + ? 'IoT卡' + : data.asset_type || '-' + }, { label: '申请退款金额', formatter: (_, data) => formatCurrency(data.requested_refund_amount) diff --git a/src/views/finance/refund/index.vue b/src/views/finance/refund/index.vue index 3423610..5b35e86 100644 --- a/src/views/finance/refund/index.vue +++ b/src/views/finance/refund/index.vue @@ -457,12 +457,14 @@ { prop: 'order_no', label: '订单号', - width: 220 + width: 180, + showOverflowTooltip: true }, { prop: 'asset_identifier', label: '资产标识符', - width: 180 + width: 200, + showOverflowTooltip: true }, { prop: 'asset_type', @@ -471,9 +473,11 @@ formatter: (row: Refund) => row.asset_type === 'device' ? '设备' - : row.asset_type === 'iot_card' - ? 'IoT卡' - : row.asset_type || '-' + : row.asset_type === 'card' + ? '单卡' + : row.asset_type === 'iot_card' + ? 'IoT卡' + : row.asset_type || '-' }, { prop: 'requested_refund_amount',