Merge branch 'develop'

This commit is contained in:
luo
2026-08-21 17:23:16 +08:00
328 changed files with 27039 additions and 5117 deletions

View File

@@ -13,7 +13,7 @@
</div>
</div>
</template>
<div v-loading="loading" class="package-table-wrapper">
<div v-loading="props.loading" class="package-table-wrapper">
<!-- 绑定设备提示 -->
<ElEmpty v-if="props.boundDeviceId" :image-size="100">
<template #description>
@@ -32,15 +32,20 @@
<ElTable :data="packageList" class="package-table" border>
<ElTableColumn label="订单号" width="240">
<template #default="scope">
<ElButton
type="primary"
link
@click="handleOrderNoClick(scope.row)"
v-if="hasAuth('order:package_list_detail')"
>
{{ scope.row.order_no }}
</ElButton>
<span v-else>{{ scope.row.order_no }}</span>
<div class="order-no-cell">
<ElTooltip :content="scope.row.order_no" placement="top" :show-after="300">
<ElButton
class="order-no-link"
type="primary"
link
@click="handleOrderNoClick(scope.row)"
v-if="hasAuth('order:package_list_detail')"
>
{{ scope.row.order_no }}
</ElButton>
<span v-else class="order-no-text">{{ scope.row.order_no }}</span>
</ElTooltip>
</div>
</template>
</ElTableColumn>
<ElTableColumn label="套餐名称" width="200" show-overflow-tooltip>
@@ -291,6 +296,7 @@
v-model="createRefundDialogVisible"
:initial-order-id="currentRefundOrderId"
:initial-order-no="currentRefundOrderNo"
:initial-package-usage-id="currentRefundPackageUsageId"
@success="handleRefundSuccess"
/>
@@ -336,7 +342,7 @@
<ElDialog
v-model="expiresAtDialogVisible"
title="修改过期时间"
width="420px"
width="40%"
@closed="resetExpiresAtForm"
>
<ElForm
@@ -389,7 +395,8 @@
ElInputNumber,
ElDatePicker,
ElSelect,
ElOption
ElOption,
ElTooltip
} from 'element-plus'
import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
@@ -432,6 +439,7 @@
const createRefundDialogVisible = ref(false)
const currentRefundOrderId = ref<number | undefined>(undefined)
const currentRefundOrderNo = ref<string | undefined>(undefined)
const currentRefundPackageUsageId = ref<number | undefined>(undefined)
const selectedPackage = ref<PackageInfo>()
const usedDataDialogVisible = ref(false)
const expiresAtDialogVisible = ref(false)
@@ -490,10 +498,12 @@
}
currentRefundOrderId.value = row.order_id
currentRefundOrderNo.value = row.order_no
currentRefundPackageUsageId.value = row.package_usage_id ?? row.id
createRefundDialogVisible.value = true
}
const handleRefundSuccess = () => {
currentRefundPackageUsageId.value = undefined
emit('refresh')
}
@@ -749,6 +759,35 @@
white-space: nowrap;
}
.order-no-cell {
width: 100%;
min-width: 0;
:deep(.el-tooltip__trigger) {
display: block;
width: 100%;
min-width: 0;
}
.order-no-link,
.order-no-text {
display: block;
width: 100%;
min-width: 0;
max-width: 100%;
overflow: hidden;
text-align: left;
text-overflow: ellipsis;
white-space: nowrap;
}
.order-no-link {
padding: 0;
margin-left: 0;
justify-content: flex-start;
}
}
.package-actions {
display: grid;
grid-template-columns: repeat(2, 1fr);