diff --git a/src/types/api/asset.ts b/src/types/api/asset.ts
index 61cb3f3..5ab6cbf 100644
--- a/src/types/api/asset.ts
+++ b/src/types/api/asset.ts
@@ -56,6 +56,7 @@ export interface AssetResolveResponse {
   series_id: number // 套餐系列 ID
   series_name: string // 套餐系列名称
   real_name_status: RealNameStatus // 实名状态：0 未实名 / 1 已实名
+  realname_policy?: string // 实名认证策略 (none:无需实名, before_order:先实名后充值/购买, after_order:先充值/购买后实名)
   network_status?: NetworkStatus // 网络状态：0 停机 / 1 开机（仅 card）
   current_package: string // 当前套餐名称（无则空）
   package_total_mb: number // 当前套餐总虚流量 MB
@@ -110,6 +111,7 @@ export interface AssetBoundCard {
   msisdn: string // 手机号
   network_status: NetworkStatus // 网络状态
   real_name_status: RealNameStatus // 实名状态
+  realname_policy?: string // 实名认证策略
   slot_position: number // 插槽位置
   is_current?: boolean // 是否为设备当前使用的卡
 }
@@ -165,6 +167,7 @@ export interface AssetRealtimeStatusResponse {
   // ===== 卡专属字段 =====
   network_status?: NetworkStatus // 网络状态（仅 card）
   real_name_status?: RealNameStatus // 实名状态（仅 card）
+  realname_policy?: string // 实名认证策略（仅 card）
   current_month_usage_mb?: number // 本月已用流量 MB（仅 card）
   last_sync_time?: string // 最后同步时间（仅 card）
 
diff --git a/src/types/api/device.ts b/src/types/api/device.ts
index f006f92..360a11e 100644
--- a/src/types/api/device.ts
+++ b/src/types/api/device.ts
@@ -154,10 +154,18 @@ export interface RecallDevicesResponse {
 
 // ========== 设备导入相关 ==========
 
+// 实名认证策略枚举
+export enum RealnamePolicy {
+  NONE = 'none', // 无需实名
+  BEFORE_ORDER = 'before_order', // 先实名后充值/购买
+  AFTER_ORDER = 'after_order' // 先充值/购买后实名
+}
+
 // 批量导入设备请求参数
 export interface ImportDeviceRequest {
   file_key: string // 对象存储文件路径(通过 /storage/upload-url 获取)
   batch_no?: string // 批次号
+  realname_policy?: RealnamePolicy // 实名认证策略 (none:无需实名, before_order:先实名后充值/购买, after_order:先充值/购买后实名)，默认 none
 }
 
 // 批量导入设备响应
diff --git a/src/types/api/packageManagement.ts b/src/types/api/packageManagement.ts
index a1ca420..8884d85 100644
--- a/src/types/api/packageManagement.ts
+++ b/src/types/api/packageManagement.ts
@@ -119,7 +119,7 @@ export interface PackageResponse {
   virtual_data_mb?: number // 虚流量额度（MB）
   virtual_ratio?: number // 虚流量比例（real_data_mb / virtual_data_mb）。启用虚流量时计算，否则为 1.0
   enable_virtual_data?: boolean // 是否启用虚流量
-  expiry_base?: ExpiryBase // 到期计时基准: from_activation(实名后开始计时) / from_purchase(购买即开始计时)
+  expiry_base?: ExpiryBase // 到期计时基准: from_activation(实名激活时起算) / from_purchase(购买时起算)
   cost_price?: number // 成本价（分）
   suggested_retail_price?: number // 建议零售价（分）
   current_commission_rate?: string // 当前返佣比例（仅代理用户可见）
@@ -160,7 +160,7 @@ export interface CreatePackageRequest {
   real_data_mb?: number | null // 真流量额度（MB），可选
   virtual_data_mb?: number | null // 虚流量额度（MB），可选
   enable_virtual_data?: boolean // 是否启用虚流量，可选
-  expiry_base?: ExpiryBase | null // 到期计时基准: from_activation(实名后开始计时) / from_purchase(购买即开始计时)，可选
+  expiry_base?: ExpiryBase | null // 到期计时基准: from_activation(实名激活时起算) / from_purchase(购买时起算)，可选
   cost_price: number // 成本价（分），必填
   suggested_retail_price?: number | null // 建议零售价（分），可选
 }
diff --git a/src/views/account-management/enterprise-customer/index.vue b/src/views/account-management/enterprise-customer/index.vue
index 33ba5d1..ebfcec4 100644
--- a/src/views/account-management/enterprise-customer/index.vue
+++ b/src/views/account-management/enterprise-customer/index.vue
@@ -49,43 +49,45 @@
         <ElDialog
           v-model="dialogVisible"
           :title="dialogType === 'add' ? '新增企业客户' : '编辑企业客户'"
-          width="40%"
+          width="50%"
         >
           <ElForm ref="formRef" :model="form" :rules="rules" label-width="100px">
-            <ElFormItem label="企业编号" prop="enterprise_code">
-              <div style="display: flex; gap: 8px">
-                <ElInput
-                  v-model="form.enterprise_code"
-                  placeholder="请输入企业编号或点击生成"
-                  :disabled="dialogType === 'edit'"
-                  clearable
-                  style="flex: 1"
-                />
-                <CodeGeneratorButton
-                  v-if="dialogType === 'add'"
-                  code-type="enterprise"
-                  @generated="handleCodeGenerated"
-                />
-              </div>
-            </ElFormItem>
             <ElRow :gutter="20">
+              <ElCol :span="12">
+                <ElFormItem label="企业编号" prop="enterprise_code">
+                  <ElInput
+                    v-model="form.enterprise_code"
+                    placeholder="请输入企业编号或点击生成"
+                    :disabled="dialogType === 'edit'"
+                    clearable
+                  >
+                    <template #append>
+                      <ElButton v-if="dialogType === 'add'" @click="handleGenerateEnterpriseCode"
+                        >生成编码</ElButton
+                      >
+                    </template>
+                  </ElInput>
+                </ElFormItem>
+              </ElCol>
               <ElCol :span="12">
                 <ElFormItem label="企业名称" prop="enterprise_name">
                   <ElInput v-model="form.enterprise_name" placeholder="请输入企业名称" />
                 </ElFormItem>
               </ElCol>
+            </ElRow>
+            <ElRow :gutter="20">
               <ElCol :span="12">
                 <ElFormItem label="法人代表" prop="legal_person">
                   <ElInput v-model="form.legal_person" placeholder="请输入法人代表" />
                 </ElFormItem>
               </ElCol>
-            </ElRow>
-            <ElRow :gutter="20">
               <ElCol :span="12">
                 <ElFormItem label="营业执照号" prop="business_license">
                   <ElInput v-model="form.business_license" placeholder="请输入营业执照号" />
                 </ElFormItem>
               </ElCol>
+            </ElRow>
+            <ElRow :gutter="20">
               <ElCol :span="12">
                 <ElFormItem label="所在地区" prop="region">
                   <ElCascader
@@ -99,8 +101,6 @@
                   />
                 </ElFormItem>
               </ElCol>
-            </ElRow>
-            <ElRow :gutter="20">
               <!-- 只有非代理账号才显示归属店铺选择 -->
               <ElCol :span="12" v-if="!isAgentAccount">
                 <ElFormItem label="归属店铺" prop="owner_shop_id">
@@ -211,7 +211,7 @@
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { useAuth } from '@/composables/useAuth'
   import { useUserStore } from '@/store/modules/user'
-  import CodeGeneratorButton from '@/components/business/CodeGeneratorButton.vue'
+  import { generateEnterpriseCode } from '@/utils/codeGenerator'
   import { formatDateTime } from '@/utils/business/format'
   import { regionData } from '@/utils/constants/regionData'
 
@@ -742,8 +742,9 @@
   }
 
   // 处理企业编码生成
-  const handleCodeGenerated = (code: string) => {
-    form.enterprise_code = code
+  const handleGenerateEnterpriseCode = () => {
+    form.enterprise_code = generateEnterpriseCode()
+    ElMessage.success('编码生成成功')
   }
 
   // 提交表单
diff --git a/src/views/asset-management/asset-information/components/BasicInfoCard.vue b/src/views/asset-management/asset-information/components/BasicInfoCard.vue
index 2f8a942..d23e40a 100644
--- a/src/views/asset-management/asset-information/components/BasicInfoCard.vue
+++ b/src/views/asset-management/asset-information/components/BasicInfoCard.vue
@@ -37,6 +37,9 @@
             {{ getRealNameStatusName(cardInfo?.real_name_status) }}
           </ElTag>
         </ElDescriptionsItem>
+        <ElDescriptionsItem label="实名认证策略">
+          {{ getRealnamePolicyName(cardInfo?.realname_policy) }}
+        </ElDescriptionsItem>
 
         <ElDescriptionsItem label="店铺">{{ cardInfo?.shop_name || '-' }}</ElDescriptionsItem>
         <ElDescriptionsItem label="套餐系列">{{ cardInfo?.series_name || '-' }}</ElDescriptionsItem>
@@ -92,6 +95,9 @@
             {{ getRealNameStatusName(currentCard?.real_name_status) }}
           </ElTag>
         </ElDescriptionsItem>
+        <ElDescriptionsItem label="实名认证策略">
+          {{ getRealnamePolicyName(cardInfo?.realname_policy) }}
+        </ElDescriptionsItem>
         <ElDescriptionsItem label="设备名称">{{ cardInfo?.device_name || '-' }}</ElDescriptionsItem>
         <ElDescriptionsItem label="在线状态">
           <ElTag :type="getOnlineStatusType(cardInfo?.online_status)" size="small">
@@ -167,9 +173,9 @@
             </div>
           </template>
         </ElTableColumn>
-        <ElTableColumn prop="msisdn" label="MSISDN" min-width="140" />
-        <ElTableColumn prop="carrier_name" label="运营商" width="120" />
-        <ElTableColumn prop="slot_position" label="卡槽位置" align="center" width="130">
+        <ElTableColumn prop="msisdn" label="MSISDN" min-width="120" />
+        <ElTableColumn prop="carrier_name" label="运营商" min-width="120" />
+        <ElTableColumn prop="slot_position" label="卡槽位置" width="130">
           <template #default="scope">
             <div style="display: flex; gap: 10px; align-items: center; justify-content: center">
               <span>SIM-{{ scope.row.slot_position }}</span>
@@ -177,20 +183,25 @@
             </div>
           </template>
         </ElTableColumn>
-        <ElTableColumn label="网络状态" align="center" width="100">
+        <ElTableColumn label="网络状态" width="100">
           <template #default="scope">
             <ElTag :type="scope.row.network_status === 1 ? 'success' : 'danger'" size="small">
               {{ scope.row.network_status === 1 ? '正常' : '停机' }}
             </ElTag>
           </template>
         </ElTableColumn>
-        <ElTableColumn label="实名状态" align="center" width="100">
+        <ElTableColumn label="实名状态" width="100">
           <template #default="scope">
             <ElTag :type="getRealNameStatusType(scope.row.real_name_status)" size="small">
               {{ getRealNameStatusName(scope.row.real_name_status) }}
             </ElTag>
           </template>
         </ElTableColumn>
+        <ElTableColumn label="实名认证策略" width="180">
+          <template #default="scope">
+            {{ getRealnamePolicyName(scope.row.realname_policy) }}
+          </template>
+        </ElTableColumn>
         <ElTableColumn label="实名时间" width="180">
           <template #default="scope">
             {{ scope.row.real_name_at ? formatDateTime(scope.row.real_name_at) : '-' }}
@@ -511,6 +522,7 @@
     formatDuration,
     getRealNameStatusName,
     getRealNameStatusType,
+    getRealnamePolicyName,
     getAssetStatusName,
     getAssetStatusType,
     getOnlineStatusName,
diff --git a/src/views/asset-management/asset-information/composables/useAssetFormatters.ts b/src/views/asset-management/asset-information/composables/useAssetFormatters.ts
index 3d82d71..f61a110 100644
--- a/src/views/asset-management/asset-information/composables/useAssetFormatters.ts
+++ b/src/views/asset-management/asset-information/composables/useAssetFormatters.ts
@@ -65,6 +65,17 @@ export function useAssetFormatters(deviceRealtime?: Ref<any>) {
     return map[status] || 'info'
   }
 
+  // 获取实名认证策略名称
+  const getRealnamePolicyName = (policy?: string) => {
+    if (!policy) return '-'
+    const policyMap: Record<string, string> = {
+      none: '无需实名',
+      before_order: '先实名后充值/购买',
+      after_order: '先充值/购买后实名'
+    }
+    return policyMap[policy] || policy
+  }
+
   // 获取资产状态名称
   const getAssetStatusName = (status?: number) => {
     if (status === undefined || status === null) return '未知'
@@ -232,6 +243,7 @@ export function useAssetFormatters(deviceRealtime?: Ref<any>) {
     formatIccidWithDashes,
     getRealNameStatusName,
     getRealNameStatusType,
+    getRealnamePolicyName,
     getAssetStatusName,
     getAssetStatusType,
     getOnlineStatusName,
diff --git a/src/views/asset-management/asset-information/composables/useAssetInfo.ts b/src/views/asset-management/asset-information/composables/useAssetInfo.ts
index 12a401c..9f3077d 100644
--- a/src/views/asset-management/asset-information/composables/useAssetInfo.ts
+++ b/src/views/asset-management/asset-information/composables/useAssetInfo.ts
@@ -59,6 +59,7 @@ export function useAssetInfo() {
           series_id: data.series_id,
           series_name: data.series_name,
           real_name_status: data.real_name_status,
+          realname_policy: data.realname_policy,
           real_name_at: data.real_name_at,
           activated_at: data.activated_at,
           created_at: data.created_at,
diff --git a/src/views/asset-management/asset-information/types.ts b/src/views/asset-management/asset-information/types.ts
index 6d9889f..2708b43 100644
--- a/src/views/asset-management/asset-information/types.ts
+++ b/src/views/asset-management/asset-information/types.ts
@@ -16,6 +16,7 @@ export interface AssetInfo {
   msisdn?: string
   carrier_name?: string
   real_name_status?: number
+  realname_policy?: string
   network_status?: string
   current_month_used_data?: number
   device_type?: string
@@ -35,6 +36,7 @@ export interface BindingCard {
   is_current: boolean
   status?: number
   carrier_name?: string
+  realname_policy?: string
 }
 
 // 设备实时信息接口
diff --git a/src/views/asset-management/task-management/device-task/index.vue b/src/views/asset-management/task-management/device-task/index.vue
index f60812a..fcd315c 100644
--- a/src/views/asset-management/task-management/device-task/index.vue
+++ b/src/views/asset-management/task-management/device-task/index.vue
@@ -77,6 +77,37 @@
         </ElButton>
       </div>
 
+      <ElRow :gutter="20">
+        <ElCol :span="12">
+          <ElFormItem label="批次号" prop="batch_no">
+            <ElInput
+              v-model="importForm.batch_no"
+              placeholder="请输入批次号或点击生成"
+              :maxlength="100"
+              clearable
+            >
+              <template #append>
+                <ElButton @click="handleGenerateBatchNo">生成编码</ElButton>
+              </template>
+            </ElInput>
+          </ElFormItem>
+        </ElCol>
+        <ElCol :span="12">
+          <ElFormItem label="实名认证策略">
+            <ElSelect
+              v-model="importForm.realname_policy"
+              placeholder="默认无需实名"
+              clearable
+              style="width: 100%"
+            >
+              <ElOption label="无需实名" value="none" />
+              <ElOption label="先实名后充值/购买" value="before_order" />
+              <ElOption label="先充值/购买后实名" value="after_order" />
+            </ElSelect>
+          </ElFormItem>
+        </ElCol>
+      </ElRow>
+
       <ElUpload
         ref="uploadRef"
         drag
@@ -122,6 +153,7 @@
   import { StorageService } from '@/api/modules/storage'
   import type { DeviceImportTask, DeviceImportTaskStatus } from '@/types/api/device'
   import { RoutesAlias } from '@/router/routesAlias'
+  import { generatePackageCode } from '@/utils/codeGenerator'
 
   defineOptions({ name: 'DeviceTask' })
 
@@ -134,6 +166,10 @@
   const fileList = ref<File[]>([])
   const uploading = ref(false)
   const importDialogVisible = ref(false)
+  const importForm = reactive({
+    batch_no: '',
+    realname_policy: '' as '' | 'none' | 'before_order' | 'after_order'
+  })
 
   // 搜索表单初始值
   const initialSearchState = {
@@ -507,9 +543,18 @@
     fileList.value = []
   }
 
+  // 生成批次号
+  const handleGenerateBatchNo = () => {
+    const code = generatePackageCode().replace('PKG', 'DEV')
+    importForm.batch_no = code
+    ElMessage.success('批次号生成成功')
+  }
+
   // 取消导入
   const handleCancelImport = () => {
     clearFiles()
+    importForm.batch_no = ''
+    importForm.realname_policy = ''
     importDialogVisible.value = false
   }
 
@@ -548,7 +593,8 @@
       ElMessage.info('正在创建导入任务...')
       const importRes = await DeviceService.importDevices({
         file_key,
-        batch_no: `DEV-${Date.now()}`
+        batch_no: importForm.batch_no || undefined,
+        realname_policy: importForm.realname_policy || undefined
       })
 
       if (importRes.code !== 0) {
diff --git a/src/views/asset-management/task-management/iot-card-task/index.vue b/src/views/asset-management/task-management/iot-card-task/index.vue
index fc340da..b364654 100644
--- a/src/views/asset-management/task-management/iot-card-task/index.vue
+++ b/src/views/asset-management/task-management/iot-card-task/index.vue
@@ -119,35 +119,72 @@
         </ElButton>
       </div>
 
-      <ElFormItem label="运营商" required style="margin-bottom: 20px">
-        <ElSelect
-          v-model="selectedCarrierId"
-          placeholder="请输入运营商名称搜索"
-          style="width: 100%"
-          filterable
-          remote
-          :remote-method="handleCarrierSearch"
-          :loading="carrierLoading"
-          clearable
-        >
-          <ElOption
-            v-for="carrier in carrierList"
-            :key="carrier.id"
-            :label="carrier.carrier_name"
-            :value="carrier.id"
-          />
-        </ElSelect>
-      </ElFormItem>
+      <ElRow :gutter="20">
+        <ElCol :span="12">
+          <ElFormItem label="运营商" required>
+            <ElSelect
+              v-model="selectedCarrierId"
+              placeholder="请输入运营商名称搜索"
+              style="width: 100%"
+              filterable
+              remote
+              :remote-method="handleCarrierSearch"
+              :loading="carrierLoading"
+              clearable
+            >
+              <ElOption
+                v-for="carrier in carrierList"
+                :key="carrier.id"
+                :label="carrier.carrier_name"
+                :value="carrier.id"
+              />
+            </ElSelect>
+          </ElFormItem>
+        </ElCol>
+        <ElCol :span="12">
+          <ElFormItem label="卡业务类型">
+            <ElSelect
+              v-model="selectedCardCategory"
+              placeholder="请选择卡业务类型"
+              style="width: 100%"
+            >
+              <ElOption label="普通卡" value="normal" />
+              <ElOption label="行业卡" value="industry" />
+            </ElSelect>
+          </ElFormItem>
+        </ElCol>
+      </ElRow>
 
-      <ElFormItem label="卡业务类型" style="margin-bottom: 20px">
-        <ElSelect v-model="selectedCardCategory" placeholder="请选择卡业务类型" style="width: 100%">
-          <ElOption label="普通卡" value="normal" />
-          <ElOption label="行业卡" value="industry" />
-        </ElSelect>
-        <div style="margin-top: 4px; font-size: 12px; color: var(--el-text-color-secondary)">
-          默认为普通卡，可选择行业卡
-        </div>
-      </ElFormItem>
+      <ElRow :gutter="20">
+        <ElCol :span="12">
+          <ElFormItem label="批次号" prop="batch_no">
+            <ElInput
+              v-model="importForm.batch_no"
+              placeholder="请输入批次号或点击生成"
+              :maxlength="100"
+              clearable
+            >
+              <template #append>
+                <ElButton @click="handleGenerateBatchNo">生成编码</ElButton>
+              </template>
+            </ElInput>
+          </ElFormItem>
+        </ElCol>
+        <ElCol :span="12">
+          <ElFormItem label="实名认证策略">
+            <ElSelect
+              v-model="importForm.realname_policy"
+              placeholder="默认无需实名"
+              clearable
+              style="width: 100%"
+            >
+              <ElOption label="无需实名" value="none" />
+              <ElOption label="先实名后充值/购买" value="before_order" />
+              <ElOption label="先充值/购买后实名" value="after_order" />
+            </ElSelect>
+          </ElFormItem>
+        </ElCol>
+      </ElRow>
 
       <ElUpload
         ref="uploadRef"
@@ -200,6 +237,7 @@
   import { useAuth } from '@/composables/useAuth'
   import { formatDateTime } from '@/utils/business/format'
   import { StorageService } from '@/api/modules/storage'
+  import { generatePackageCode } from '@/utils/codeGenerator'
   import { RoutesAlias } from '@/router/routesAlias'
   import type { IotCardImportTask, IotCardImportTaskStatus } from '@/types/api/card'
   import type { Carrier } from '@/types/api'
@@ -224,6 +262,10 @@
   const failDataLoading = ref(false)
   const failedItems = ref<any[]>([])
   const currentFailTask = ref<IotCardImportTask | null>(null)
+  const importForm = reactive({
+    batch_no: '',
+    realname_policy: '' as '' | 'none' | 'before_order' | 'after_order'
+  })
 
   // 搜索表单初始值
   const initialSearchState = {
@@ -682,10 +724,19 @@
     selectedCarrierId.value = undefined
   }
 
+  // 生成批次号
+  const handleGenerateBatchNo = () => {
+    const code = generatePackageCode().replace('PKG', 'IOT')
+    importForm.batch_no = code
+    ElMessage.success('批次号生成成功')
+  }
+
   // 取消导入
   const handleCancelImport = () => {
     clearFiles()
-    selectedCardCategory.value = 'normal' // 重置为默认值
+    selectedCardCategory.value = 'normal'
+    importForm.batch_no = ''
+    importForm.realname_policy = ''
     importDialogVisible.value = false
   }
 
@@ -755,8 +806,9 @@
       const importRes = await CardService.importIotCards({
         carrier_id: selectedCarrierId.value,
         file_key,
-        batch_no: `IOT-${Date.now()}`,
-        card_category: selectedCardCategory.value // 新增卡业务类型
+        batch_no: importForm.batch_no || undefined,
+        card_category: selectedCardCategory.value,
+        realname_policy: importForm.realname_policy || undefined
       })
 
       if (importRes.code !== 0) {
diff --git a/src/views/package-management/package-list/detail.vue b/src/views/package-management/package-list/detail.vue
index 7be9e2e..9340574 100644
--- a/src/views/package-management/package-list/detail.vue
+++ b/src/views/package-management/package-list/detail.vue
@@ -104,7 +104,7 @@
           label: '到期计时基准',
           formatter: (_, data) => {
             if (!data.expiry_base) return '--'
-            return data.expiry_base === 'from_activation' ? '实名后开始计时' : '购买即开始计时'
+            return data.expiry_base === 'from_activation' ? '实名激活时起算' : '购买时起算'
           }
         },
         {
diff --git a/src/views/package-management/package-list/index.vue b/src/views/package-management/package-list/index.vue
index 63f3267..d4e1027 100644
--- a/src/views/package-management/package-list/index.vue
+++ b/src/views/package-management/package-list/index.vue
@@ -47,35 +47,36 @@
         <ElDialog
           v-model="dialogVisible"
           :title="dialogType === 'add' ? '新增套餐' : '编辑套餐'"
-          width="45%"
+          width="50%"
           :close-on-click-modal="false"
           @closed="handleDialogClosed"
         >
           <ElForm ref="formRef" :model="form" :rules="rules" label-width="120px">
             <ElRow :gutter="20">
-              <ElCol :span="24">
+              <ElCol :span="12">
                 <ElFormItem label="套餐编码" prop="package_code">
-                  <div style="display: flex; gap: 8px">
-                    <ElInput
-                      v-model="form.package_code"
-                      placeholder="请输入套餐编码或点击生成"
-                      :disabled="dialogType === 'edit'"
-                      clearable
-                    />
-                    <ElButton v-if="dialogType === 'add'" @click="handleGeneratePackageCode">
-                      生成编码
-                    </ElButton>
-                  </div>
+                  <ElInput
+                    v-model="form.package_code"
+                    placeholder="请输入套餐编码或点击生成"
+                    :disabled="dialogType === 'edit'"
+                    clearable
+                  >
+                    <template #append>
+                      <ElButton v-if="dialogType === 'add'" @click="handleGeneratePackageCode"
+                        >生成编码</ElButton
+                      >
+                    </template>
+                  </ElInput>
                 </ElFormItem>
               </ElCol>
-            </ElRow>
-
-            <ElRow :gutter="20">
               <ElCol :span="12">
                 <ElFormItem label="套餐名称" prop="package_name">
                   <ElInput v-model="form.package_name" placeholder="请输入套餐名称" clearable />
                 </ElFormItem>
               </ElCol>
+            </ElRow>
+
+            <ElRow :gutter="20">
               <ElCol :span="12">
                 <ElFormItem label="所属系列" prop="series_id">
                   <ElSelect
@@ -248,8 +249,8 @@
                     style="width: 100%"
                     clearable
                   >
-                    <ElOption label="实名后开始计时" value="from_activation" />
-                    <ElOption label="购买即开始计时" value="from_purchase" />
+                    <ElOption label="实名激活时起算" value="from_activation" />
+                    <ElOption label="购买时起算" value="from_purchase" />
                   </ElSelect>
                 </ElFormItem>
               </ElCol>
diff --git a/src/views/package-management/package-series/index.vue b/src/views/package-management/package-series/index.vue
index e706883..1414986 100644
--- a/src/views/package-management/package-series/index.vue
+++ b/src/views/package-management/package-series/index.vue
@@ -48,25 +48,23 @@
         <ElDialog
           v-model="dialogVisible"
           :title="dialogType === 'add' ? '新增套餐系列' : '编辑套餐系列'"
-          width="45%"
+          width="30%"
           :close-on-click-modal="false"
         >
           <ElForm ref="formRef" :model="form" :rules="rules" label-width="120px">
             <ElFormItem label="系列编码" prop="series_code">
-              <div style="display: flex; gap: 8px">
-                <ElInput
-                  v-model="form.series_code"
-                  placeholder="请输入系列编码或点击生成"
-                  :disabled="dialogType === 'edit'"
-                  clearable
-                  style="flex: 1"
-                />
-                <CodeGeneratorButton
-                  v-if="dialogType === 'add'"
-                  code-type="series"
-                  @generated="handleCodeGenerated"
-                />
-              </div>
+              <ElInput
+                v-model="form.series_code"
+                placeholder="请输入系列编码或点击生成"
+                :disabled="dialogType === 'edit'"
+                clearable
+              >
+                <template #append>
+                  <ElButton v-if="dialogType === 'add'" @click="handleGenerateSeriesCode"
+                    >生成编码</ElButton
+                  >
+                </template>
+              </ElInput>
             </ElFormItem>
             <ElFormItem label="系列名称" prop="series_name">
               <ElInput v-model="form.series_name" placeholder="请输入系列名称" clearable />
@@ -383,7 +381,7 @@
   import type { SearchFormItem } from '@/types'
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { useAuth } from '@/composables/useAuth'
-  import CodeGeneratorButton from '@/components/business/CodeGeneratorButton.vue'
+  import { generateSeriesCode } from '@/utils/codeGenerator'
   import { formatDateTime } from '@/utils/business/format'
   import {
     CommonStatus,
@@ -872,12 +870,13 @@
   }
 
   // 处理编码生成
-  const handleCodeGenerated = (code: string) => {
-    form.series_code = code
+  const handleGenerateSeriesCode = () => {
+    form.series_code = generateSeriesCode()
     // 清除该字段的验证错误提示
     nextTick(() => {
       formRef.value?.clearValidate('series_code')
     })
+    ElMessage.success('编码生成成功')
   }
 
   // 删除套餐系列
diff --git a/src/views/package-management/series-grants/index.vue b/src/views/package-management/series-grants/index.vue
index 5a5505b..dc3cb6e 100644
--- a/src/views/package-management/series-grants/index.vue
+++ b/src/views/package-management/series-grants/index.vue
@@ -209,7 +209,7 @@
         <ElDialog
           v-model="dialogVisible"
           :title="dialogType === 'add' ? '新增代理系列授权' : '编辑代理系列授权'"
-          width="45%"
+          width="40%"
           :close-on-click-modal="false"
           @closed="handleDialogClosed"
         >
diff --git a/src/views/shop-management/list/index.vue b/src/views/shop-management/list/index.vue
index 8293f6a..8954a28 100644
--- a/src/views/shop-management/list/index.vue
+++ b/src/views/shop-management/list/index.vue
@@ -58,15 +58,15 @@
               </ElCol>
               <ElCol :span="12" v-if="dialogType === 'add'">
                 <ElFormItem label="店铺编号" prop="shop_code">
-                  <div style="display: flex; gap: 8px">
-                    <ElInput
-                      v-model="formData.shop_code"
-                      placeholder="请输入店铺编号或点击生成"
-                      clearable
-                      style="flex: 1"
-                    />
-                    <CodeGeneratorButton code-type="shop" @generated="handleCodeGenerated" />
-                  </div>
+                  <ElInput
+                    v-model="formData.shop_code"
+                    placeholder="请输入店铺编号或点击生成"
+                    clearable
+                  >
+                    <template #append>
+                      <ElButton @click="handleGenerateShopCode">生成编码</ElButton>
+                    </template>
+                  </ElInput>
                 </ElFormItem>
               </ElCol>
             </ElRow>
@@ -286,7 +286,7 @@
   import type { FormRules } from 'element-plus'
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { useAuth } from '@/composables/useAuth'
-  import CodeGeneratorButton from '@/components/business/CodeGeneratorButton.vue'
+  import { generateShopCode } from '@/utils/codeGenerator'
   import { ShopService, RoleService } from '@/api/modules'
   import type { SearchFormItem } from '@/types'
   import type { ShopResponse, ShopRoleResponse } from '@/types/api'
@@ -646,12 +646,13 @@
   })
 
   // 处理编码生成
-  const handleCodeGenerated = (code: string) => {
-    formData.shop_code = code
+  const handleGenerateShopCode = () => {
+    formData.shop_code = generateShopCode()
     // 清除该字段的验证错误提示
     nextTick(() => {
       formRef.value?.clearValidate('shop_code')
     })
+    ElMessage.success('编码生成成功')
   }
 
   // 处理地区选择变化
diff --git a/src/views/system/carrier-management/index.vue b/src/views/system/carrier-management/index.vue
index 8253e6a..ff68c44 100644
--- a/src/views/system/carrier-management/index.vue
+++ b/src/views/system/carrier-management/index.vue
@@ -49,20 +49,18 @@
         >
           <ElForm ref="formRef" :model="form" :rules="rules" label-width="120px">
             <ElFormItem label="运营商编码" prop="carrier_code">
-              <div style="display: flex; gap: 8px">
-                <ElInput
-                  v-model="form.carrier_code"
-                  placeholder="请输入运营商编码或点击生成"
-                  :disabled="dialogType === 'edit'"
-                  clearable
-                  style="flex: 1"
-                />
-                <CodeGeneratorButton
-                  v-if="dialogType === 'add'"
-                  code-type="carrier"
-                  @generated="handleCodeGenerated"
-                />
-              </div>
+              <ElInput
+                v-model="form.carrier_code"
+                placeholder="请输入运营商编码或点击生成"
+                :disabled="dialogType === 'edit'"
+                clearable
+              >
+                <template #append>
+                  <ElButton v-if="dialogType === 'add'" @click="handleGenerateCarrierCode"
+                    >生成编码</ElButton
+                  >
+                </template>
+              </ElInput>
             </ElFormItem>
             <ElFormItem label="运营商名称" prop="carrier_name">
               <ElInput v-model="form.carrier_name" placeholder="请输入运营商名称" />
@@ -154,7 +152,7 @@
   import type { SearchFormItem } from '@/types'
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { useAuth } from '@/composables/useAuth'
-  import CodeGeneratorButton from '@/components/business/CodeGeneratorButton.vue'
+  import { generateCarrierCode } from '@/utils/codeGenerator'
   import { formatDateTime } from '@/utils/business/format'
   import {
     CommonStatus,
@@ -498,12 +496,13 @@
   }
 
   // 处理编码生成
-  const handleCodeGenerated = (code: string) => {
-    form.carrier_code = code
+  const handleGenerateCarrierCode = () => {
+    form.carrier_code = generateCarrierCode()
     // 清除该字段的验证错误提示
     nextTick(() => {
       formRef.value?.clearValidate('carrier_code')
     })
+    ElMessage.success('编码生成成功')
   }
 
   // 删除运营商