diff --git a/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts b/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts index aa60f1141..7f8b5621f 100644 --- a/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts +++ b/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts @@ -3,9 +3,8 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace WalletRechargePackageApi { -// TODO @AI:改成 WalletRecharge;相关方法也是! /** 充值套餐信息 */ - export interface Package { + export interface WalletRechargePackage { id?: number; name: string; payPrice: number; @@ -15,33 +14,36 @@ export namespace WalletRechargePackageApi { } /** 查询充值套餐列表 */ -export function getPackagePage(params: PageParam) { - return requestClient.get>( - '/pay/wallet-recharge-package/page', - { - params, - }, - ); +export function getWalletRechargePackagePage(params: PageParam) { + return requestClient.get< + PageResult + >('/pay/wallet-recharge-package/page', { + params, + }); } /** 查询充值套餐详情 */ -export function getPackage(id: number) { - return requestClient.get( +export function getWalletRechargePackage(id: number) { + return requestClient.get( `/pay/wallet-recharge-package/get?id=${id}`, ); } /** 新增充值套餐 */ -export function createPackage(data: WalletRechargePackageApi.Package) { +export function createWalletRechargePackage( + data: WalletRechargePackageApi.WalletRechargePackage, +) { return requestClient.post('/pay/wallet-recharge-package/create', data); } /** 修改充值套餐 */ -export function updatePackage(data: WalletRechargePackageApi.Package) { +export function updateWalletRechargePackage( + data: WalletRechargePackageApi.WalletRechargePackage, +) { return requestClient.put('/pay/wallet-recharge-package/update', data); } /** 删除充值套餐 */ -export function deletePackage(id: number) { +export function deleteWalletRechargePackage(id: number) { return requestClient.delete(`/pay/wallet-recharge-package/delete?id=${id}`); } diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts index b7a720e10..22010869e 100644 --- a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts +++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts @@ -1,17 +1,26 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; +import { z } from '#/adapter/form'; import { getRangePickerDefaultProps } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { return [ + { + fieldName: 'id', + component: 'Input', + dependencies: { + triggerFields: [''], + show: () => false, + }, + }, { fieldName: 'name', - label: '套餐名', + label: '套餐名称', component: 'Input', rules: 'required', componentProps: { @@ -22,7 +31,7 @@ export function useFormSchema(): VbenFormSchema[] { fieldName: 'payPrice', label: '支付金额(元)', component: 'InputNumber', - rules: 'required', + rules: z.number().min(0, '支付金额不能小于0'), componentProps: { min: 0, precision: 2, @@ -34,7 +43,7 @@ export function useFormSchema(): VbenFormSchema[] { fieldName: 'bonusPrice', label: '赠送金额(元)', component: 'InputNumber', - rules: 'required', + rules: z.number().min(0, '赠送金额不能小于0'), componentProps: { min: 0, precision: 2, @@ -46,11 +55,12 @@ export function useFormSchema(): VbenFormSchema[] { fieldName: 'status', label: '开启状态', component: 'RadioGroup', - rules: 'required', componentProps: { options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), - placeholder: '请选择开启状态', + buttonStyle: 'solid', + optionType: 'button', }, + rules: z.number().default(CommonStatusEnum.ENABLE), }, ]; } @@ -64,6 +74,7 @@ export function useGridFormSchema(): VbenFormSchema[] { component: 'Input', componentProps: { placeholder: '请输入套餐名称', + allowClear: true, }, }, { @@ -71,9 +82,9 @@ export function useGridFormSchema(): VbenFormSchema[] { label: '状态', component: 'Select', componentProps: { - allowClear: true, options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), placeholder: '请选择状态', + allowClear: true, }, }, { @@ -81,9 +92,8 @@ export function useGridFormSchema(): VbenFormSchema[] { label: '创建时间', component: 'RangePicker', componentProps: { - allowClear: true, ...getRangePickerDefaultProps(), - placeholder: ['开始日期', '结束日期'], + allowClear: true, }, }, ]; @@ -94,25 +104,30 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { return [ { field: 'id', - title: '编号', + title: '套餐编号', + minWidth: 100, }, { field: 'name', title: '套餐名称', + minWidth: 150, }, { field: 'payPrice', title: '支付金额', - formatter: 'formatAmount2', + minWidth: 120, + formatter: 'formatFenToYuanAmount', }, { field: 'bonusPrice', title: '赠送金额', - formatter: 'formatAmount2', + minWidth: 120, + formatter: 'formatFenToYuanAmount', }, { field: 'status', title: '状态', + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, @@ -121,11 +136,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', + minWidth: 180, formatter: 'formatDateTime', }, { title: '操作', - width: 130, + width: 160, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue b/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue index 61606b2a3..b9484e266 100644 --- a/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue +++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue @@ -1,5 +1,6 @@