From 8b011692193d15db88416c8a72a6c1b4cf145cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E8=BF=9B?= <zoujin@qq.com>
Date: Sat, 7 Nov 2026 17:10:16 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=94=B9=E4=B8=BA=E6=8C=89=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=89=8B=E5=A1=AB=E5=86=85=E9=83=A8=20ID=20=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 套餐日流量详单按套餐名称搜索选择，操作人按账号用户名搜索选择
- 去掉套餐使用记录ID、退款单ID 等手填 ID 的筛选与列；从退款详情进入时仍按该退款单过滤
---
 .../traffic-records/CardDailyUsages.vue       |  5 ++--
 .../PackageTrafficAdjustments.vue             | 27 +++++--------------
 .../PackageUsageDailyRecords.vue              | 27 ++++++-------------
 .../RefundPostProcessAttempts.vue             |  6 ++---
 .../TrafficCollectionRecords.vue              |  5 ++--
 5 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/src/components/business/traffic-records/CardDailyUsages.vue b/src/components/business/traffic-records/CardDailyUsages.vue
index 13abb74..83566c6 100644
--- a/src/components/business/traffic-records/CardDailyUsages.vue
+++ b/src/components/business/traffic-records/CardDailyUsages.vue
@@ -20,8 +20,8 @@
       >
         <ElTable v-loading="loading" :data="rows" row-key="id" border empty-text="暂无卡日流量">
           <ElTableColumn label="日期" prop="date" width="120" />
-          <ElTableColumn label="ICCID / 卡 ID" min-width="190">
-            <template #default="{ row }">{{ row.iccid || row.iot_card_id }}</template>
+          <ElTableColumn label="ICCID" min-width="190">
+            <template #default="{ row }">{{ assetDisplay(row) }}</template>
           </ElTableColumn>
           <ElTableColumn label="运营商账户" min-width="140" show-overflow-tooltip>
             <template #default="{ row }">{{ nameOrId(row.carrier_name, row.carrier_id) }}</template>
@@ -59,6 +59,7 @@
   import { formatDateTime } from '@/utils/business/format'
   import {
     compactQuery,
+    assetDisplay,
     formatMb,
     nameOrId,
     recentDateRange,
diff --git a/src/components/business/traffic-records/PackageTrafficAdjustments.vue b/src/components/business/traffic-records/PackageTrafficAdjustments.vue
index 25803e1..3b96384 100644
--- a/src/components/business/traffic-records/PackageTrafficAdjustments.vue
+++ b/src/components/business/traffic-records/PackageTrafficAdjustments.vue
@@ -42,12 +42,6 @@
           <ElTableColumn v-if="!isFixed" label="套餐" min-width="180" show-overflow-tooltip>
             <template #default="{ row }">{{ row.package_name || '-' }}</template>
           </ElTableColumn>
-          <ElTableColumn
-            v-if="!isFixed"
-            label="套餐使用记录ID"
-            prop="package_usage_id"
-            min-width="130"
-          />
           <ElTableColumn label="调整量" min-width="110">
             <template #default="{ row }">
               <span :class="row.delta_mb > 0 ? 'delta-deduct' : 'delta-refund'">
@@ -105,7 +99,6 @@
     assetDisplay,
     formatMb,
     nameOrId,
-    optionalPositiveInt,
     recentTimeRange,
     requireIdentifierForNonPlatform,
     toTimeQuery
@@ -134,8 +127,7 @@
   const { info: userInfo } = storeToRefs(useUserStore())
   const emptyFilters = () => ({
     identifier: '',
-    package_usage_id: '',
-    operator_id: '',
+    operator_id: undefined as number | undefined,
     direction: '',
     range: recentTimeRange(7) as [string, string] | null
   })
@@ -151,17 +143,13 @@
         )
       }
       const identifier = filters.identifier.trim()
-      const packageUsageId = optionalPositiveInt(filters.package_usage_id, '套餐使用记录 ID')
-      if (packageUsageId === undefined) {
-        requireIdentifierForNonPlatform(identifier, userInfo.value.user_type)
-      }
+      requireIdentifierForNonPlatform(identifier, userInfo.value.user_type)
       return TrafficRecordsService.getTrafficAdjustments(
         compactQuery({
           ...page,
           ...toTimeQuery(filters.range),
           identifier,
-          package_usage_id: packageUsageId,
-          operator_id: optionalPositiveInt(filters.operator_id, '操作人账号 ID'),
+          operator_id: filters.operator_id || undefined,
           direction: filters.direction as 'deduct' | 'refund' | ''
         })
       )
@@ -188,12 +176,11 @@
       }
     },
     {
-      label: '套餐使用记录ID',
-      prop: 'package_usage_id',
-      type: 'input',
-      config: { clearable: true }
+      label: '操作人',
+      prop: 'operator_id',
+      type: 'business-select',
+      config: { entity: 'account', placeholder: '输入账号用户名搜索' }
     },
-    { label: '操作人账号ID', prop: 'operator_id', type: 'input', config: { clearable: true } },
     {
       label: '调整方向',
       prop: 'direction',
diff --git a/src/components/business/traffic-records/PackageUsageDailyRecords.vue b/src/components/business/traffic-records/PackageUsageDailyRecords.vue
index ca46b08..c1a8a2e 100644
--- a/src/components/business/traffic-records/PackageUsageDailyRecords.vue
+++ b/src/components/business/traffic-records/PackageUsageDailyRecords.vue
@@ -25,11 +25,8 @@
             <template #default="{ row }">{{ assetDisplay(row) }}</template>
           </ElTableColumn>
           <ElTableColumn label="套餐" min-width="200" show-overflow-tooltip>
-            <template #default="{ row }">{{
-              nameOrId(row.package_name, row.package_id, '套餐ID')
-            }}</template>
+            <template #default="{ row }">{{ row.package_name || '-' }}</template>
           </ElTableColumn>
-          <ElTableColumn label="套餐使用记录ID" prop="package_usage_id" min-width="130" />
           <ElTableColumn label="当日流量" min-width="110">
             <template #default="{ row }">{{ formatMb(row.daily_usage_mb) }}</template>
           </ElTableColumn>
@@ -58,8 +55,6 @@
     compactQuery,
     assetDisplay,
     formatMb,
-    nameOrId,
-    optionalPositiveInt,
     recentDateRange,
     requireIdentifierForNonPlatform,
     toDateQuery
@@ -69,8 +64,7 @@
   const { info: userInfo } = storeToRefs(useUserStore())
   const emptyFilters = () => ({
     identifier: '',
-    package_usage_id: '',
-    package_id: '',
+    package_id: undefined as number | undefined,
     carrier_id: undefined as number | undefined,
     range: recentDateRange(7) as [string, string] | null
   })
@@ -79,17 +73,13 @@
   const { rows, total, loading, error, pagination, load, search, changePage, changeSize } =
     useRecordList<PackageUsageDailyRecord>((page) => {
       const identifier = filters.identifier.trim()
-      const packageUsageId = optionalPositiveInt(filters.package_usage_id, '套餐使用记录 ID')
-      if (packageUsageId === undefined) {
-        requireIdentifierForNonPlatform(identifier, userInfo.value.user_type)
-      }
+      requireIdentifierForNonPlatform(identifier, userInfo.value.user_type)
       return TrafficRecordsService.getPackageUsageDailyRecords(
         compactQuery({
           ...page,
           ...toDateQuery(filters.range),
           identifier,
-          package_usage_id: packageUsageId,
-          package_id: optionalPositiveInt(filters.package_id, '套餐 ID'),
+          package_id: filters.package_id || undefined,
           carrier_id: filters.carrier_id
         })
       )
@@ -117,12 +107,11 @@
       }
     },
     {
-      label: '套餐使用记录ID',
-      prop: 'package_usage_id',
-      type: 'input',
-      config: { clearable: true }
+      label: '套餐',
+      prop: 'package_id',
+      type: 'business-select',
+      config: { entity: 'package', placeholder: '输入套餐名称搜索' }
     },
-    { label: '套餐ID', prop: 'package_id', type: 'input', config: { clearable: true } },
     carrierItem.value
   ])
 
diff --git a/src/components/business/traffic-records/RefundPostProcessAttempts.vue b/src/components/business/traffic-records/RefundPostProcessAttempts.vue
index e6cdffc..869db3a 100644
--- a/src/components/business/traffic-records/RefundPostProcessAttempts.vue
+++ b/src/components/business/traffic-records/RefundPostProcessAttempts.vue
@@ -104,7 +104,6 @@
     compactQuery,
     assetDisplay,
     isPlatformAccount,
-    optionalPositiveInt,
     recentTimeRange,
     toTimeQuery
   } from '@/utils/business/trafficRecords'
@@ -116,7 +115,6 @@
   const allowed = computed(() => isPlatformAccount(userInfo.value.user_type))
 
   const emptyFilters = () => ({
-    refund_id: props.refundId ? String(props.refundId) : '',
     refund_no: '',
     identifier: '',
     step: '',
@@ -133,7 +131,8 @@
         compactQuery({
           ...page,
           ...toTimeQuery(filters.range, true),
-          refund_id: optionalPositiveInt(filters.refund_id, '退款单 ID'),
+          // 从退款详情进入时固定按该退款单筛选，不让用户手填内部 ID
+          refund_id: props.refundId || undefined,
           refund_no: filters.refund_no.trim(),
           identifier: filters.identifier.trim(),
           step: filters.step,
@@ -165,7 +164,6 @@
         clearable: true
       }
     },
-    { label: '退款单ID', prop: 'refund_id', type: 'input', config: { clearable: true } },
     { label: '退款单号', prop: 'refund_no', type: 'input', config: { clearable: true } },
     {
       label: '资产标识',
diff --git a/src/components/business/traffic-records/TrafficCollectionRecords.vue b/src/components/business/traffic-records/TrafficCollectionRecords.vue
index a5e3246..40c251f 100644
--- a/src/components/business/traffic-records/TrafficCollectionRecords.vue
+++ b/src/components/business/traffic-records/TrafficCollectionRecords.vue
@@ -43,8 +43,8 @@
               </ElTag>
             </template>
           </ElTableColumn>
-          <ElTableColumn v-if="!isAsset" label="ICCID / 卡 ID" min-width="190">
-            <template #default="{ row }">{{ row.iccid || row.iot_card_id || '-' }}</template>
+          <ElTableColumn v-if="!isAsset" label="ICCID" min-width="190">
+            <template #default="{ row }">{{ assetDisplay(row) }}</template>
           </ElTableColumn>
           <ElTableColumn v-if="!isAsset" label="运营商账户" min-width="140" show-overflow-tooltip>
             <template #default="{ row }">{{ nameOrId(row.carrier_name, row.carrier_id) }}</template>
@@ -156,6 +156,7 @@
   } from '@/config/constants/trafficRecords'
   import {
     compactQuery,
+    assetDisplay,
     formatMb,
     nameOrId,
     optionalBoolean,