diff --git a/src/views/account-management/account/index.vue b/src/views/account-management/account/index.vue
index dc9b1e0..b73ac0f 100644
--- a/src/views/account-management/account/index.vue
+++ b/src/views/account-management/account/index.vue
@@ -723,7 +723,7 @@
loading.value = true
try {
const params = {
- page: pagination.page,
+ page: pagination.currentPage,
page_size: pagination.pageSize,
username: formFilters.name || undefined,
phone: formFilters.phone || undefined,
diff --git a/src/views/asset-management/asset-information/components/PackageListCard.vue b/src/views/asset-management/asset-information/components/PackageListCard.vue
index ad01292..8ec7e20 100644
--- a/src/views/asset-management/asset-information/components/PackageListCard.vue
+++ b/src/views/asset-management/asset-information/components/PackageListCard.vue
@@ -28,8 +28,7 @@
type="primary"
link
class="package-name-link"
- @click="handleShowDailyRecords(scope.row)"
- v-permission="'package_usage:daily_records'"
+ @click="handlePackageNameClick(scope.row)"
>
{{ scope.row.package_name }}
@@ -105,18 +104,6 @@
{{ formatDateTime(scope.row.expires_at) }}
-
-
-
- 流量详单
-
-
-
{
+ if (!hasAuth('package_usage:daily_records')) {
+ ElMessage.warning('您没有查看流量详单的权限')
+ return
+ }
+ emit('showDailyRecords', { packageRow })
+ }
+
// 显示流量详单
const handleShowDailyRecords = (packageRow: PackageInfo) => {
emit('showDailyRecords', { packageRow })
diff --git a/src/views/asset-management/asset-information/components/dialogs/SwitchModeDialog.vue b/src/views/asset-management/asset-information/components/dialogs/SwitchModeDialog.vue
index 08c82fe..ee5d45d 100644
--- a/src/views/asset-management/asset-information/components/dialogs/SwitchModeDialog.vue
+++ b/src/views/asset-management/asset-information/components/dialogs/SwitchModeDialog.vue
@@ -68,11 +68,11 @@
set: (value) => emit('update:modelValue', value)
})
- const currentMode = computed(() => props.currentMode ?? 0)
+ const currentMode = computed(() => Number(props.currentMode) ?? 0)
watch(visible, (newVal) => {
if (newVal) {
- form.switch_mode = props.currentMode ?? 0
+ form.switch_mode = Number(props.currentMode) ?? 0
}
})
diff --git a/src/views/asset-management/iot-card-management/index.vue b/src/views/asset-management/iot-card-management/index.vue
index 3706dcc..09307db 100644
--- a/src/views/asset-management/iot-card-management/index.vue
+++ b/src/views/asset-management/iot-card-management/index.vue
@@ -402,7 +402,7 @@
currentCardDetail.iccid
}}
- {{
+ {{
currentCardDetail.msisdn || '--'
}}
{{
@@ -778,7 +778,10 @@
virtual_no: '',
device_virtual_no: '',
is_distributed: undefined,
- is_standalone: undefined
+ is_standalone: undefined,
+ is_replaced: undefined,
+ iccid_start: '',
+ iccid_end: ''
}
// 搜索表单
@@ -923,12 +926,12 @@
}))
},
{
- label: '卡接入号',
+ label: 'MSISDN',
prop: 'msisdn',
type: 'input',
config: {
clearable: true,
- placeholder: '请输入卡接入号'
+ placeholder: '请输入MSISDN'
}
},
{
@@ -974,13 +977,44 @@
{ label: '是(未绑定设备)', value: true },
{ label: '否(已绑定设备)', value: false }
]
+ },
+ {
+ label: '是否有换卡记录',
+ prop: 'is_replaced',
+ type: 'select',
+ config: {
+ clearable: true,
+ placeholder: '全部'
+ },
+ options: () => [
+ { label: '有换卡记录', value: true },
+ { label: '无换卡记录', value: false }
+ ]
+ },
+ {
+ label: 'ICCID起始号',
+ prop: 'iccid_start',
+ type: 'input',
+ config: {
+ clearable: true,
+ placeholder: '请输入ICCID起始号'
+ }
+ },
+ {
+ label: 'ICCID结束号',
+ prop: 'iccid_end',
+ type: 'input',
+ config: {
+ clearable: true,
+ placeholder: '请输入ICCID结束号'
+ }
}
]
// 列配置
const columnOptions = [
{ label: 'ICCID', prop: 'iccid' },
- { label: '卡接入号', prop: 'msisdn' },
+ { label: 'MSISDN', prop: 'msisdn' },
{ label: '卡虚拟号', prop: 'virtual_no' },
{ label: '绑定设备虚拟号', prop: 'device_virtual_no' },
{ label: '卡业务类型', prop: 'card_category' },
@@ -1105,7 +1139,7 @@
},
{
prop: 'msisdn',
- label: '卡接入号',
+ label: 'MSISDN',
width: 160
},
{
@@ -1202,7 +1236,8 @@
{
prop: 'data_usage_mb',
label: '累计流量(MB)',
- width: 120
+ width: 120,
+ formatter: (row: StandaloneIotCard) => row.data_usage_mb?.toLocaleString() || '0'
},
{
prop: 'created_at',
diff --git a/src/views/package-management/package-list/detail.vue b/src/views/package-management/package-list/detail.vue
index 9340574..8c55c86 100644
--- a/src/views/package-management/package-list/detail.vue
+++ b/src/views/package-management/package-list/detail.vue
@@ -49,7 +49,6 @@
{
title: '基本信息',
fields: [
- { label: 'ID', prop: 'id' },
{ label: '套餐编码', prop: 'package_code' },
{ label: '套餐名称', prop: 'package_name' },
{ label: '套餐系列', prop: 'series_name' },
diff --git a/src/views/package-management/package-series/detail.vue b/src/views/package-management/package-series/detail.vue
index 3e01880..c637863 100644
--- a/src/views/package-management/package-series/detail.vue
+++ b/src/views/package-management/package-series/detail.vue
@@ -49,7 +49,6 @@
{
title: '基本信息',
fields: [
- { label: 'ID', prop: 'id' },
{ label: '系列编码', prop: 'series_code' },
{ label: '系列名称', prop: 'series_name' },
{
@@ -60,8 +59,7 @@
},
{
label: '描述',
- prop: 'description',
- fullWidth: true
+ prop: 'description'
},
{ label: '创建时间', prop: 'created_at', formatter: (value) => formatDateTime(value) },
{ label: '更新时间', prop: 'updated_at', formatter: (value) => formatDateTime(value) }
@@ -110,7 +108,6 @@
},
{
label: '梯度配置',
- fullWidth: true,
render: (data) => {
const config = data.one_time_commission_config
if (
diff --git a/src/views/package-management/series-grants/detail.vue b/src/views/package-management/series-grants/detail.vue
index bf7ff1c..948cd73 100644
--- a/src/views/package-management/series-grants/detail.vue
+++ b/src/views/package-management/series-grants/detail.vue
@@ -17,8 +17,7 @@
基本信息
-
- {{ detailData.id }}
+
{{
detailData.series_code || '-'
}}
@@ -47,7 +46,7 @@
佣金配置
-
+
{{ detailData.commission_type === 'fixed' ? '固定佣金' : '梯度佣金' }}
@@ -117,7 +116,7 @@
强制充值配置
-
+
{{ getEnableStatusText(detailData.force_recharge_enabled || false) }}
diff --git a/src/views/shop-management/list/index.vue b/src/views/shop-management/list/index.vue
index 8954a28..95aaa54 100644
--- a/src/views/shop-management/list/index.vue
+++ b/src/views/shop-management/list/index.vue
@@ -729,7 +729,7 @@
loading.value = true
try {
const params = {
- page: pagination.page,
+ page: pagination.currentPage,
page_size: pagination.pageSize,
shop_name: searchForm.shop_name || undefined,
shop_code: searchForm.shop_code || undefined,