问题原因: - 租户管理页面调用 /api/v1/admin/packages/all 获取课程包 - 但 CoursePackage 实体没有 price 和 discountPrice 字段 - 这些字段在 CourseCollection(课程套餐)实体中 后端修改: - AdminCourseCollectionController 新增 GET /all 接口 - 返回已发布的课程套餐列表(含价格信息) - 添加 @Slf4j 注解和必要导入 前端修改: - src/api/admin.ts 修改 API 调用路径为 /collections/all - 修改返回类型为 CourseCollectionResponse[] - TenantListView.vue 修改 packageList 类型 - 修复 formatPackagePrice 处理 undefined 值 - 修复 handlePackageTypeChange 类型检查 数据库迁移: - 添加 V38 脚本为 course_collection 表添加自增主键 其他修改: - .gitignore 移除 *.sql 排除规则(允许迁移脚本) - CourseCollectionRejectRequest 和 CourseRejectRequest 用于审核驳回 修复的 TypeScript 错误: - formatPackagePrice 参数改为可选类型 - selectedPackage.name 添加可选链操作符
307 lines
9.9 KiB
Vue
307 lines
9.9 KiB
Vue
<template>
|
|
<div class="package-edit-page">
|
|
<a-card :bordered="false">
|
|
<template #title>
|
|
<span>{{ isEdit ? '编辑套餐' : '创建套餐' }}</span>
|
|
</template>
|
|
<template #extra>
|
|
<a-button @click="router.back()">返回</a-button>
|
|
</template>
|
|
|
|
<a-form
|
|
ref="formRef"
|
|
:model="form"
|
|
:rules="formRules"
|
|
:label-col="{ span: 4 }"
|
|
:wrapper-col="{ span: 16 }"
|
|
>
|
|
<a-form-item label="套餐名称" name="name">
|
|
<a-input v-model:value="form.name" placeholder="请输入套餐名称" />
|
|
</a-form-item>
|
|
|
|
<a-form-item label="套餐描述" name="description">
|
|
<a-textarea v-model:value="form.description" placeholder="请输入套餐描述" :rows="3" />
|
|
</a-form-item>
|
|
|
|
<a-form-item label="价格(元)" name="price">
|
|
<a-input-number v-model:value="form.price" :min="0" :precision="2" style="width: 200px" />
|
|
</a-form-item>
|
|
|
|
<a-form-item label="优惠价(元)" name="discountPrice">
|
|
<a-input-number v-model:value="form.discountPrice" :min="0" :precision="2" style="width: 200px" />
|
|
</a-form-item>
|
|
|
|
<a-form-item label="优惠类型" name="discountType">
|
|
<a-select v-model:value="form.discountType" placeholder="请选择优惠类型" allowClear style="width: 200px">
|
|
<a-select-option value="PERCENT">折扣</a-select-option>
|
|
<a-select-option value="FIXED">立减</a-select-option>
|
|
</a-select>
|
|
</a-form-item>
|
|
|
|
<a-form-item label="适用年级" name="gradeLevels">
|
|
<a-select v-model:value="form.gradeLevels" mode="multiple" placeholder="请选择适用年级" style="width: 300px">
|
|
<a-select-option value="小班">小班</a-select-option>
|
|
<a-select-option value="中班">中班</a-select-option>
|
|
<a-select-option value="大班">大班</a-select-option>
|
|
</a-select>
|
|
</a-form-item>
|
|
|
|
<a-divider>课程包配置</a-divider>
|
|
|
|
<a-form-item label="已选课程包">
|
|
<div class="package-list">
|
|
<a-table
|
|
:columns="packageColumns"
|
|
:data-source="selectedPackages"
|
|
row-key="packageId"
|
|
size="small"
|
|
:pagination="false"
|
|
>
|
|
<template #bodyCell="{ column, record, index }">
|
|
<template v-if="column.key === 'sortOrder'">
|
|
<a-input-number v-model:value="record.sortOrder" :min="0" size="small" />
|
|
</template>
|
|
<template v-else-if="column.key === 'gradeLevel'">
|
|
<a-select v-model:value="record.gradeLevel" size="small" style="width: 100px">
|
|
<a-select-option value="小班">小班</a-select-option>
|
|
<a-select-option value="中班">中班</a-select-option>
|
|
<a-select-option value="大班">大班</a-select-option>
|
|
</a-select>
|
|
</template>
|
|
<template v-else-if="column.key === 'action'">
|
|
<a-button type="link" size="small" danger @click="removePackage(index)">移除</a-button>
|
|
</template>
|
|
</template>
|
|
</a-table>
|
|
<a-button type="dashed" block style="margin-top: 16px" @click="showPackageSelector = true">
|
|
<template #icon><PlusOutlined /></template>
|
|
添加课程包
|
|
</a-button>
|
|
</div>
|
|
</a-form-item>
|
|
|
|
<a-form-item :wrapper-col="{ offset: 4, span: 16 }">
|
|
<a-space>
|
|
<a-button type="primary" @click="handleSave" :loading="saving">保存</a-button>
|
|
<a-button @click="router.back()">取消</a-button>
|
|
</a-space>
|
|
</a-form-item>
|
|
</a-form>
|
|
</a-card>
|
|
|
|
<!-- 课程包选择器 -->
|
|
<a-modal
|
|
v-model:open="showPackageSelector"
|
|
title="选择课程包"
|
|
width="800px"
|
|
@ok="handleAddPackages"
|
|
>
|
|
<a-table
|
|
:columns="selectorColumns"
|
|
:data-source="availablePackages"
|
|
:row-selection="rowSelection"
|
|
row-key="id"
|
|
size="small"
|
|
:loading="loadingPackages"
|
|
>
|
|
<template #bodyCell="{ column, record }">
|
|
<template v-if="column.key === 'gradeTags'">
|
|
<a-tag v-for="tag in parseGradeTags(record.gradeTags)" :key="tag">{{ tag }}</a-tag>
|
|
</template>
|
|
</template>
|
|
</a-table>
|
|
</a-modal>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { ref, reactive, computed, onMounted } from 'vue';
|
|
import { useRouter, useRoute } from 'vue-router';
|
|
import { message } from 'ant-design-vue';
|
|
import type { FormInstance } from 'ant-design-vue';
|
|
import { PlusOutlined } from '@ant-design/icons-vue';
|
|
import { getCollectionDetail, createCollection, updateCollection, setCollectionPackages } from '@/api/package';
|
|
import { getCoursePackageList } from '@/api/package';
|
|
|
|
const router = useRouter();
|
|
const route = useRoute();
|
|
const formRef = ref<FormInstance>();
|
|
|
|
const isEdit = computed(() => !!route.params.id);
|
|
const packageId = computed(() => route.params.id as string | undefined);
|
|
|
|
const saving = ref(false);
|
|
const loadingPackages = ref(false);
|
|
const showPackageSelector = ref(false);
|
|
const availablePackages = ref<any[]>([]);
|
|
const selectedRowKeys = ref<(number | string)[]>([]);
|
|
|
|
const form = reactive({
|
|
name: '',
|
|
description: '',
|
|
price: 0,
|
|
discountPrice: undefined as number | undefined,
|
|
discountType: undefined as string | undefined,
|
|
gradeLevels: [] as string[],
|
|
});
|
|
|
|
const selectedPackages = ref<{ packageId: number | string; gradeLevel: string; sortOrder: number; packageName: string }[]>([]);
|
|
|
|
// 表单校验规则
|
|
const formRules = {
|
|
name: [{ required: true, message: '请输入套餐名称' }],
|
|
price: [{ required: true, message: '请输入价格' }],
|
|
gradeLevels: [{ required: true, message: '请选择适用年级' }],
|
|
};
|
|
|
|
const packageColumns = [
|
|
{ title: '课程包', dataIndex: 'packageName', key: 'packageName' },
|
|
{ title: '年级', dataIndex: 'gradeLevel', key: 'gradeLevel', width: 120 },
|
|
{ title: '排序', dataIndex: 'sortOrder', key: 'sortOrder', width: 80 },
|
|
{ title: '操作', key: 'action', width: 80 },
|
|
];
|
|
|
|
const selectorColumns = [
|
|
{ title: '课程包名称', dataIndex: 'name', key: 'name' },
|
|
{ title: '年级标签', dataIndex: 'gradeTags', key: 'gradeTags' },
|
|
{ title: '时长', dataIndex: 'duration', key: 'duration', width: 80 },
|
|
];
|
|
|
|
const rowSelection = computed(() => ({
|
|
selectedRowKeys: selectedRowKeys.value,
|
|
onChange: (keys: any[]) => {
|
|
selectedRowKeys.value = keys;
|
|
},
|
|
}));
|
|
|
|
const parseGradeTags = (tags: string) => {
|
|
try {
|
|
return JSON.parse(tags || '[]');
|
|
} catch {
|
|
return [];
|
|
}
|
|
};
|
|
|
|
const fetchPackageDetail = async () => {
|
|
if (!isEdit.value) return;
|
|
|
|
try {
|
|
const pkg = await getCollectionDetail(packageId.value!) as any;
|
|
form.name = pkg.name;
|
|
form.description = pkg.description || '';
|
|
form.price = pkg.price / 100;
|
|
form.discountPrice = pkg.discountPrice ? pkg.discountPrice / 100 : undefined;
|
|
form.discountType = pkg.discountType;
|
|
form.gradeLevels = JSON.parse(pkg.gradeLevels || '[]');
|
|
|
|
selectedPackages.value = (pkg.packages || []).map((p: any) => ({
|
|
packageId: p.id,
|
|
packageName: p.name,
|
|
gradeLevel: p.gradeLevels?.[0] || '小班',
|
|
sortOrder: p.sortOrder,
|
|
}));
|
|
} catch (error) {
|
|
message.error('获取套餐详情失败');
|
|
}
|
|
};
|
|
|
|
const fetchAvailablePackages = async () => {
|
|
loadingPackages.value = true;
|
|
try {
|
|
// 获取已发布的课程包列表
|
|
const res = await getCoursePackageList({ pageNum: 1, pageSize: 100, status: 'PUBLISHED' });
|
|
availablePackages.value = res.list || [];
|
|
} catch (error) {
|
|
console.error('获取课程包列表失败', error);
|
|
} finally {
|
|
loadingPackages.value = false;
|
|
}
|
|
};
|
|
|
|
const handleAddPackages = () => {
|
|
const existingIds = new Set(selectedPackages.value.map((p) => p.packageId));
|
|
const newPackages = availablePackages.value
|
|
.filter((p) => selectedRowKeys.value.includes(p.id) && !existingIds.has(p.id))
|
|
.map((p) => ({
|
|
packageId: p.id,
|
|
packageName: p.name,
|
|
gradeLevel: parseGradeTags(p.gradeTags)?.[0] || '小班',
|
|
sortOrder: selectedPackages.value.length,
|
|
}));
|
|
|
|
selectedPackages.value.push(...newPackages);
|
|
selectedRowKeys.value = [];
|
|
showPackageSelector.value = false;
|
|
};
|
|
|
|
const removePackage = (index: number) => {
|
|
selectedPackages.value.splice(index, 1);
|
|
};
|
|
|
|
const handleSave = async () => {
|
|
if (!formRef.value) return;
|
|
|
|
try {
|
|
// 手动触发表单校验
|
|
await formRef.value.validate();
|
|
|
|
saving.value = true;
|
|
const data = {
|
|
name: form.name,
|
|
description: form.description,
|
|
price: Math.round(form.price * 100),
|
|
discountPrice: form.discountPrice ? Math.round(form.discountPrice * 100) : undefined,
|
|
discountType: form.discountType,
|
|
gradeLevels: form.gradeLevels,
|
|
};
|
|
|
|
console.log('创建套餐请求数据:', data);
|
|
|
|
let id: number | string;
|
|
if (isEdit.value) {
|
|
id = packageId.value!;
|
|
await updateCollection(id, data);
|
|
} else {
|
|
const res = await createCollection(data) as any;
|
|
console.log('创建套餐响应:', res);
|
|
id = res.id; // 后端 Long 序列化为 string
|
|
}
|
|
|
|
// 保存课程包关联
|
|
if (selectedPackages.value.length > 0) {
|
|
await setCollectionPackages(
|
|
id,
|
|
selectedPackages.value.map((p) => p.packageId),
|
|
);
|
|
}
|
|
|
|
message.success('保存成功');
|
|
router.push('/admin/packages');
|
|
} catch (error) {
|
|
console.error('保存失败:', error);
|
|
// 表单校验错误不显示全局提示
|
|
if (error?.errorFields) {
|
|
return;
|
|
}
|
|
message.error(error.response?.data?.message || '保存失败');
|
|
} finally {
|
|
saving.value = false;
|
|
}
|
|
};
|
|
|
|
onMounted(() => {
|
|
fetchPackageDetail();
|
|
fetchAvailablePackages();
|
|
});
|
|
</script>
|
|
|
|
<style scoped>
|
|
.package-edit-page {
|
|
padding: 24px;
|
|
}
|
|
|
|
.package-list {
|
|
width: 100%;
|
|
}
|
|
</style>
|