This commit is contained in:
@@ -559,7 +559,10 @@
|
||||
{{ getBindingStopButtonText(bindingCard) }}
|
||||
</ElButton>
|
||||
<ElButton
|
||||
v-if="hasAuth('bound_card:update_realname_status')"
|
||||
v-if="
|
||||
canEditRestrictedAsset(userStore.info.user_type) &&
|
||||
hasAuth('bound_card:update_realname_status')
|
||||
"
|
||||
type="primary"
|
||||
size="default"
|
||||
@click="handleUpdateBindingCardRealnameStatus(bindingCard)"
|
||||
@@ -618,6 +621,25 @@
|
||||
<slot name="package-list" />
|
||||
</div>
|
||||
|
||||
<ElDescriptions v-if="cardInfo" :column="1" border
|
||||
><ElDescriptionsItem label="首次购买套餐时间"
|
||||
>{{ cardInfo.first_purchase_at ? formatDateTime(cardInfo.first_purchase_at) : '-'
|
||||
}}<ElButton
|
||||
v-if="cardInfo.asset_id > 0"
|
||||
link
|
||||
type="primary"
|
||||
@click="firstPurchaseVisible = true"
|
||||
>首次购买套餐记录</ElButton
|
||||
></ElDescriptionsItem
|
||||
></ElDescriptions
|
||||
>
|
||||
<SilenceRecordsDialog
|
||||
v-if="firstPurchaseVisible && cardInfo"
|
||||
:key="`${cardInfo.asset_type}:${cardInfo.asset_id}`"
|
||||
:asset-id="cardInfo.asset_id"
|
||||
:asset-type="cardInfo.asset_type"
|
||||
@close="firstPurchaseVisible = false"
|
||||
/>
|
||||
<!-- IoT卡操作按钮 -->
|
||||
<ElAlert
|
||||
v-if="startErrorMessage"
|
||||
@@ -659,7 +681,10 @@
|
||||
实名认证策略
|
||||
</ElButton>
|
||||
<ElButton
|
||||
v-if="hasAuth('iot_info:update_realname_status')"
|
||||
v-if="
|
||||
canEditRestrictedAsset(userStore.info.user_type) &&
|
||||
hasAuth('iot_info:update_realname_status')
|
||||
"
|
||||
type="primary"
|
||||
@click="handleShowUpdateRealnameStatus"
|
||||
>
|
||||
@@ -700,7 +725,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { useWindowSize } from '@vueuse/core'
|
||||
import {
|
||||
ElCard,
|
||||
@@ -728,6 +753,9 @@
|
||||
import { JULY_PERMISSIONS } from '@/config/constants'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { formatDateTime } from '@/utils/business/format'
|
||||
import SilenceRecordsDialog from '@/components/business/package-silence/SilenceRecordsDialog.vue'
|
||||
const firstPurchaseVisible = ref(false)
|
||||
import { canEditRestrictedAsset } from '@/utils/business/packageSilence'
|
||||
import {
|
||||
getExpiryEstimateText,
|
||||
getExpiryEstimateTooltip,
|
||||
@@ -787,6 +815,7 @@
|
||||
gateway_extend?: string
|
||||
total_virtual_used_mb?: number | null
|
||||
total_virtual_remaining_mb?: number | null
|
||||
first_purchase_at?: string | null
|
||||
estimated_final_expires_at?: string | null
|
||||
days_until_final_expiry?: number | null
|
||||
expiry_estimate_status?: ExpiryEstimateStatus
|
||||
@@ -867,6 +896,12 @@
|
||||
})
|
||||
|
||||
const { hasAuth } = useAuth()
|
||||
watch(
|
||||
() => [props.cardInfo.asset_id, props.cardInfo.asset_type],
|
||||
() => {
|
||||
firstPurchaseVisible.value = false
|
||||
}
|
||||
)
|
||||
const userStore = useUserStore()
|
||||
const isSubjectActivityView = computed(() => [3, 4].includes(Number(userStore.info.user_type)))
|
||||
const auditTarget = computed(() => {
|
||||
@@ -932,7 +967,9 @@
|
||||
: 'device_info:auto_polling'
|
||||
})
|
||||
|
||||
const canShowPolling = computed(() => hasAuth(pollingPermission.value))
|
||||
const canShowPolling = computed(
|
||||
() => canEditRestrictedAsset(userStore.info.user_type) && hasAuth(pollingPermission.value)
|
||||
)
|
||||
|
||||
const canShowCardMonthUsage = computed(() => {
|
||||
const userType = Number(userStore.info.user_type ?? 0)
|
||||
@@ -1235,6 +1272,7 @@
|
||||
|
||||
// 处理轮询开关变化
|
||||
const handlePollingChange = (value: string | number | boolean) => {
|
||||
if (!canEditRestrictedAsset(userStore.info.user_type)) return
|
||||
emit('update:pollingEnabled', Boolean(value))
|
||||
}
|
||||
|
||||
@@ -1296,6 +1334,7 @@
|
||||
}
|
||||
|
||||
const handleShowUpdateRealnameStatus = () => {
|
||||
if (!canEditRestrictedAsset(userStore.info.user_type)) return
|
||||
emit('showUpdateRealnameStatus')
|
||||
}
|
||||
|
||||
@@ -1347,6 +1386,7 @@
|
||||
}
|
||||
|
||||
const handleUpdateBindingCardRealnameStatus = (card: BindingCard) => {
|
||||
if (!canEditRestrictedAsset(userStore.info.user_type)) return
|
||||
emit('updateBindingCardRealnameStatus', { card })
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -25,6 +25,11 @@
|
||||
<ElAlert v-else-if="errorMsg" :title="errorMsg" type="warning" :closable="false" />
|
||||
|
||||
<template v-else-if="currentPackage">
|
||||
<SilenceSummary
|
||||
:silence="currentPackage.silence"
|
||||
:usage-id="currentPackage.package_usage_id ?? currentPackage.id"
|
||||
@changed="emit('refresh')"
|
||||
/>
|
||||
<!-- 流量使用情况 - 横向进度条卡片 -->
|
||||
<div v-if="shouldShowTrafficCard" class="flow-progress-card">
|
||||
<!-- 管理员视角:始终显示真流量和虚流量 -->
|
||||
@@ -278,6 +283,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import SilenceSummary from '@/components/business/package-silence/SilenceSummary.vue'
|
||||
import {
|
||||
ElDivider,
|
||||
ElButton,
|
||||
@@ -356,6 +362,7 @@
|
||||
})
|
||||
|
||||
const emit = defineEmits<{
|
||||
refresh: []
|
||||
showRecharge: []
|
||||
navigateToDevice: [deviceNo: string]
|
||||
}>()
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
<ElOption label="已失效" :value="4" />
|
||||
</ElSelect>
|
||||
<ElButton
|
||||
v-if="canAccessOrderCategory(userInfo.user_type)"
|
||||
type="primary"
|
||||
:disabled="Boolean(props.boundDeviceId)"
|
||||
@click="handleShowRecharge"
|
||||
@@ -50,6 +51,19 @@
|
||||
class="package-table"
|
||||
border
|
||||
>
|
||||
<ElTableColumn
|
||||
v-if="packageList.some((pkg) => !!pkg.silence)"
|
||||
label="沉默期"
|
||||
min-width="260"
|
||||
><template #default="{ row }"
|
||||
><SilenceSummary
|
||||
v-if="row.silence"
|
||||
:silence="row.silence"
|
||||
:usage-id="row.package_usage_id ?? row.id"
|
||||
@changed="emit('refresh')"
|
||||
/><span v-else>-</span></template
|
||||
></ElTableColumn
|
||||
>
|
||||
<ElTableColumn
|
||||
label="订单号"
|
||||
:width="orderNoColumnWidth"
|
||||
@@ -63,7 +77,10 @@
|
||||
type="primary"
|
||||
link
|
||||
@click="handleOrderNoClick(scope.row)"
|
||||
v-if="hasAuth('order:package_list_detail')"
|
||||
v-if="
|
||||
canAccessOrderCategory(userInfo.user_type) &&
|
||||
hasAuth('order:package_list_detail')
|
||||
"
|
||||
>
|
||||
<span
|
||||
class="order-no-link__text"
|
||||
@@ -422,6 +439,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import SilenceSummary from '@/components/business/package-silence/SilenceSummary.vue'
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import {
|
||||
ElCard,
|
||||
@@ -450,6 +468,7 @@
|
||||
import { AssetService } from '@/api/modules'
|
||||
import { useAuth } from '@/composables/useAuth'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { canEditRestrictedAsset, canAccessOrderCategory } from '@/utils/business/packageSilence'
|
||||
import { storeToRefs } from 'pinia'
|
||||
import CreateRefundDialog from '@/components/business/CreateRefundDialog.vue'
|
||||
|
||||
@@ -467,6 +486,7 @@
|
||||
)
|
||||
const isProductionMode = import.meta.env.MODE === 'production'
|
||||
const canUseAdjustmentInCurrentEnv = (permission: string) => {
|
||||
if (!canEditRestrictedAsset(userInfo.value.user_type)) return false
|
||||
if (isProductionMode) {
|
||||
return userInfo.value.user_type === 2 && hasAuth(permission)
|
||||
}
|
||||
@@ -563,6 +583,7 @@
|
||||
}
|
||||
|
||||
const handleShowUsedDataDialog = (row: PackageInfo) => {
|
||||
if (!canUpdateUsedData.value) return
|
||||
selectedPackage.value = row
|
||||
usedDataForm.data_usage = row.real_used_mb ?? 0
|
||||
usedDataForm.unit = 'MB'
|
||||
@@ -570,6 +591,7 @@
|
||||
}
|
||||
|
||||
const handleShowExpiresAtDialog = (row: PackageInfo) => {
|
||||
if (!canUpdateExpiresAt.value) return
|
||||
selectedPackage.value = row
|
||||
expiresAtForm.expires_at = row.expires_at ? formatDateTime(row.expires_at) : ''
|
||||
expiresAtDialogVisible.value = true
|
||||
@@ -597,6 +619,7 @@
|
||||
)
|
||||
|
||||
const handleSubmitUsedData = async () => {
|
||||
if (!canUpdateUsedData.value) return
|
||||
if (!usedDataFormRef.value || !selectedPackage.value) return
|
||||
const packageUsageId = getPackageUsageId(selectedPackage.value)
|
||||
if (!props.assetIdentifier || packageUsageId === undefined) {
|
||||
@@ -605,7 +628,7 @@
|
||||
}
|
||||
|
||||
await usedDataFormRef.value.validate(async (valid) => {
|
||||
if (!valid) return
|
||||
if (!valid || !canUpdateUsedData.value) return
|
||||
usedDataSubmitting.value = true
|
||||
try {
|
||||
const dataUsageMb = getUsedDataMb()
|
||||
@@ -622,6 +645,7 @@
|
||||
}
|
||||
|
||||
const handleSubmitExpiresAt = async () => {
|
||||
if (!canUpdateExpiresAt.value) return
|
||||
if (!expiresAtFormRef.value || !selectedPackage.value) return
|
||||
const packageUsageId = getPackageUsageId(selectedPackage.value)
|
||||
if (!props.assetIdentifier || packageUsageId === undefined) {
|
||||
@@ -630,7 +654,7 @@
|
||||
}
|
||||
|
||||
await expiresAtFormRef.value.validate(async (valid) => {
|
||||
if (!valid) return
|
||||
if (!valid || !canUpdateExpiresAt.value) return
|
||||
expiresAtSubmitting.value = true
|
||||
try {
|
||||
await AssetService.updateAssetPackageExpiresAt(props.assetIdentifier, packageUsageId, {
|
||||
@@ -773,6 +797,7 @@
|
||||
}
|
||||
|
||||
const handleShowRecharge = () => {
|
||||
if (!canAccessOrderCategory(userInfo.value.user_type)) return
|
||||
emit('showRecharge')
|
||||
}
|
||||
|
||||
|
||||
@@ -2,10 +2,16 @@
|
||||
<ElDialog
|
||||
v-model="visible"
|
||||
title="套餐充值"
|
||||
width="40%"
|
||||
width="min(760px, 96vw)"
|
||||
@closed="handleDialogClosed"
|
||||
>
|
||||
<ElForm ref="formRef" :model="form" :rules="rules" label-width="80px">
|
||||
<SilencePurchaseFields
|
||||
v-if="hasAuth(PACKAGE_SILENCE_PERMISSIONS.override)"
|
||||
v-model:days="form.silence_period_days"
|
||||
v-model:reason="form.silence_reason"
|
||||
:disabled="loading"
|
||||
/>
|
||||
<ElFormItem label="资产信息">
|
||||
<span style="font-weight: bold; color: #409eff">
|
||||
{{ assetIdentifier }}
|
||||
@@ -131,7 +137,16 @@
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import VoucherUpload from '@/components/business/VoucherUpload.vue'
|
||||
import { hasVoucherKeys, toVoucherKeyList } from '@/utils/business'
|
||||
import { normalizeApiError } from '@/utils/business/apiError'
|
||||
import { gatewayError } from '@/utils/business/gateway'
|
||||
import { useAuth } from '@/composables/useAuth'
|
||||
import {
|
||||
canAccessOrderCategory,
|
||||
silencePurchaseFields,
|
||||
assertSilenceResponse
|
||||
} from '@/utils/business/packageSilence'
|
||||
import { PACKAGE_SILENCE_PERMISSIONS } from '@/config/constants/packageSilence'
|
||||
import { pollingScope } from '@/utils/business/pollingScheduler'
|
||||
import SilencePurchaseFields from '@/components/business/package-silence/SilencePurchaseFields.vue'
|
||||
|
||||
interface Props {
|
||||
modelValue: boolean
|
||||
@@ -150,6 +165,7 @@
|
||||
const emit = defineEmits<Emits>()
|
||||
|
||||
const userStore = useUserStore()
|
||||
const { hasAuth } = useAuth()
|
||||
const formRef = ref<FormInstance>()
|
||||
const uploadRef = ref<InstanceType<typeof VoucherUpload>>()
|
||||
const loading = ref(false)
|
||||
@@ -159,10 +175,19 @@
|
||||
const packagesEmptyWithSeriesId = ref(false)
|
||||
|
||||
const form = reactive({
|
||||
silence_period_days: null as number | null,
|
||||
silence_reason: '',
|
||||
package_id: undefined as number | undefined,
|
||||
payment_method: 'wallet' as 'wallet' | 'offline',
|
||||
payment_voucher_key: [] as string[]
|
||||
})
|
||||
watch(
|
||||
() => [props.assetIdentifier, form.package_id],
|
||||
() => {
|
||||
form.silence_period_days = null
|
||||
form.silence_reason = ''
|
||||
}
|
||||
)
|
||||
|
||||
const rules = computed<FormRules>(() => {
|
||||
const baseRules: FormRules = {
|
||||
@@ -313,6 +338,9 @@
|
||||
}
|
||||
|
||||
const handleConfirm = async () => {
|
||||
const origin = pollingScope(userStore),
|
||||
identifier = props.assetIdentifier
|
||||
if (!canAccessOrderCategory(userStore.info.user_type) || loading.value) return
|
||||
if (!formRef.value) return
|
||||
if (voucherUploading.value) {
|
||||
ElMessage.warning('支付凭证上传中,请稍候')
|
||||
@@ -320,7 +348,13 @@
|
||||
}
|
||||
|
||||
const valid = await formRef.value.validate().catch(() => false)
|
||||
if (!valid) return
|
||||
if (
|
||||
!valid ||
|
||||
!canAccessOrderCategory(userStore.info.user_type) ||
|
||||
origin !== pollingScope(userStore) ||
|
||||
identifier !== props.assetIdentifier
|
||||
)
|
||||
return
|
||||
|
||||
if (!form.package_id) {
|
||||
ElMessage.error('请选择套餐')
|
||||
@@ -336,6 +370,11 @@
|
||||
|
||||
try {
|
||||
const data: CreateOrderRequest = {
|
||||
...silencePurchaseFields(
|
||||
hasAuth(PACKAGE_SILENCE_PERMISSIONS.override),
|
||||
form.silence_period_days,
|
||||
form.silence_reason
|
||||
),
|
||||
identifier: props.assetIdentifier,
|
||||
package_ids: [form.package_id],
|
||||
payment_method: form.payment_method
|
||||
@@ -345,7 +384,7 @@
|
||||
data.payment_voucher_key = toVoucherKeyList(form.payment_voucher_key)
|
||||
}
|
||||
|
||||
const response = await OrderService.createOrder(data)
|
||||
const response = assertSilenceResponse(await OrderService.createOrder(data))
|
||||
if (response.code !== 0) {
|
||||
ElMessage.error(response.msg || '订单创建失败')
|
||||
return
|
||||
@@ -364,13 +403,15 @@
|
||||
if (error === 'cancel') {
|
||||
return
|
||||
}
|
||||
console.error('创建订单失败:', error)
|
||||
ElMessage.error(gatewayError(error))
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleDialogClosed = () => {
|
||||
form.silence_period_days = null
|
||||
form.silence_reason = ''
|
||||
formRef.value?.resetFields()
|
||||
form.package_id = undefined
|
||||
form.payment_method = 'wallet'
|
||||
|
||||
@@ -238,6 +238,7 @@ export function useAssetInfo() {
|
||||
card_category: data.card_category || '',
|
||||
activation_status: data.activation_status,
|
||||
enable_polling: data.enable_polling,
|
||||
first_purchase_at: data.first_purchase_at,
|
||||
|
||||
// 设备专属字段 (asset_type === 'device')
|
||||
device_name: data.device_name || '',
|
||||
|
||||
@@ -4,6 +4,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { AssetService, DeviceService } from '@/api/modules'
|
||||
import { PollingSchedulerService } from '@/api/modules/pollingScheduler'
|
||||
import { gatewayData, gatewayError } from '@/utils/business/gateway'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { canEditRestrictedAsset } from '@/utils/business/packageSilence'
|
||||
import { formatRemainingTime, FrontendRateLimitError } from '@/utils/business/apiRateLimit'
|
||||
|
||||
/**
|
||||
@@ -11,6 +13,7 @@ import { formatRemainingTime, FrontendRateLimitError } from '@/utils/business/ap
|
||||
* Manages asset operation methods (enable/disable cards, device operations, etc.)
|
||||
*/
|
||||
export function useAssetOperations(cardInfo: Ref<any>, refreshAssetFn?: () => Promise<void>) {
|
||||
const user = useUserStore()
|
||||
// Loading states
|
||||
const enableCardLoading = ref(false)
|
||||
const startFailureMessage = ref('')
|
||||
@@ -97,6 +100,7 @@ export function useAssetOperations(cardInfo: Ref<any>, refreshAssetFn?: () => Pr
|
||||
* Manually deactivate card with strong warning confirmation
|
||||
*/
|
||||
const manualDeactivateCard = async () => {
|
||||
if (!canEditRestrictedAsset(user.info.user_type)) return false
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'手动停用后卡片将永久停用,无法再次使用。此操作不可逆,请谨慎操作。确认要手动停用吗?',
|
||||
@@ -111,6 +115,7 @@ export function useAssetOperations(cardInfo: Ref<any>, refreshAssetFn?: () => Pr
|
||||
manualDeactivateCardLoading.value = true
|
||||
const identifier =
|
||||
cardInfo.value.asset_type === 'card' ? cardInfo.value.iccid : cardInfo.value.virtual_no
|
||||
if (!canEditRestrictedAsset(user.info.user_type)) return false
|
||||
const res = await AssetService.deactivateAsset(identifier)
|
||||
if (res.code === 0) {
|
||||
ElMessage.success('手动停用成功')
|
||||
@@ -250,6 +255,7 @@ export function useAssetOperations(cardInfo: Ref<any>, refreshAssetFn?: () => Pr
|
||||
* Update polling status
|
||||
*/
|
||||
const updatePollingStatus = async (enabled: boolean) => {
|
||||
if (!canEditRestrictedAsset(user.info.user_type)) return false
|
||||
if (pollingLoading.value) return false
|
||||
if (!cardInfo.value) {
|
||||
ElMessage.warning('无法更新轮询状态:缺少资产信息')
|
||||
@@ -265,7 +271,7 @@ export function useAssetOperations(cardInfo: Ref<any>, refreshAssetFn?: () => Pr
|
||||
const lines = impact[enabled ? 'enable' : 'disable']
|
||||
if (!Array.isArray(lines) || !lines.length) throw new Error('未获取到有效操作影响说明')
|
||||
await ElMessageBox.confirm(lines.join('\n'), '确认轮询开关影响', { type: 'warning' })
|
||||
if (cardInfo.value !== target) return false
|
||||
if (cardInfo.value !== target || !canEditRestrictedAsset(user.info.user_type)) return false
|
||||
const response = await AssetService.updatePollingStatus(identifier, {
|
||||
enable_polling: enabled
|
||||
})
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
<template #current-package>
|
||||
<CurrentPackageCard
|
||||
:current-package="currentPackage"
|
||||
@refresh="handlePackageRefresh"
|
||||
:loading="currentPackageLoading"
|
||||
:error-msg="currentPackageErrorMsg"
|
||||
:bound-device-id="cardInfo.bound_device_id"
|
||||
@@ -209,6 +210,8 @@
|
||||
import StopResumeRecords from '@/components/business/gateway/StopResumeRecords.vue'
|
||||
import PollingStateDialog from '@/components/business/polling/PollingStateDialog.vue'
|
||||
import { SCHEDULER_PERMISSIONS } from '@/config/constants/pollingScheduler'
|
||||
import { canEditRestrictedAsset, canAccessOrderCategory } from '@/utils/business/packageSilence'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import {
|
||||
formatRemainingTime,
|
||||
FrontendRateLimitError,
|
||||
@@ -670,6 +673,7 @@
|
||||
* 显示更新实名状态对话框
|
||||
*/
|
||||
const showUpdateRealnameStatusDialog = () => {
|
||||
if (!canEditRestrictedAsset(useUserStore().info.user_type)) return
|
||||
realnameStatusAsset = cardInfo.value
|
||||
updateRealnameStatusDialogVisible.value = true
|
||||
}
|
||||
@@ -687,6 +691,7 @@
|
||||
* 显示绑定卡更新实名状态对话框
|
||||
*/
|
||||
const handleUpdateBindingCardRealnameStatus = (payload: { card: any }) => {
|
||||
if (!canEditRestrictedAsset(useUserStore().info.user_type)) return
|
||||
bindingCardRealnameStatusAsset = cardInfo.value
|
||||
bindingCardRealnameStatusIccid.value = payload.card.iccid
|
||||
bindingCardRealnameStatusValue.value = payload.card.real_name_status ?? 0
|
||||
@@ -774,6 +779,7 @@
|
||||
* 显示套餐充值对话框
|
||||
*/
|
||||
const showRechargeDialog = () => {
|
||||
if (!canAccessOrderCategory(useUserStore().info.user_type)) return
|
||||
rechargeDialogVisible.value = true
|
||||
}
|
||||
|
||||
@@ -886,6 +892,7 @@
|
||||
* 跳转到订单详情
|
||||
*/
|
||||
const handleNavigateToOrder = (orderId: number) => {
|
||||
if (!canAccessOrderCategory(useUserStore().info.user_type)) return
|
||||
router.push(`${RoutesAlias.OrderDetail}/${orderId}`)
|
||||
}
|
||||
|
||||
|
||||
@@ -1023,6 +1023,8 @@
|
||||
import PollingBatchDialog from '@/components/business/polling/PollingBatchDialog.vue'
|
||||
import { SCHEDULER_PERMISSIONS } from '@/config/constants/pollingScheduler'
|
||||
import { canPollingBatch, pollingScope } from '@/utils/business/pollingScheduler'
|
||||
import { firstPurchaseRange } from '@/utils/business/packageSilence'
|
||||
import FirstPurchaseCell from '@/components/business/package-silence/FirstPurchaseCell.vue'
|
||||
import { formatDateTime } from '@/utils/business/format'
|
||||
import {
|
||||
getExpiryEstimateText,
|
||||
@@ -1370,6 +1372,7 @@
|
||||
|
||||
// 搜索表单初始值
|
||||
const initialSearchState = {
|
||||
first_purchase_range: [] as string[],
|
||||
enable_polling: undefined as boolean | undefined,
|
||||
virtual_no: '',
|
||||
imei: '',
|
||||
@@ -1433,6 +1436,18 @@
|
||||
|
||||
// 搜索表单配置
|
||||
const searchFormItems: SearchFormItem[] = [
|
||||
{
|
||||
label: '首次购买起止',
|
||||
prop: 'first_purchase_range',
|
||||
type: 'datetimerange',
|
||||
config: {
|
||||
rangeSeparator: '至',
|
||||
startPlaceholder: '开始时间',
|
||||
endPlaceholder: '结束时间',
|
||||
valueFormat: 'YYYY-MM-DDTHH:mm:ssZ',
|
||||
clearable: true
|
||||
}
|
||||
},
|
||||
{
|
||||
label: '设备号',
|
||||
prop: 'virtual_no',
|
||||
@@ -1650,6 +1665,7 @@
|
||||
|
||||
// 列配置
|
||||
const columnOptions = [
|
||||
{ label: '首次购买套餐时间', prop: 'first_purchase_at' },
|
||||
{ label: '是否轮询', prop: 'enable_polling' },
|
||||
{ label: '设备号', prop: 'virtual_no' },
|
||||
{ label: 'IMEI', prop: 'imei' },
|
||||
@@ -1910,6 +1926,13 @@
|
||||
|
||||
// 动态列配置
|
||||
const { columnChecks, columns } = useCheckedColumns(() => [
|
||||
{
|
||||
prop: 'first_purchase_at',
|
||||
label: '首次购买套餐时间',
|
||||
width: 180,
|
||||
formatter: (row: Device) =>
|
||||
h(FirstPurchaseCell, { assetId: row.id, assetType: 'device', time: row.first_purchase_at })
|
||||
},
|
||||
{
|
||||
prop: 'virtual_no',
|
||||
label: '设备号',
|
||||
@@ -2248,6 +2271,7 @@
|
||||
device_name: searchForm.device_name || undefined,
|
||||
status: searchForm.status,
|
||||
enable_polling: searchForm.enable_polling ?? undefined,
|
||||
...firstPurchaseRange(searchForm.first_purchase_range),
|
||||
activation_status: searchForm.activation_status ?? undefined,
|
||||
real_name_status: searchForm.real_name_status ?? undefined,
|
||||
batch_no: searchForm.batch_no || undefined,
|
||||
@@ -2275,6 +2299,7 @@
|
||||
|
||||
const exportQuery = computed(() => {
|
||||
const query: Record<string, unknown> = {
|
||||
...firstPurchaseRange(searchForm.first_purchase_range),
|
||||
virtual_no: searchForm.virtual_no || undefined,
|
||||
imei: searchForm.imei || undefined,
|
||||
device_name: searchForm.device_name || undefined,
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<template><ExportTaskList /></template>
|
||||
<script setup lang="ts">
|
||||
import ExportTaskList from '../export-task-list/index.vue'
|
||||
defineOptions({ name: 'ExportAgentOrder' })
|
||||
</script>
|
||||
@@ -0,0 +1,5 @@
|
||||
<template><ExportTaskList /></template>
|
||||
<script setup lang="ts">
|
||||
import ExportTaskList from '../export-task-list/index.vue'
|
||||
defineOptions({ name: 'ExportOnlineOrder' })
|
||||
</script>
|
||||
@@ -0,0 +1,5 @@
|
||||
<template><ExportTaskList /></template>
|
||||
<script setup lang="ts">
|
||||
import ExportTaskList from '../export-task-list/index.vue'
|
||||
defineOptions({ name: 'ExportPlatformOrder' })
|
||||
</script>
|
||||
@@ -0,0 +1,5 @@
|
||||
<template><ExportTaskList /></template>
|
||||
<script setup lang="ts">
|
||||
import ExportTaskList from '../export-task-list/index.vue'
|
||||
defineOptions({ name: 'ExportSilenceOrder' })
|
||||
</script>
|
||||
@@ -0,0 +1,5 @@
|
||||
<template><ExportTaskList /></template>
|
||||
<script setup lang="ts">
|
||||
import ExportTaskList from '../export-task-list/index.vue'
|
||||
defineOptions({ name: 'ExportSilenceUsage' })
|
||||
</script>
|
||||
@@ -48,6 +48,7 @@
|
||||
} from '@/config/constants'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { isPollingPlatform } from '@/utils/business/pollingScheduler'
|
||||
import { canAccessExportTaskScene } from '@/config/constants/exportTask'
|
||||
import { formatDateTime } from '@/utils/business/format'
|
||||
import type { ExportTaskDetail } from '@/types/api'
|
||||
import { ExportTaskStatus } from '@/types/api'
|
||||
@@ -70,6 +71,8 @@
|
||||
throw error
|
||||
}
|
||||
if (res.code !== 0 || !res.data) throw new Error(res.msg || '获取导出任务详情失败')
|
||||
if (!canAccessExportTaskScene(res.data.scene, user.info.user_type))
|
||||
throw Object.assign(new Error('当前账号无权访问该类订单导出'), { status: 403 })
|
||||
if (isPollingPlatformExport(res.data.scene) && !isPollingPlatform(user.info.user_type))
|
||||
throw Object.assign(new Error('仅平台账号可查看该导出任务'), { status: 403 })
|
||||
return res.data
|
||||
@@ -84,6 +87,7 @@
|
||||
const canViewDetail = computed(
|
||||
() =>
|
||||
!!taskPermissions.value &&
|
||||
canAccessExportTaskScene(taskDetail.value?.scene, user.info.user_type) &&
|
||||
hasAuth(taskPermissions.value.detail) &&
|
||||
(!isPollingPlatformExport(taskDetail.value?.scene) || isPollingPlatform(user.info.user_type))
|
||||
)
|
||||
|
||||
@@ -49,6 +49,7 @@
|
||||
import { getExportTaskSceneConfig, isPollingPlatformExport } from '@/config/constants'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { isPollingPlatform } from '@/utils/business/pollingScheduler'
|
||||
import { canAccessExportTaskScene } from '@/config/constants/exportTask'
|
||||
import type { SearchFormItem } from '@/types'
|
||||
import type { ExportTaskDetail, ExportTaskItem, ExportTaskScene } from '@/types/api'
|
||||
import { ExportTaskStatus } from '@/types/api'
|
||||
@@ -61,7 +62,8 @@
|
||||
const { hasAuth } = useAuth()
|
||||
const user = useUserStore()
|
||||
const allowedScene = (scene: ExportTaskScene) =>
|
||||
!isPollingPlatformExport(scene) || isPollingPlatform(user.info.user_type)
|
||||
canAccessExportTaskScene(scene, user.info.user_type) &&
|
||||
(!isPollingPlatformExport(scene) || isPollingPlatform(user.info.user_type))
|
||||
const loading = ref(false)
|
||||
const taskList = ref<ExportTaskItem[]>([])
|
||||
const defaultSceneConfig = getExportTaskSceneConfig('device')!
|
||||
|
||||
@@ -1075,6 +1075,8 @@
|
||||
import PollingBatchDialog from '@/components/business/polling/PollingBatchDialog.vue'
|
||||
import { SCHEDULER_PERMISSIONS } from '@/config/constants/pollingScheduler'
|
||||
import { canPollingBatch, pollingScope } from '@/utils/business/pollingScheduler'
|
||||
import { firstPurchaseRange } from '@/utils/business/packageSilence'
|
||||
import FirstPurchaseCell from '@/components/business/package-silence/FirstPurchaseCell.vue'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { storeToRefs } from 'pinia'
|
||||
import { formatDateTime } from '@/utils/business/format'
|
||||
@@ -1614,6 +1616,7 @@
|
||||
[key: string]: any
|
||||
} = {
|
||||
enable_polling: undefined,
|
||||
first_purchase_range: [] as string[],
|
||||
status: undefined,
|
||||
network_status: undefined,
|
||||
real_name_status: undefined,
|
||||
@@ -1976,6 +1979,18 @@
|
||||
})
|
||||
|
||||
const formItems: SearchFormItem[] = baseFormItems
|
||||
formItems.push({
|
||||
label: '首次购买起止',
|
||||
prop: 'first_purchase_range',
|
||||
type: 'datetimerange',
|
||||
config: {
|
||||
rangeSeparator: '至',
|
||||
startPlaceholder: '开始时间',
|
||||
endPlaceholder: '结束时间',
|
||||
valueFormat: 'YYYY-MM-DDTHH:mm:ssZ',
|
||||
clearable: true
|
||||
}
|
||||
})
|
||||
formItems.push({
|
||||
label: '是否轮询',
|
||||
prop: 'enable_polling',
|
||||
@@ -1989,6 +2004,7 @@
|
||||
|
||||
// 列配置
|
||||
const columnOptions = [
|
||||
{ label: '首次购买套餐时间', prop: 'first_purchase_at' },
|
||||
{ label: 'ICCID', prop: 'iccid' },
|
||||
{ label: 'IMEI', prop: 'gateway_card_imei' },
|
||||
{ label: 'MSISDN', prop: 'msisdn' },
|
||||
@@ -2110,6 +2126,13 @@
|
||||
|
||||
// 动态列配置
|
||||
const { columnChecks, columns } = useCheckedColumns(() => [
|
||||
{
|
||||
prop: 'first_purchase_at',
|
||||
label: '首次购买套餐时间',
|
||||
width: 180,
|
||||
formatter: (row: StandaloneIotCard) =>
|
||||
h(FirstPurchaseCell, { assetId: row.id, assetType: 'card', time: row.first_purchase_at })
|
||||
},
|
||||
{
|
||||
prop: 'iccid',
|
||||
label: 'ICCID',
|
||||
@@ -2423,10 +2446,10 @@
|
||||
Object.entries(formFilters).forEach(([key, value]) => {
|
||||
if (value === undefined || value === null || value === '') return
|
||||
if (Array.isArray(value) && value.length === 0) return
|
||||
query[key] = value
|
||||
if (key !== 'first_purchase_range') query[key] = value
|
||||
})
|
||||
|
||||
return query
|
||||
return { ...query, ...firstPurchaseRange(formFilters.first_purchase_range) }
|
||||
})
|
||||
|
||||
const showExportDialog = () => {
|
||||
@@ -2444,8 +2467,10 @@
|
||||
const params: Record<string, any> = {
|
||||
page: pagination.page,
|
||||
page_size: pagination.pageSize,
|
||||
...formFilters
|
||||
...formFilters,
|
||||
...firstPurchaseRange(formFilters.first_purchase_range)
|
||||
}
|
||||
delete params.first_purchase_range
|
||||
Object.keys(params).forEach((key) => {
|
||||
if (params[key] === '' || params[key] === undefined) {
|
||||
delete params[key]
|
||||
|
||||
@@ -297,8 +297,8 @@
|
||||
{
|
||||
label: '资产标识',
|
||||
prop: 'asset_identifier',
|
||||
type: 'input',
|
||||
config: { clearable: true, placeholder: 'ICCID / 虚拟号 / IMEI / SN / 接入号(精确匹配)' }
|
||||
type: 'business-select',
|
||||
config: { entity: 'asset' }
|
||||
},
|
||||
{
|
||||
label: '手机号',
|
||||
|
||||
@@ -131,11 +131,8 @@
|
||||
{
|
||||
label: '资产标识符',
|
||||
prop: 'asset_identifier',
|
||||
type: 'input',
|
||||
config: {
|
||||
clearable: true,
|
||||
placeholder: 'ICCID或设备号'
|
||||
}
|
||||
type: 'business-select',
|
||||
config: { entity: 'asset' }
|
||||
},
|
||||
{
|
||||
label: '来源店铺',
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
<ElFormItem label="申请退款金额">
|
||||
<ElInputNumber
|
||||
v-model="resubmitForm.requested_refund_amount"
|
||||
:min="1"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
:step="1"
|
||||
style="width: 100%"
|
||||
@@ -329,11 +329,8 @@
|
||||
{
|
||||
label: '资产标识',
|
||||
prop: 'asset_identifier',
|
||||
type: 'input',
|
||||
placeholder: '请输入ICCID或设备虚拟号',
|
||||
config: {
|
||||
clearable: true
|
||||
}
|
||||
type: 'business-select',
|
||||
config: { entity: 'asset' }
|
||||
},
|
||||
{
|
||||
label: '状态',
|
||||
@@ -864,7 +861,8 @@
|
||||
const handleShowResubmit = (row: Refund) => {
|
||||
currentRefund.value = row
|
||||
// 预填充原有数据
|
||||
resubmitForm.requested_refund_amount = fenToYuan(row.requested_refund_amount) || undefined
|
||||
resubmitForm.requested_refund_amount =
|
||||
row.requested_refund_amount == null ? undefined : fenToYuan(row.requested_refund_amount)
|
||||
resubmitForm.method = ''
|
||||
resubmitForm.customer_account_name = ''
|
||||
resubmitForm.customer_account_number = ''
|
||||
|
||||
5
src/views/order-management/agent-orders/index.vue
Normal file
5
src/views/order-management/agent-orders/index.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><OrderList category="agent" /></template>
|
||||
<script setup lang="ts">
|
||||
import OrderList from '../order-list/index.vue'
|
||||
defineOptions({ name: 'AgentOrderList' })
|
||||
</script>
|
||||
5
src/views/order-management/online-orders/index.vue
Normal file
5
src/views/order-management/online-orders/index.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><OrderList category="online" /></template>
|
||||
<script setup lang="ts">
|
||||
import OrderList from '../order-list/index.vue'
|
||||
defineOptions({ name: 'OnlineOrderList' })
|
||||
</script>
|
||||
@@ -110,7 +110,8 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { h, onMounted, ref, computed } from 'vue'
|
||||
import { h, onMounted, ref, computed, watch } from 'vue'
|
||||
import { pollingScope } from '@/utils/business/pollingScheduler'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElButton, ElCard, ElIcon, ElMessage, ElTable, ElTableColumn, ElTag } from 'element-plus'
|
||||
import { ArrowLeft, Loading } from '@element-plus/icons-vue'
|
||||
@@ -124,6 +125,7 @@
|
||||
OrderOperatorType
|
||||
} from '@/types/api'
|
||||
import { useAuth } from '@/composables/useAuth'
|
||||
import { canAccessOrderCategory } from '@/utils/business/packageSilence'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { formatDateTime } from '@/utils/business/format'
|
||||
import { hasVoucherKeys, toVoucherKeyList } from '@/utils/business'
|
||||
@@ -143,6 +145,13 @@
|
||||
|
||||
const loading = ref(false)
|
||||
const detailData = ref<OrderDetail | null>(null)
|
||||
watch(
|
||||
() => pollingScope(userStore),
|
||||
() => {
|
||||
detailData.value = null
|
||||
},
|
||||
{ flush: 'sync' }
|
||||
)
|
||||
const paymentVoucherFileKeys = ref<string[]>([])
|
||||
|
||||
// 格式化货币 - 将分转换为元
|
||||
@@ -424,6 +433,11 @@
|
||||
|
||||
// 获取详情数据
|
||||
const fetchDetail = async () => {
|
||||
const scope = pollingScope(userStore)
|
||||
if (!canAccessOrderCategory(userStore.info.user_type)) {
|
||||
detailData.value = null
|
||||
return
|
||||
}
|
||||
const id = Number(route.params.id)
|
||||
if (!id) {
|
||||
ElMessage.error('缺少ID参数')
|
||||
@@ -433,7 +447,11 @@
|
||||
loading.value = true
|
||||
try {
|
||||
const res = await OrderService.getOrderById(id)
|
||||
if (res.code === 0) {
|
||||
if (
|
||||
scope === pollingScope(userStore) &&
|
||||
canAccessOrderCategory(userStore.info.user_type) &&
|
||||
res.code === 0
|
||||
) {
|
||||
detailData.value = res.data
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
<template>
|
||||
<ArtTableFullScreen>
|
||||
<ArtTableFullScreen v-if="canReadCategory">
|
||||
<div class="order-list-page" id="table-full-screen">
|
||||
<!-- 搜索栏 -->
|
||||
<ArtSearchBar
|
||||
v-model:filter="searchForm"
|
||||
:filter="searchForm"
|
||||
@update:filter="(value) => Object.assign(searchForm, value)"
|
||||
:items="searchFormItems"
|
||||
show-expand
|
||||
:show-expand="searchFormItems.length >= 4"
|
||||
@reset="handleReset"
|
||||
label-width="90"
|
||||
@search="handleSearch"
|
||||
@@ -59,10 +60,16 @@
|
||||
<ElDialog
|
||||
v-model="createDialogVisible"
|
||||
:title="'创建订单'"
|
||||
width="40%"
|
||||
width="min(760px, 96vw)"
|
||||
@closed="handleCreateDialogClosed"
|
||||
>
|
||||
<ElForm ref="createFormRef" :model="createForm" :rules="createRules" label-width="80px">
|
||||
<SilencePurchaseFields
|
||||
v-if="hasAuth(PACKAGE_SILENCE_PERMISSIONS.override)"
|
||||
v-model:days="createForm.silence_period_days"
|
||||
v-model:reason="createForm.silence_reason"
|
||||
:disabled="createLoading"
|
||||
/>
|
||||
<ElFormItem :label="'订单类型'" prop="order_type">
|
||||
<ElSelect
|
||||
v-model="createForm.order_type"
|
||||
@@ -249,14 +256,15 @@
|
||||
<!-- 导出任务对话框 -->
|
||||
<ExportTaskCreateDialog
|
||||
v-model="exportDialogVisible"
|
||||
scene="order"
|
||||
:query="exportQuery"
|
||||
:scene="categoryConfig.scene"
|
||||
:query="props.category === 'all' ? exportQuery : { filters: exportQuery }"
|
||||
confirm-permission="orders:export"
|
||||
title="导出订单"
|
||||
:title="`导出${categoryConfig.title}`"
|
||||
/>
|
||||
</ElCard>
|
||||
</div>
|
||||
</ArtTableFullScreen>
|
||||
<ElEmpty v-else description="当前账号无权访问该类订单" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
@@ -303,8 +311,21 @@
|
||||
import ExportTaskCreateDialog from '@/components/business/ExportTaskCreateDialog.vue'
|
||||
import VoucherUpload from '@/components/business/VoucherUpload.vue'
|
||||
import { BULK_PURCHASE_PERMISSIONS } from '@/config/constants/bulkPurchase'
|
||||
import {
|
||||
ORDER_CATEGORY_CONFIG,
|
||||
PACKAGE_SILENCE_PERMISSIONS
|
||||
} from '@/config/constants/packageSilence'
|
||||
import {
|
||||
canAccessOrderCategory,
|
||||
assertSilenceResponse,
|
||||
silencePurchaseFields,
|
||||
type OrderCategory
|
||||
} from '@/utils/business/packageSilence'
|
||||
import { pollingScope } from '@/utils/business/pollingScheduler'
|
||||
import SilencePurchaseFields from '@/components/business/package-silence/SilencePurchaseFields.vue'
|
||||
|
||||
defineOptions({ name: 'OrderList' })
|
||||
const props = withDefaults(defineProps<{ category?: OrderCategory }>(), { category: 'all' })
|
||||
|
||||
type OrderSearchFormState = Omit<OrderQueryParams, 'is_expired'> & {
|
||||
is_expired?: number
|
||||
@@ -313,6 +334,10 @@
|
||||
const router = useRouter()
|
||||
const { hasAuth } = useAuth()
|
||||
const userStore = useUserStore()
|
||||
const canReadCategory = computed(() =>
|
||||
canAccessOrderCategory(userStore.info.user_type, props.category)
|
||||
)
|
||||
const categoryConfig = computed(() => ORDER_CATEGORY_CONFIG[props.category])
|
||||
|
||||
const loading = ref(false)
|
||||
const createLoading = ref(false)
|
||||
@@ -388,11 +413,9 @@
|
||||
{
|
||||
label: '资产标识符',
|
||||
prop: 'identifier',
|
||||
type: 'input',
|
||||
type: 'business-select',
|
||||
config: {
|
||||
maxlength: 30,
|
||||
clearable: true,
|
||||
placeholder: 'ICCID/VirtualNo/IMEI/MSISDN/SN'
|
||||
entity: 'asset'
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -598,6 +621,8 @@
|
||||
})
|
||||
|
||||
const createForm = reactive({
|
||||
silence_period_days: null as number | null,
|
||||
silence_reason: '',
|
||||
order_type: 'single_card' as OrderType,
|
||||
package_id: undefined as number | undefined, // 前端使用单选
|
||||
iot_card_id: null as number | null,
|
||||
@@ -609,6 +634,16 @@
|
||||
})
|
||||
|
||||
const orderList = ref<Order[]>([])
|
||||
watch(
|
||||
() => pollingScope(userStore),
|
||||
() => {
|
||||
orderList.value = []
|
||||
createDialogVisible.value = false
|
||||
exportDialogVisible.value = false
|
||||
paymentVoucherFileKeys.value = []
|
||||
},
|
||||
{ flush: 'sync' }
|
||||
)
|
||||
|
||||
// 套餐搜索相关
|
||||
const packageOptions = ref<PackageResponse[]>([])
|
||||
@@ -1127,6 +1162,8 @@
|
||||
watch(
|
||||
() => createForm.package_id,
|
||||
(packageId) => {
|
||||
createForm.silence_period_days = null
|
||||
createForm.silence_reason = ''
|
||||
if (packageId) {
|
||||
const selectedPackage = packageOptions.value.find((pkg) => pkg.id === packageId)
|
||||
if (selectedPackage?.is_gift) {
|
||||
@@ -1142,6 +1179,11 @@
|
||||
|
||||
// 获取订单列表
|
||||
const getTableData = async () => {
|
||||
if (!canReadCategory.value) {
|
||||
orderList.value = []
|
||||
return
|
||||
}
|
||||
const scope = pollingScope(userStore)
|
||||
loading.value = true
|
||||
try {
|
||||
const params: OrderQueryParams = {
|
||||
@@ -1160,8 +1202,14 @@
|
||||
start_time: searchForm.start_time || undefined,
|
||||
end_time: searchForm.end_time || undefined
|
||||
}
|
||||
const res = await OrderService.getOrders(params)
|
||||
if (res.code === 0) {
|
||||
const res = await (props.category === 'platform'
|
||||
? OrderService.getPlatformOrders(params)
|
||||
: props.category === 'agent'
|
||||
? OrderService.getAgentOrders(params)
|
||||
: props.category === 'online'
|
||||
? OrderService.getOnlineOrders(params)
|
||||
: OrderService.getOrders(params))
|
||||
if (scope === pollingScope(userStore) && canReadCategory.value && res.code === 0) {
|
||||
orderList.value = res.data.items || []
|
||||
pagination.total = res.data.total || 0
|
||||
}
|
||||
@@ -1236,6 +1284,7 @@
|
||||
|
||||
// 显示创建订单对话框
|
||||
const showCreateDialog = async () => {
|
||||
if (!canReadCategory.value || !hasAuth('orders:add')) return
|
||||
createDialogVisible.value = true
|
||||
// IoT卡和设备列表在用户搜索时才加载,不在此处预加载
|
||||
}
|
||||
@@ -1271,6 +1320,8 @@
|
||||
|
||||
// 对话框关闭后的清理
|
||||
const handleCreateDialogClosed = () => {
|
||||
createForm.silence_period_days = null
|
||||
createForm.silence_reason = ''
|
||||
// 重置表单(会同时清除验证状态)
|
||||
createFormRef.value?.resetFields()
|
||||
|
||||
@@ -1294,6 +1345,8 @@
|
||||
|
||||
// 创建订单
|
||||
const handleCreateOrder = async (formEl: FormInstance | undefined) => {
|
||||
const origin = pollingScope(userStore)
|
||||
if (!canReadCategory.value || !hasAuth('orders:add') || createLoading.value) return
|
||||
if (!formEl) return
|
||||
if (voucherUploading.value) {
|
||||
ElMessage.warning('支付凭证上传中,请稍候')
|
||||
@@ -1301,7 +1354,12 @@
|
||||
}
|
||||
|
||||
await formEl.validate(async (valid) => {
|
||||
if (valid) {
|
||||
if (
|
||||
valid &&
|
||||
canReadCategory.value &&
|
||||
origin === pollingScope(userStore) &&
|
||||
hasAuth('orders:add')
|
||||
) {
|
||||
createLoading.value = true
|
||||
try {
|
||||
// 获取 identifier (ICCID 或 VirtualNo)
|
||||
@@ -1352,6 +1410,11 @@
|
||||
|
||||
// 创建订单(后端接收数组,前端单选转为单元素数组)
|
||||
const data: CreateOrderRequest = {
|
||||
...silencePurchaseFields(
|
||||
hasAuth(PACKAGE_SILENCE_PERMISSIONS.override),
|
||||
createForm.silence_period_days,
|
||||
createForm.silence_reason
|
||||
),
|
||||
identifier,
|
||||
package_ids: [createForm.package_id],
|
||||
payment_method: createForm.payment_method
|
||||
@@ -1365,7 +1428,7 @@
|
||||
data.payment_voucher_key = toVoucherKeyList(createForm.payment_voucher_key)
|
||||
}
|
||||
|
||||
const res = await OrderService.createOrder(data)
|
||||
const res = assertSilenceResponse(await OrderService.createOrder(data))
|
||||
if (res.code !== 0) return
|
||||
|
||||
// 根据支付方式显示不同的成功消息
|
||||
@@ -1383,7 +1446,7 @@
|
||||
if (error === 'cancel') {
|
||||
return
|
||||
}
|
||||
console.error(error)
|
||||
ElMessage.error(error?.response?.data?.msg || error?.message || '订单创建失败')
|
||||
} finally {
|
||||
createLoading.value = false
|
||||
}
|
||||
@@ -1393,6 +1456,7 @@
|
||||
|
||||
// 查看订单详情
|
||||
const showOrderDetail = (row: Order) => {
|
||||
if (!canReadCategory.value) return
|
||||
router.push({
|
||||
path: `${RoutesAlias.OrderList}/detail/${row.id}`
|
||||
})
|
||||
@@ -1409,6 +1473,7 @@
|
||||
|
||||
// 取消订单
|
||||
const handleCancelOrder = (row: Order) => {
|
||||
if (!canReadCategory.value) return
|
||||
// 已支付的订单不能取消
|
||||
if (row.payment_status === 2) {
|
||||
ElMessage.warning('已支付的订单无法取消')
|
||||
@@ -1421,6 +1486,7 @@
|
||||
type: 'warning'
|
||||
})
|
||||
.then(async () => {
|
||||
if (!canReadCategory.value) return
|
||||
try {
|
||||
await OrderService.cancelOrder(row.id)
|
||||
ElMessage.success('订单已取消')
|
||||
|
||||
5
src/views/order-management/platform-orders/index.vue
Normal file
5
src/views/order-management/platform-orders/index.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><OrderList category="platform" /></template>
|
||||
<script setup lang="ts">
|
||||
import OrderList from '../order-list/index.vue'
|
||||
defineOptions({ name: 'PlatformOrderList' })
|
||||
</script>
|
||||
@@ -178,6 +178,22 @@
|
||||
}
|
||||
},
|
||||
{ label: '套餐默认生效条件', prop: 'default_expiry_base_name' },
|
||||
{
|
||||
label: '默认沉默期(天)',
|
||||
formatter: (_: unknown, data: PackageResponse) =>
|
||||
data.package_type === 'formal' ? String(data.silence_period_days ?? '未配置') : '不适用'
|
||||
},
|
||||
{
|
||||
label: '支持付费延期',
|
||||
formatter: (_: unknown, data: PackageResponse) =>
|
||||
data.package_type !== 'formal'
|
||||
? '不适用'
|
||||
: data.silence_extension_enabled == null
|
||||
? '-'
|
||||
: data.silence_extension_enabled
|
||||
? '是'
|
||||
: '否'
|
||||
},
|
||||
{
|
||||
label: '分配覆盖生效条件',
|
||||
prop: 'expiry_base_override_name',
|
||||
|
||||
@@ -60,11 +60,11 @@
|
||||
<ElDialog
|
||||
v-model="dialogVisible"
|
||||
:title="dialogType === 'add' ? '新增套餐' : '编辑套餐'"
|
||||
width="50%"
|
||||
width="min(960px, 96vw)"
|
||||
:close-on-click-modal="false"
|
||||
@closed="handleDialogClosed"
|
||||
>
|
||||
<ElForm ref="formRef" :model="form" :rules="rules" label-width="120px">
|
||||
<ElForm ref="formRef" :model="form" :rules="rules" label-width="150px">
|
||||
<ElRow :gutter="20">
|
||||
<ElCol :span="12">
|
||||
<ElFormItem label="套餐编码" prop="package_code">
|
||||
@@ -197,6 +197,13 @@
|
||||
</ElCol>
|
||||
</ElRow>
|
||||
|
||||
<PackageSilenceFields
|
||||
:package-type="form.package_type"
|
||||
:expiry-base="form.expiry_base"
|
||||
:required="form.silence_config_required"
|
||||
v-model:days="form.silence_period_days"
|
||||
v-model:enabled="form.silence_extension_enabled"
|
||||
/>
|
||||
<!-- 真流量额度 -->
|
||||
<ElRow :gutter="20">
|
||||
<ElCol :span="12">
|
||||
@@ -265,6 +272,7 @@
|
||||
<ElFormItem label="到期计时基准" prop="expiry_base">
|
||||
<ElSelect
|
||||
v-model="form.expiry_base"
|
||||
:disabled="originalExpiryBase === 'from_activation'"
|
||||
placeholder="请选择到期计时基准"
|
||||
style="width: 100%"
|
||||
clearable
|
||||
@@ -391,6 +399,8 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import PackageSilenceFields from '@/components/business/package-silence/PackageSilenceFields.vue'
|
||||
import { packageSilenceFields, assertSilenceResponse } from '@/utils/business/packageSilence'
|
||||
import { h, watch } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { PackageManageService, PackageSeriesService } from '@/api/modules'
|
||||
@@ -485,6 +495,7 @@
|
||||
|
||||
// 搜索表单初始值
|
||||
const initialSearchState = {
|
||||
silence_unconfigured: undefined as boolean | undefined,
|
||||
package_name: '',
|
||||
series_id: undefined as number | undefined,
|
||||
package_type: undefined as string | undefined,
|
||||
@@ -497,6 +508,13 @@
|
||||
|
||||
// 搜索表单配置
|
||||
const searchFormItems = computed<SearchFormItem[]>(() => [
|
||||
{
|
||||
label: '未配置沉默期',
|
||||
prop: 'silence_unconfigured',
|
||||
type: 'select',
|
||||
options: [{ label: '仅未配置', value: true }],
|
||||
config: { clearable: true }
|
||||
},
|
||||
{
|
||||
label: '套餐名称',
|
||||
prop: 'package_name',
|
||||
@@ -706,7 +724,11 @@
|
||||
})
|
||||
|
||||
// 表单数据
|
||||
const originalExpiryBase = ref<string | null>(null)
|
||||
const form = reactive<any>({
|
||||
silence_period_days: 30,
|
||||
silence_extension_enabled: true,
|
||||
silence_config_required: false,
|
||||
id: 0,
|
||||
package_code: '',
|
||||
package_name: '',
|
||||
@@ -786,7 +808,7 @@
|
||||
prop: 'package_name',
|
||||
label: '套餐名称',
|
||||
width: 200,
|
||||
fixed:true,
|
||||
fixed: true,
|
||||
showOverflowTooltip: true,
|
||||
formatter: (row: PackageResponse) => {
|
||||
const hasPermission = hasAuth('package:detail')
|
||||
@@ -1253,7 +1275,8 @@
|
||||
series_id: searchForm.series_id || undefined,
|
||||
package_type: searchForm.package_type || undefined,
|
||||
shelf_status: searchForm.shelf_status || undefined,
|
||||
status: searchForm.status ?? undefined
|
||||
status: searchForm.status ?? undefined,
|
||||
silence_unconfigured: searchForm.silence_unconfigured || undefined
|
||||
}
|
||||
const res = await PackageManageService.getPackages(params)
|
||||
if (res.code === 0) {
|
||||
@@ -1275,7 +1298,8 @@
|
||||
series_id: searchForm.series_id ?? undefined,
|
||||
package_type: searchForm.package_type || undefined,
|
||||
shelf_status: searchForm.shelf_status ?? undefined,
|
||||
status: searchForm.status ?? undefined
|
||||
status: searchForm.status ?? undefined,
|
||||
silence_unconfigured: searchForm.silence_unconfigured || undefined
|
||||
}
|
||||
|
||||
Object.keys(query).forEach((key) => {
|
||||
@@ -1318,6 +1342,10 @@
|
||||
|
||||
// 显示新增/编辑对话框
|
||||
const showDialog = async (type: string, row?: PackageResponse) => {
|
||||
originalExpiryBase.value = null
|
||||
form.silence_period_days = 30
|
||||
form.silence_extension_enabled = true
|
||||
form.silence_config_required = false
|
||||
dialogType.value = type
|
||||
|
||||
if (type === 'edit' && row) {
|
||||
@@ -1325,6 +1353,10 @@
|
||||
const res = await PackageManageService.getPackageDetail(row.id)
|
||||
if (res.code === 0 && res.data) {
|
||||
const data = res.data
|
||||
originalExpiryBase.value = data.expiry_base ?? null
|
||||
form.silence_period_days = data.silence_period_days ?? null
|
||||
form.silence_extension_enabled = data.silence_extension_enabled ?? true
|
||||
form.silence_config_required = data.silence_config_required ?? false
|
||||
form.id = data.id
|
||||
form.package_code = data.package_code
|
||||
form.package_name = data.package_name
|
||||
@@ -1461,6 +1493,7 @@
|
||||
const costPriceInCents = Math.round(form.cost_price * 100)
|
||||
|
||||
const data: any = {
|
||||
...packageSilenceFields(form, originalExpiryBase.value),
|
||||
package_name: form.package_name,
|
||||
package_type: form.package_type,
|
||||
duration_months: form.duration_months,
|
||||
@@ -1509,18 +1542,18 @@
|
||||
}
|
||||
|
||||
if (dialogType.value === 'add') {
|
||||
await PackageManageService.createPackage(data)
|
||||
assertSilenceResponse(await PackageManageService.createPackage(data))
|
||||
ElMessage.success('新增成功')
|
||||
} else {
|
||||
await PackageManageService.updatePackage(form.id, data)
|
||||
assertSilenceResponse(await PackageManageService.updatePackage(form.id, data))
|
||||
ElMessage.success('修改成功')
|
||||
}
|
||||
|
||||
dialogVisible.value = false
|
||||
formEl.resetFields()
|
||||
await getTableData()
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
} catch (error: any) {
|
||||
ElMessage.error(error?.response?.data?.msg || error?.message || '套餐保存失败')
|
||||
} finally {
|
||||
submitLoading.value = false
|
||||
}
|
||||
|
||||
@@ -702,7 +702,8 @@
|
||||
packageForm.value.expiry_base_override === 'default'
|
||||
? null
|
||||
: packageForm.value.expiry_base_override
|
||||
}
|
||||
},
|
||||
packageForm.value.package_id
|
||||
)
|
||||
}
|
||||
await ShopSeriesGrantService.manageGrantPackages(grantId, {
|
||||
@@ -778,7 +779,8 @@
|
||||
expiryForm.value.expiry_base_override === 'default'
|
||||
? null
|
||||
: expiryForm.value.expiry_base_override
|
||||
}
|
||||
},
|
||||
expiryForm.value.package_id
|
||||
)
|
||||
if (response.code === 0) {
|
||||
ElMessage.success('生效条件更新成功')
|
||||
|
||||
@@ -480,7 +480,8 @@
|
||||
packageForm.value.expiry_base_override === 'default'
|
||||
? null
|
||||
: packageForm.value.expiry_base_override
|
||||
}
|
||||
},
|
||||
packageForm.value.package_id
|
||||
)
|
||||
}
|
||||
await ShopSeriesGrantService.manageGrantPackages(grantId.value, {
|
||||
@@ -514,7 +515,8 @@
|
||||
expiryForm.value.expiry_base_override === 'default'
|
||||
? null
|
||||
: expiryForm.value.expiry_base_override
|
||||
}
|
||||
},
|
||||
expiryForm.value.package_id
|
||||
)
|
||||
if (response.code === 0) {
|
||||
ElMessage.success('生效条件更新成功')
|
||||
|
||||
5
src/views/package-management/silence-batches/detail.vue
Normal file
5
src/views/package-management/silence-batches/detail.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><SilenceDetail kind="batches" /></template>
|
||||
<script setup lang="ts">
|
||||
import SilenceDetail from '@/components/business/package-silence/SilenceDetail.vue'
|
||||
defineOptions({ name: 'SilenceBatchesDetail' })
|
||||
</script>
|
||||
5
src/views/package-management/silence-batches/index.vue
Normal file
5
src/views/package-management/silence-batches/index.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><SilenceManagement kind="batches" /></template>
|
||||
<script setup lang="ts">
|
||||
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
|
||||
defineOptions({ name: 'SilenceBatches' })
|
||||
</script>
|
||||
5
src/views/package-management/silence-orders/detail.vue
Normal file
5
src/views/package-management/silence-orders/detail.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><SilenceDetail kind="orders" /></template>
|
||||
<script setup lang="ts">
|
||||
import SilenceDetail from '@/components/business/package-silence/SilenceDetail.vue'
|
||||
defineOptions({ name: 'SilenceOrdersDetail' })
|
||||
</script>
|
||||
5
src/views/package-management/silence-orders/index.vue
Normal file
5
src/views/package-management/silence-orders/index.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><SilenceManagement kind="orders" /></template>
|
||||
<script setup lang="ts">
|
||||
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
|
||||
defineOptions({ name: 'SilenceOrders' })
|
||||
</script>
|
||||
5
src/views/package-management/silence-policies/index.vue
Normal file
5
src/views/package-management/silence-policies/index.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><SilenceManagement kind="policies" /></template>
|
||||
<script setup lang="ts">
|
||||
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
|
||||
defineOptions({ name: 'SilencePolicies' })
|
||||
</script>
|
||||
5
src/views/package-management/silence-usages/index.vue
Normal file
5
src/views/package-management/silence-usages/index.vue
Normal file
@@ -0,0 +1,5 @@
|
||||
<template><SilenceManagement kind="usages" /></template>
|
||||
<script setup lang="ts">
|
||||
import SilenceManagement from '@/components/business/package-silence/SilenceManagement.vue'
|
||||
defineOptions({ name: 'SilenceUsages' })
|
||||
</script>
|
||||
@@ -158,12 +158,17 @@
|
||||
],
|
||||
config: { clearable: true }
|
||||
},
|
||||
{ label: '资产标识', prop: 'identifier', type: 'input', config: { clearable: true } },
|
||||
{
|
||||
label: '关闭操作人 ID',
|
||||
label: '资产',
|
||||
prop: 'identifier',
|
||||
type: 'business-select',
|
||||
config: { entity: 'asset', allowed: platform.value && hasAuth(P.page) }
|
||||
},
|
||||
{
|
||||
label: '关闭操作人',
|
||||
prop: 'operator_id',
|
||||
type: 'input',
|
||||
config: { type: 'number', min: 0, clearable: true }
|
||||
type: 'business-select',
|
||||
config: { entity: 'account', includeSystem: true, allowed: platform.value && hasAuth(P.page) }
|
||||
},
|
||||
{
|
||||
label: '关闭时间起止',
|
||||
|
||||
@@ -220,10 +220,10 @@
|
||||
// 搜索表单配置
|
||||
const searchFormItems: SearchFormItem[] = [
|
||||
{
|
||||
label: '卡ID',
|
||||
label: '网卡',
|
||||
prop: 'card_id',
|
||||
type: 'input',
|
||||
config: { clearable: true, placeholder: '请输入卡ID' }
|
||||
type: 'business-select',
|
||||
config: { entity: 'card' }
|
||||
},
|
||||
{
|
||||
label: '任务类型',
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
assume_control_off: filters.assume_control_off.join(',')
|
||||
})
|
||||
}
|
||||
const { data, loading, error, load } = useSchedulerRequest(
|
||||
const { data, loading, error, load, clear } = useSchedulerRequest(
|
||||
async () => {
|
||||
const result = gatewayData(
|
||||
await Service.dryRun({ ...query(), page: page.value, page_size: size.value })
|
||||
@@ -184,6 +184,8 @@
|
||||
void load()
|
||||
}
|
||||
function reset() {
|
||||
// 重置不触发全量演练;同时使重置前的在途响应失效。
|
||||
clear()
|
||||
Object.assign(filters, {
|
||||
carrier_id: undefined,
|
||||
stop_reason: '',
|
||||
|
||||
87
src/views/settings/package-silence-switch/index.vue
Normal file
87
src/views/settings/package-silence-switch/index.vue
Normal file
@@ -0,0 +1,87 @@
|
||||
<template>
|
||||
<ElCard shadow="never" v-if="user.isSuperAdmin">
|
||||
<h2>沉默期总开关</h2>
|
||||
<ElAlert
|
||||
title="默认关闭。开启前须通过全部后端检查;关闭不检查。此页面不会自动切换总开关。"
|
||||
type="warning"
|
||||
:closable="false"
|
||||
/>
|
||||
<p>当前状态:{{ data ? (data.enabled ? '已开启' : '已关闭') : '未获取' }}</p>
|
||||
<ElButton :loading="loading" :disabled="saving" @click="load">刷新检查</ElButton>
|
||||
<ElButton :loading="saving" :disabled="!data || loading" type="primary" @click="toggle">{{
|
||||
data?.enabled ? '关闭沉默期' : '开启沉默期'
|
||||
}}</ElButton>
|
||||
<ElAlert v-if="error" :title="error" type="error" :closable="false" />
|
||||
<ArtTable
|
||||
:data="failed.length ? failed : data?.precheck || []"
|
||||
:pagination="false"
|
||||
row-key="code"
|
||||
>
|
||||
<ElTableColumn prop="code" label="检查编码" min-width="180" /><ElTableColumn
|
||||
prop="name"
|
||||
label="检查项"
|
||||
min-width="200"
|
||||
/>
|
||||
<ElTableColumn label="是否通过" width="120"
|
||||
><template #default="{ row }">{{ row.passed ? '通过' : '未通过' }}</template></ElTableColumn
|
||||
><ElTableColumn prop="count" label="数量" width="100" />
|
||||
</ArtTable>
|
||||
</ElCard>
|
||||
<ElEmpty v-else description="仅超级管理员可访问" />
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { ElMessageBox } from 'element-plus'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { useSchedulerRequest } from '@/composables/useSchedulerRequest'
|
||||
import { PackageSilenceService } from '@/api/modules/packageSilence'
|
||||
import { gatewayData, gatewayError, requireGatewayAccess } from '@/utils/business/gateway'
|
||||
import type { SilenceSwitchCheck } from '@/types/api/packageSilence'
|
||||
defineOptions({ name: 'PackageSilenceSwitch' })
|
||||
const user = useUserStore(),
|
||||
saving = ref(false),
|
||||
failed = ref<SilenceSwitchCheck[]>([])
|
||||
const {
|
||||
data,
|
||||
loading,
|
||||
error,
|
||||
load: loadState
|
||||
} = useSchedulerRequest(
|
||||
async () => gatewayData(await PackageSilenceService.getSwitch()),
|
||||
() => user.isSuperAdmin
|
||||
)
|
||||
async function load() {
|
||||
failed.value = []
|
||||
await loadState()
|
||||
}
|
||||
async function toggle() {
|
||||
if (saving.value || loading.value || !data.value) return
|
||||
saving.value = true
|
||||
failed.value = []
|
||||
try {
|
||||
requireGatewayAccess(user.isSuperAdmin)
|
||||
const enabled = !data.value.enabled
|
||||
await ElMessageBox.confirm(
|
||||
enabled ? '确认开启沉默期?后端将重新检查全部前置条件。' : '确认关闭沉默期?',
|
||||
'切换确认',
|
||||
{ type: 'warning' }
|
||||
)
|
||||
requireGatewayAccess(user.isSuperAdmin)
|
||||
const response = await PackageSilenceService.setSwitch(enabled)
|
||||
if (response.code !== 0) {
|
||||
failed.value =
|
||||
(response.data as unknown as { failed_items?: SilenceSwitchCheck[] })?.failed_items || []
|
||||
throw new Error(response.msg || '切换失败')
|
||||
}
|
||||
await load()
|
||||
} catch (cause: any) {
|
||||
if (cause !== 'cancel' && cause !== 'close') {
|
||||
failed.value = cause?.response?.data?.data?.failed_items || failed.value
|
||||
error.value = gatewayError(cause)
|
||||
}
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
}
|
||||
onMounted(load)
|
||||
</script>
|
||||
@@ -313,6 +313,7 @@
|
||||
|
||||
const getActions = (row: SystemConfigItem) =>
|
||||
row.readonly ||
|
||||
row.config_key === 'package.silence.enabled' ||
|
||||
([PAYMENT_CONFIG_KEYS.card, PAYMENT_CONFIG_KEYS.device].includes(row.config_key as never) &&
|
||||
!hasAuth(JULY_PERMISSIONS.systemConfig.payment))
|
||||
? []
|
||||
@@ -344,6 +345,7 @@
|
||||
}
|
||||
|
||||
const showEditDialog = (row: SystemConfigItem) => {
|
||||
if (row.config_key === 'package.silence.enabled') return
|
||||
currentConfig.value = row
|
||||
originalValue.value = row.value
|
||||
editValue.value = row.value
|
||||
@@ -358,7 +360,10 @@
|
||||
ElMessage.error('未选择要编辑的系统配置')
|
||||
return
|
||||
}
|
||||
if (currentConfig.value.readonly) {
|
||||
if (
|
||||
currentConfig.value.readonly ||
|
||||
currentConfig.value.config_key === 'package.silence.enabled'
|
||||
) {
|
||||
ElMessage.warning('当前配置为只读配置,不能保存')
|
||||
return
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
@change="handleBusinessTypeChange"
|
||||
>
|
||||
<ElOption label="退款审批" value="refund_approval" />
|
||||
<ElOption label="沉默期审批" value="package_silence_approval" />
|
||||
<ElOption label="线下代充值审批" value="offline_recharge_approval" />
|
||||
<ElOption label="员工代收款审批" value="employee_collection_approval" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user