diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/components/index.ts b/apps/web-antd/src/views/mall/promotion/rewardActivity/components/index.ts new file mode 100644 index 000000000..93b72c326 --- /dev/null +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/components/index.ts @@ -0,0 +1,2 @@ +export { default as RewardRuleCouponSelect } from './reward-rule-coupon-select.vue'; +export { default as RewardRule } from './reward-rule.vue'; diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/components/reward-rule-coupon-select.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/components/reward-rule-coupon-select.vue new file mode 100644 index 000000000..46af006c9 --- /dev/null +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/components/reward-rule-coupon-select.vue @@ -0,0 +1,131 @@ + + + diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/components/reward-rule.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/components/reward-rule.vue new file mode 100644 index 000000000..14f969136 --- /dev/null +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/components/reward-rule.vue @@ -0,0 +1,184 @@ + + + diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts index 435298fcc..b75ecdb10 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts @@ -1,84 +1,20 @@ +// 1. 导入类型 import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +// 2. 导入 VBEN 常量和工具 import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; +import { $t } from '@vben/locales'; -/** 表单配置 */ -export function useFormSchema(): VbenFormSchema[] { - return [ - { - fieldName: 'id', - component: 'Input', - dependencies: { - triggerFields: [''], - show: () => false, - }, - }, - { - fieldName: 'name', - label: '活动名称', - component: 'Input', - componentProps: { - placeholder: '请输入活动名称', - }, - rules: 'required', - }, - { - fieldName: 'startTime', - label: '开始时间', - component: 'DatePicker', - componentProps: { - placeholder: '请选择开始时间', - showTime: true, - valueFormat: 'x', - format: 'YYYY-MM-DD HH:mm:ss', - }, - rules: 'required', - }, - { - fieldName: 'endTime', - label: '结束时间', - component: 'DatePicker', - componentProps: { - placeholder: '请选择结束时间', - showTime: true, - valueFormat: 'x', - format: 'YYYY-MM-DD HH:mm:ss', - }, - rules: 'required', - }, - { - fieldName: 'conditionType', - label: '条件类型', - component: 'RadioGroup', - componentProps: { - options: getDictOptions(DICT_TYPE.PROMOTION_CONDITION_TYPE, 'number'), - }, - rules: 'required', - }, - { - fieldName: 'productScope', - label: '商品范围', - component: 'RadioGroup', - componentProps: { - options: getDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE, 'number'), - }, - rules: 'required', - }, - { - fieldName: 'remark', - label: '备注', - component: 'Textarea', - componentProps: { - placeholder: '请输入备注', - rows: 4, - }, - }, - ]; -} +// 3. 导入 Zod 用于高级验证 +import { z } from '#/adapter/form'; +// 4. 导入项目级工具函数 +import { getRangePickerDefaultProps } from '#/utils'; -/** 列表的搜索表单 */ +/** + * @description: 列表的搜索表单 + */ export function useGridFormSchema(): VbenFormSchema[] { return [ { @@ -95,9 +31,9 @@ export function useGridFormSchema(): VbenFormSchema[] { label: '活动状态', component: 'Select', componentProps: { + options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), placeholder: '请选择活动状态', allowClear: true, - options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), }, }, { @@ -105,28 +41,30 @@ export function useGridFormSchema(): VbenFormSchema[] { label: '活动时间', component: 'RangePicker', componentProps: { - placeholder: ['活动开始日期', '活动结束日期'], + ...getRangePickerDefaultProps(), allowClear: true, - valueFormat: 'YYYY-MM-DD HH:mm:ss', }, }, ]; } -/** 列表的字段 */ +/** + * @description: 列表的字段 + */ export function useGridColumns(): VxeTableGridOptions['columns'] { return [ { field: 'name', title: '活动名称', - minWidth: 140, + minWidth: 200, }, { field: 'productScope', title: '活动范围', - minWidth: 100, + minWidth: 120, + align: 'center', cellRender: { - name: 'CellDict', + name: 'CellDictTag', props: { type: DICT_TYPE.PROMOTION_PRODUCT_SCOPE }, }, }, @@ -134,20 +72,23 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { field: 'startTime', title: '活动开始时间', minWidth: 180, + align: 'center', formatter: 'formatDateTime', }, { field: 'endTime', title: '活动结束时间', minWidth: 180, + align: 'center', formatter: 'formatDateTime', }, { field: 'status', title: '状态', minWidth: 100, + align: 'center', cellRender: { - name: 'CellDict', + name: 'CellDictTag', props: { type: DICT_TYPE.COMMON_STATUS }, }, }, @@ -159,9 +100,77 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { }, { title: '操作', - width: 180, + width: 200, fixed: 'right', slots: { default: 'actions' }, }, ]; } + +/** + * @description: 新增/修改的表单 + */ +export function useFormSchema(): VbenFormSchema[] { + return [ + // 隐藏的 ID 字段 + { + component: 'Input', + fieldName: 'id', + dependencies: { + triggerFields: [''], + show: () => false, + }, + }, + { + fieldName: 'name', + label: '活动名称', + component: 'Input', + componentProps: { + placeholder: '请输入活动名称', + }, + rules: z.string().min(1, '活动名称不能为空'), + }, + { + fieldName: 'startAndEndTime', + label: '活动时间', + component: 'RangePicker', + componentProps: { + showTime: true, + format: 'YYYY-MM-DD HH:mm:ss', + placeholder: [$t('common.startTimeText'), $t('common.endTimeText')], + }, + rules: z.array(z.any()).min(1, '活动时间不能为空'), + }, + { + fieldName: 'conditionType', + label: '条件类型', + component: 'RadioGroup', + componentProps: { + options: getDictOptions(DICT_TYPE.PROMOTION_CONDITION_TYPE, 'number'), + buttonStyle: 'solid', + optionType: 'button', + }, + rules: z.number(), + }, + { + fieldName: 'productScope', + label: '活动范围', + component: 'RadioGroup', + componentProps: { + options: getDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE, 'number'), + buttonStyle: 'solid', + optionType: 'button', + }, + rules: z.number(), + }, + { + fieldName: 'remark', + label: '备注', + component: 'Textarea', + componentProps: { + placeholder: '请输入备注', + rows: 4, + }, + }, + ]; +} diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue index 7641805a4..8523a85f3 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue @@ -1,8 +1,9 @@