This commit is contained in:
@@ -78,6 +78,7 @@
|
||||
v-model:filter="cardSearchForm"
|
||||
:items="cardSearchFormItems"
|
||||
label-width="120"
|
||||
:show-expand="false"
|
||||
@reset="handleCardSearchReset"
|
||||
@search="handleCardSearch"
|
||||
></ArtSearchBar>
|
||||
|
||||
@@ -79,6 +79,7 @@
|
||||
v-model:filter="deviceSearchForm"
|
||||
:items="deviceSearchFormItems"
|
||||
label-width="85"
|
||||
:show-expand="false"
|
||||
@reset="handleDeviceSearchReset"
|
||||
@search="handleDeviceSearch"
|
||||
></ArtSearchBar>
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user