diff --git a/src/config/constants/julyIteration.ts b/src/config/constants/julyIteration.ts index 80318eb..b13d4e0 100644 --- a/src/config/constants/julyIteration.ts +++ b/src/config/constants/julyIteration.ts @@ -15,12 +15,12 @@ export const JULY_PERMISSIONS = { }, speedTier: { view: 'iot_card:speed_tier', - update: 'iot_card:speed_tier:update' + update: 'iot_card:speed_tier_update' }, deviceAllocation: { page: 'device_task:allocation', - create: 'device_task:allocation:create', - detail: 'device_task:allocation:detail' + create: 'device_task:allocation_create', + detail: 'device_task:allocation_detail' }, seriesGrants: { updateExpiryBase: 'series_grants:update_expiry_base' diff --git a/src/template/批量订购套餐模板.csv b/src/template/批量订购套餐模板.csv new file mode 100644 index 0000000..2c9ae84 --- /dev/null +++ b/src/template/批量订购套餐模板.csv @@ -0,0 +1 @@ +89861590172420377385 diff --git a/src/types/api/device.ts b/src/types/api/device.ts index 9c8ff4e..aa0a77f 100644 --- a/src/types/api/device.ts +++ b/src/types/api/device.ts @@ -244,6 +244,7 @@ export interface DeviceImportTask { operation_type: DeviceImportTaskOperationType operation_name: string target_id: number | null + target_name?: string | null realname_policy: 'none' | 'before_order' | 'after_order' warning_count: number created_at: string // 创建时间 diff --git a/src/views/asset-management/exchange-management/index.vue b/src/views/asset-management/exchange-management/index.vue index cb42b40..64ccd68 100644 --- a/src/views/asset-management/exchange-management/index.vue +++ b/src/views/asset-management/exchange-management/index.vue @@ -718,7 +718,7 @@ { type: 'primary', link: true, - onClick: () => handleViewDetail(row) + onClick: () => handleNameClick(row) }, () => row.exchange_no || '--' ) @@ -1410,6 +1410,14 @@ } // 查看详情 + const handleNameClick = (row: ExchangeResponse) => { + if (hasAuth('exchange:detail')) { + handleViewDetail(row) + } else { + ElMessage.warning('您没有查看详情的权限') + } + } + const handleViewDetail = (row: any) => { router.push(`${RoutesAlias.ExchangeDetail}/${row.id}`) } diff --git a/src/views/asset-management/task-management/bulk-purchase/index.vue b/src/views/asset-management/task-management/bulk-purchase/index.vue index 79adfe8..3c49a69 100644 --- a/src/views/asset-management/task-management/bulk-purchase/index.vue +++ b/src/views/asset-management/task-management/bulk-purchase/index.vue @@ -10,7 +10,7 @@ :close-on-press-escape="!createDrawerBusy" @closed="handleCreateDrawerClosed" > - + diff --git a/src/views/asset-management/task-management/task-detail/index.vue b/src/views/asset-management/task-management/task-detail/index.vue index 5138922..aa6a6a6 100644 --- a/src/views/asset-management/task-management/task-detail/index.vue +++ b/src/views/asset-management/task-management/task-detail/index.vue @@ -166,9 +166,9 @@ value || getOperationLabel(deviceTask.value?.operation_type) }, { - label: '目标 ID', - prop: 'target_id', - formatter: (value: number | null) => String(value ?? '-') + label: '目标名称', + prop: 'target_name', + formatter: (value: string | null | undefined) => value || '-' } ] : [] diff --git a/src/views/commission-management/agent-fund-overview/index.vue b/src/views/commission-management/agent-fund-overview/index.vue index 8f82fa5..3c665e3 100644 --- a/src/views/commission-management/agent-fund-overview/index.vue +++ b/src/views/commission-management/agent-fund-overview/index.vue @@ -998,7 +998,7 @@ }) } - if (hasAuth('shop:credit-limit:manage')) { + if (hasAuth('shop:credit_limit_manage')) { actions.push({ label: '调整额度', handler: () => showCreditDialog(row),