yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: todo

pull/210/head
xingyu4j 2025-09-05 14:11:35 +08:00
parent 2369f06654
commit f30a3451de
27 changed files with 170 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web-antd/src/adapter/component/index.ts
View File

@ -59,6 +59,9 @@ const Textarea = defineAsyncComponent(() =>
const TimePicker = defineAsyncComponent( const TimePicker = defineAsyncComponent(
() => import('ant-design-vue/es/time-picker'), () => import('ant-design-vue/es/time-picker'),
); );
const TimeRangePicker = defineAsyncComponent(() =>
import('ant-design-vue/es/time-picker').then((res) => res.TimeRangePicker),
);
const TreeSelect = defineAsyncComponent( const TreeSelect = defineAsyncComponent(
() => import('ant-design-vue/es/tree-select'), () => import('ant-design-vue/es/tree-select'),
); );
@ -126,6 +129,7 @@ export type ComponentType =
| 'Switch' | 'Switch'
| 'Textarea' | 'Textarea'
| 'TimePicker' | 'TimePicker'
| 'TimeRangePicker'
| 'TreeSelect' | 'TreeSelect'
| 'Upload' | 'Upload'
| BaseFormComponentType; | BaseFormComponentType;
@ -195,6 +199,7 @@ async function initComponentAdapter() {
Textarea: withDefaultPlaceholder(Textarea, 'input'), Textarea: withDefaultPlaceholder(Textarea, 'input'),
RichTextarea, RichTextarea,
TimePicker, TimePicker,
TimeRangePicker,
TreeSelect: withDefaultPlaceholder(TreeSelect, 'select'), TreeSelect: withDefaultPlaceholder(TreeSelect, 'select'),
Upload, Upload,
FileUpload, FileUpload,

2
apps/web-antd/src/api/mall/product/spu.ts
View File

@ -113,6 +113,8 @@ export namespace MallSpuApi {
createTime?: Date; createTime?: Date;
/** 商品状态 */ /** 商品状态 */
status?: number; status?: number;
/** 浏览量 */
browseCount?: number;
} }
/** 商品状态更新 */ /** 商品状态更新 */

2
apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts
View File

@ -31,6 +31,8 @@ export namespace MallDeliveryPickUpStoreApi {
status: number; status: number;
/** 绑定用户编号组数 */ /** 绑定用户编号组数 */
verifyUserIds: number[]; verifyUserIds: number[];
/** 营业时间 用于fieldMappingTime */
rangeTime: any[];
} }
/** 绑定自提店员请求 */ /** 绑定自提店员请求 */

1
apps/web-antd/src/api/pay/app/index.ts
View File

@ -16,6 +16,7 @@ export namespace PayAppApi {
merchantId: number; merchantId: number;
merchantName: string; merchantName: string;
createTime?: Date; createTime?: Date;
channelCodes: string[];
} }
/** 更新状态请求 */ /** 更新状态请求 */

148
apps/web-antd/src/router/routes/modules/mall.ts
View File

@ -1,76 +1,76 @@
// import type { RouteRecordRaw } from 'vue-router'; import type { RouteRecordRaw } from 'vue-router';
// const routes: RouteRecordRaw[] = [ const routes: RouteRecordRaw[] = [
// { {
// path: '/mall/product', path: '/mall/product',
// name: 'ProductCenter', name: 'ProductCenter',
// meta: { meta: {
// title: '商品中心', title: '商品中心',
// icon: 'lucide:shopping-bag', icon: 'lucide:shopping-bag',
// keepAlive: true, keepAlive: true,
// hideInMenu: true, hideInMenu: true,
// }, },
// children: [ children: [
// { {
// path: 'spu/add', path: 'spu/add',
// name: 'ProductSpuAdd', name: 'ProductSpuAdd',
// meta: { meta: {
// title: '商品添加', title: '商品添加',
// activeMenu: '/mall/product/spu', activeMenu: '/mall/product/spu',
// }, },
// component: () => import('#/views/mall/product/spu/form/index.vue'), component: () => import('#/views/mall/product/spu/modules/form.vue'),
// }, },
// { {
// path: String.raw`spu/edit/:id(\d+)`, path: String.raw`spu/edit/:id(\d+)`,
// name: 'ProductSpuEdit', name: 'ProductSpuEdit',
// meta: { meta: {
// title: '商品编辑', title: '商品编辑',
// activeMenu: '/mall/product/spu', activeMenu: '/mall/product/spu',
// }, },
// component: () => import('#/views/mall/product/spu/form/index.vue'), component: () => import('#/views/mall/product/spu/modules/form.vue'),
// }, },
// { {
// path: String.raw`spu/detail/:id(\d+)`, path: String.raw`spu/detail/:id(\d+)`,
// name: 'ProductSpuDetail', name: 'ProductSpuDetail',
// meta: { meta: {
// title: '商品详情', title: '商品详情',
// activeMenu: '/crm/business', activeMenu: '/crm/business',
// }, },
// component: () => import('#/views/mall/product/spu/form/index.vue'), component: () => import('#/views/mall/product/spu/modules/detail.vue'),
// }, },
// ], ],
// }, },
// { {
// path: '/mall/trade', path: '/mall/trade',
// name: 'TradeCenter', name: 'TradeCenter',
// meta: { meta: {
// title: '交易中心', title: '交易中心',
// icon: 'lucide:shopping-cart', icon: 'lucide:shopping-cart',
// keepAlive: true, keepAlive: true,
// hideInMenu: true, hideInMenu: true,
// }, },
// children: [ children: [
// { {
// path: String.raw`order/detail/:id(\d+)`, path: String.raw`order/detail/:id(\d+)`,
// name: 'TradeOrderDetail', name: 'TradeOrderDetail',
// meta: { meta: {
// title: '订单详情', title: '订单详情',
// activeMenu: '/mall/trade/order', activeMenu: '/mall/trade/order',
// }, },
// component: () => import('#/views/mall/trade/order/detail/index.vue'), component: () => import('#/views/mall/trade/order/modules/detail.vue'),
// }, },
// { {
// path: String.raw`after-sale/detail/:id(\d+)`, path: String.raw`after-sale/detail/:id(\d+)`,
// name: 'TradeAfterSaleDetail', name: 'TradeAfterSaleDetail',
// meta: { meta: {
// title: '退款详情', title: '退款详情',
// activeMenu: '/mall/trade/after-sale', activeMenu: '/mall/trade/after-sale',
// }, },
// component: () => component: () =>
// import('#/views/mall/trade/afterSale/detail/index.vue'), import('#/views/mall/trade/afterSale/modules/detail.vue'),
// }, },
// ], ],
// }, },
// ]; ];
// export default routes; export default routes;

5
apps/web-antd/src/views/mall/product/category/index.vue
View File

@ -43,13 +43,12 @@ function handleEdit(row: MallCategoryApi.Category) {
/** 查看商品操作 */ /** 查看商品操作 */
const router = useRouter(); // 路由 const router = useRouter(); // 路由
const handleViewSpu = (id: number) => { function handleViewSpu(id: number) {
// TODO @xingyu：貌似跳转不到详情；
router.push({ router.push({
name: 'ProductSpu', name: 'ProductSpu',
query: { categoryId: id }, query: { categoryId: id },
}); });
}; }
/** 删除分类 */ /** 删除分类 */
async function handleDelete(row: MallCategoryApi.Category) { async function handleDelete(row: MallCategoryApi.Category) {

10
apps/web-antd/src/views/mall/product/spu/index.vue
View File

@ -269,7 +269,7 @@ onMounted(async () => {
<!-- TODO @xingyu：展开的样子，有点丑 --> <!-- TODO @xingyu：展开的样子，有点丑 -->
<Descriptions <Descriptions
:column="4" :column="4"
class="mt-4" class="m-4"
:label-style="{ :label-style="{
width: '100px', width: '100px',
fontWeight: 'bold', fontWeight: 'bold',
@ -278,7 +278,7 @@ onMounted(async () => {
:content-style="{ width: '100px', fontSize: '14px' }" :content-style="{ width: '100px', fontSize: '14px' }"
> >
<Descriptions.Item label="商品分类"> <Descriptions.Item label="商品分类">
{{ treeToString(categoryList, row.categoryId as string) }} {{ treeToString(categoryList, row.categoryId!) }}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="商品名称"> <Descriptions.Item label="商品名称">
{{ row.name }} {{ row.name }}
@ -291,7 +291,7 @@ onMounted(async () => {
{{ fenToYuan(row.costPrice as number) }} 元 {{ fenToYuan(row.costPrice as number) }} 元
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="浏览量"> <Descriptions.Item label="浏览量">
{{ row.browseCount as number }} {{ row.browseCount }}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="虚拟销量"> <Descriptions.Item label="虚拟销量">
{{ row.virtualSalesCount }} {{ row.virtualSalesCount }}
@ -320,7 +320,7 @@ onMounted(async () => {
danger: true, danger: true,
icon: ACTION_ICON.DELETE, icon: ACTION_ICON.DELETE,
auth: ['product:spu:delete'], auth: ['product:spu:delete'],
ifShow: () => row.type === 4, ifShow: () => tabType === 4,
popConfirm: { popConfirm: {
title: $t('ui.actionMessage.deleteConfirm', [row.name]), title: $t('ui.actionMessage.deleteConfirm', [row.name]),
confirm: handleDelete.bind(null, row), confirm: handleDelete.bind(null, row),
@ -331,7 +331,6 @@ onMounted(async () => {
type: 'link', type: 'link',
icon: ACTION_ICON.EDIT, icon: ACTION_ICON.EDIT,
auth: ['product:spu:update'], auth: ['product:spu:update'],
ifShow: () => row.type === 4,
onClick: handleStatus02Change.bind( onClick: handleStatus02Change.bind(
null, null,
row, row,
@ -343,7 +342,6 @@ onMounted(async () => {
type: 'link', type: 'link',
icon: ACTION_ICON.EDIT, icon: ACTION_ICON.EDIT,
auth: ['product:spu:update'], auth: ['product:spu:update'],
ifShow: () => row.type !== 4,
onClick: handleStatus02Change.bind( onClick: handleStatus02Change.bind(
null, null,
row, row,

2
apps/web-antd/src/views/mall/product/spu/modules/detail.vue
View File

@ -1,6 +1,6 @@
<script lang="ts" setup></script> <script lang="ts" setup></script>
<template> <template>
detail
<!-- TODO @xingyu：待开发 --> <!-- TODO @xingyu：待开发 -->
<div>detail</div>
</template> </template>

2
apps/web-antd/src/views/mall/product/spu/modules/form.vue
View File

@ -1,6 +1,6 @@
<script lang="ts" setup></script> <script lang="ts" setup></script>
<template> <template>
form
<!-- TODO @xingyu：待开发 --> <!-- TODO @xingyu：待开发 -->
<div>form</div>
</template> </template>

1
apps/web-antd/src/views/mall/trade/afterSale/index.vue
View File

@ -31,7 +31,6 @@ function openAfterSaleDetail(row: MallAfterSaleApi.AfterSale) {
push({ name: 'TradeAfterSaleDetail', params: { id: row.id } }); push({ name: 'TradeAfterSaleDetail', params: { id: row.id } });
} }
// TODO @xingyu：缺详情页
/** 查看订单详情 */ /** 查看订单详情 */
function openOrderDetail(row: MallAfterSaleApi.AfterSale) { function openOrderDetail(row: MallAfterSaleApi.AfterSale) {
push({ name: 'TradeOrderDetail', params: { id: row.id } }); push({ name: 'TradeOrderDetail', params: { id: row.id } });

6
apps/web-antd/src/views/mall/trade/afterSale/modules/detail.vue Normal file
View File

@ -0,0 +1,6 @@
<script lang="ts" setup></script>
<template>
<!-- TODO @xingyu：待开发 -->
<div>detail</div>
</template>

11
apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
View File

@ -7,14 +7,12 @@ import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
import { ref } from 'vue'; import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
import { BrokerageRecordBizTypeEnum } from '@vben/constants'; import { BrokerageRecordBizTypeEnum, DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { fenToYuan } from '@vben/utils'; import { fenToYuan } from '@vben/utils';
import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record'; import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record';
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { getRangePickerDefaultProps } from '#/utils'; import { getRangePickerDefaultProps } from '#/utils';
/** 推广订单列表 */ /** 推广订单列表 */
@ -52,16 +50,13 @@ function useFormSchema(): VbenFormSchema[] {
{ {
fieldName: 'sourceUserLevel', fieldName: 'sourceUserLevel',
label: '用户类型', label: '用户类型',
component: 'RadioGroup', component: 'Select',
// TODO @xingyu：这里会折行
componentProps: { componentProps: {
options: [ options: [
{ label: '全部', value: 0 }, { label: '全部', value: 0 },
{ label: '一级推广人', value: 1 }, { label: '一级推广人', value: 1 },
{ label: '二级推广人', value: 2 }, { label: '二级推广人', value: 2 },
], ],
buttonStyle: 'solid',
optionType: 'button',
}, },
defaultValue: 0, defaultValue: 0,
}, },

5
apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue
View File

@ -41,16 +41,13 @@ function useFormSchema(): VbenFormSchema[] {
{ {
fieldName: 'level', fieldName: 'level',
label: '用户类型', label: '用户类型',
component: 'RadioGroup', component: 'Select',
// TODO @xingyu：这里会折行
componentProps: { componentProps: {
options: [ options: [
{ label: '全部', value: undefined }, { label: '全部', value: undefined },
{ label: '一级推广人', value: '1' }, { label: '一级推广人', value: '1' },
{ label: '二级推广人', value: '2' }, { label: '二级推广人', value: '2' },
], ],
buttonStyle: 'solid',
optionType: 'button',
}, },
}, },
{ {

24
apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts
View File

@ -58,18 +58,22 @@ export function useFormSchema(): VbenFormSchema[] {
label: '详细地址', label: '详细地址',
rules: 'required', rules: 'required',
}, },
// TODO @xingyu：时间类型不对
{ {
component: 'TimePicker', component: 'TimeRangePicker',
fieldName: 'openingTime', fieldName: 'rangeTime',
label: '营业开始时间', label: '营业时间',
rules: 'required',
},
{
component: 'TimePicker',
fieldName: 'closingTime',
label: '营业结束时间',
rules: 'required', rules: 'required',
componentProps: {
format: 'HH:mm',
minuteStep: 15,
disabledTime: () => {
return {
disabledHours: () => {
return [0, 1, 2, 3, 4, 5, 6, 7];
},
};
},
},
}, },
{ {
component: 'Input', component: 'Input',

1
apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
View File

@ -18,7 +18,6 @@ import { useBindFormSchema } from '../data';
const emit = defineEmits(['success']); const emit = defineEmits(['success']);
const formData = ref<MallDeliveryPickUpStoreApi.PickUpStore>(); const formData = ref<MallDeliveryPickUpStoreApi.PickUpStore>();
// TODO @xingyu：店员是多选；
const getTitle = computed(() => { const getTitle = computed(() => {
return formData.value?.id return formData.value?.id
? $t('ui.actionTitle.edit', ['绑定店员']) ? $t('ui.actionTitle.edit', ['绑定店员'])

6
apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
View File

@ -6,6 +6,7 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import dayjs from 'dayjs';
import { useVbenForm } from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import { import {
@ -33,6 +34,7 @@ const [Form, formApi] = useVbenForm({
formItemClass: 'col-span-2', formItemClass: 'col-span-2',
labelWidth: 120, labelWidth: 120,
}, },
fieldMappingTime: [['rangeTime', ['openingTime', 'closingTime'], 'HH:mm']],
layout: 'horizontal', layout: 'horizontal',
schema: useFormSchema(), schema: useFormSchema(),
showDefaultActions: false, showDefaultActions: false,
@ -73,6 +75,10 @@ const [Modal, modalApi] = useVbenModal({
modalApi.lock(); modalApi.lock();
try { try {
formData.value = await getDeliveryPickUpStore(data.id); formData.value = await getDeliveryPickUpStore(data.id);
formData.value.rangeTime = [
dayjs(formData.value.openingTime, 'HH:mm'),
dayjs(formData.value.closingTime, 'HH:mm'),
];
// 设置到 values // 设置到 values
await formApi.setValues(formData.value); await formApi.setValues(formData.value);
} finally { } finally {

1
apps/web-antd/src/views/mall/trade/order/index.vue
View File

@ -33,7 +33,6 @@ function onRefresh() {
gridApi.query(); gridApi.query();
} }
const { push } = useRouter(); const { push } = useRouter();
// TODO xingyu：貌似详情，还点不进去哇？
/** 详情 */ /** 详情 */
function handleDetail(row: MallOrderApi.Order) { function handleDetail(row: MallOrderApi.Order) {
push({ name: 'TradeOrderDetail', params: { id: row.id } }); push({ name: 'TradeOrderDetail', params: { id: row.id } });

6
apps/web-antd/src/views/mall/trade/order/modules/detail.vue Normal file
View File

@ -0,0 +1,6 @@
<script lang="ts" setup></script>
<template>
<!-- TODO @xingyu：待开发 -->
<div>detail</div>
</template>

2
apps/web-antd/src/views/member/user/data.ts
View File

@ -263,7 +263,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
} }
/** 修改用户等级 */ /** 修改用户等级 */
export function useLeavelFormSchema(): VbenFormSchema[] { export function useLevelFormSchema(): VbenFormSchema[] {
return [ return [
{ {
component: 'Input', component: 'Input',

11
apps/web-antd/src/views/member/user/index.vue
View File

@ -14,7 +14,7 @@ import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data'; import { useGridColumns, useGridFormSchema } from './data';
import BalanceForm from './modules/balance-form.vue'; import BalanceForm from './modules/balance-form.vue';
import Form from './modules/form.vue'; import Form from './modules/form.vue';
import LeavelForm from './modules/leavel-form.vue'; import LevelForm from './modules/level-form.vue';
import PointForm from './modules/point-form.vue'; import PointForm from './modules/point-form.vue';
const router = useRouter(); const router = useRouter();
@ -34,9 +34,8 @@ const [BalanceFormModal, balanceFormModalApi] = useVbenModal({
destroyOnClose: true, destroyOnClose: true,
}); });
// TODO @xingyu：拼写错误； const [LevelFormModal, levelFormModalApi] = useVbenModal({
const [LeavelFormModal, leavelFormModalApi] = useVbenModal({ connectedComponent: LevelForm,
connectedComponent: LeavelForm,
destroyOnClose: true, destroyOnClose: true,
}); });
@ -64,7 +63,7 @@ function handleEdit(row: MemberUserApi.User) {
/** 修改会员等级 */ /** 修改会员等级 */
function handleUpdateLevel(row: MemberUserApi.User) { function handleUpdateLevel(row: MemberUserApi.User) {
leavelFormModalApi.setData(row).open(); levelFormModalApi.setData(row).open();
} }
/** 修改会员积分 */ /** 修改会员积分 */
@ -138,7 +137,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<PointFormModal @success="onRefresh" /> <PointFormModal @success="onRefresh" />
<BalanceFormModal @success="onRefresh" /> <BalanceFormModal @success="onRefresh" />
<LeavelFormModal @success="onRefresh" /> <LevelFormModal @success="onRefresh" />
<Grid table-title="会员列表"> <Grid table-title="会员列表">
<template #toolbar-tools> <template #toolbar-tools>
<TableAction <TableAction

4
apps/web-antd/src/views/member/user/modules/leavel-form.vue → apps/web-antd/src/views/member/user/modules/level-form.vue
View File

@ -11,7 +11,7 @@ import { useVbenForm } from '#/adapter/form';
import { getUser, updateUser } from '#/api/member/user'; import { getUser, updateUser } from '#/api/member/user';
import { $t } from '#/locales'; import { $t } from '#/locales';
import { useLeavelFormSchema } from '../data'; import { useLevelFormSchema } from '../data';
const emit = defineEmits(['success']); const emit = defineEmits(['success']);
const formData = ref<MemberUserApi.User>(); const formData = ref<MemberUserApi.User>();
@ -25,7 +25,7 @@ const [Form, formApi] = useVbenForm({
labelWidth: 80, labelWidth: 80,
}, },
layout: 'horizontal', layout: 'horizontal',
schema: useLeavelFormSchema(), schema: useLevelFormSchema(),
showDefaultActions: false, showDefaultActions: false,
}); });

4
apps/web-antd/src/views/mp/account/data.ts
View File

@ -80,13 +80,15 @@ export function useFormSchema(): VbenFormSchema[] {
} }
/** 搜索表单配置 */ /** 搜索表单配置 */
// TODO @xingyu：缺了 placeholder
export function useGridFormSchema(): VbenFormSchema[] { export function useGridFormSchema(): VbenFormSchema[] {
return [ return [
{ {
fieldName: 'name', fieldName: 'name',
label: '名称', label: '名称',
component: 'Input', component: 'Input',
componentProps: {
placeholder: '请输入名称',
},
}, },
]; ];
} }

7
apps/web-antd/src/views/pay/app/index.vue
View File

@ -34,20 +34,18 @@ function handleCreate() {
appFormModalApi.setData(null).open(); appFormModalApi.setData(null).open();
} }
function handleEdit(row: Required<PayAppApi.App>) { function handleEdit(row: PayAppApi.App) {
appFormModalApi.setData({ id: row.id }).open(); appFormModalApi.setData({ id: row.id }).open();
} }
async function handleDelete(row: Required<PayAppApi.App>) { async function handleDelete(row: PayAppApi.App) {
const hideLoading = message.loading({ const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.name]), content: $t('ui.actionMessage.deleting', [row.name]),
key: 'action_key_msg',
}); });
try { try {
await deleteApp(row.id as number); await deleteApp(row.id as number);
message.success({ message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.name]), content: $t('ui.actionMessage.deleteSuccess', [row.name]),
key: 'action_key_msg',
}); });
onRefresh(); onRefresh();
} finally { } finally {
@ -180,7 +178,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
/> />
</template> </template>
<template #alipayAppConfig="{ row }"> <template #alipayAppConfig="{ row }">
<!-- TODO @xingyu：channelCodes 爆红 -->
<TableAction <TableAction
:actions="[ :actions="[
{ {

12
apps/web-antd/src/views/pay/notify/data.ts
View File

@ -1,10 +1,10 @@
import type { VbenFormSchema } from '#/adapter/form'; import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import { getAppList } from '#/api/pay/app';
import { DICT_TYPE } from '@vben/constants'; import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks'; import { getDictOptions } from '@vben/hooks';
import { getAppList } from '#/api/pay/app';
import { getRangePickerDefaultProps } from '#/utils'; import { getRangePickerDefaultProps } from '#/utils';
/** 列表的搜索表单 */ /** 列表的搜索表单 */
@ -33,12 +33,16 @@ export function useGridFormSchema(): VbenFormSchema[] {
componentProps: { componentProps: {
allowClear: true, allowClear: true,
options: getDictOptions(DICT_TYPE.PAY_NOTIFY_TYPE, 'number'), options: getDictOptions(DICT_TYPE.PAY_NOTIFY_TYPE, 'number'),
placeholder: '请选择通知类型',
}, },
}, },
{ {
fieldName: 'dataId', fieldName: 'dataId',
label: '关联编号', label: '关联编号',
component: 'Input', component: 'Input',
componentProps: {
placeholder: '请输入关联编号',
},
}, },
{ {
fieldName: 'status', fieldName: 'status',
@ -47,12 +51,16 @@ export function useGridFormSchema(): VbenFormSchema[] {
componentProps: { componentProps: {
allowClear: true, allowClear: true,
options: getDictOptions(DICT_TYPE.PAY_NOTIFY_STATUS, 'number'), options: getDictOptions(DICT_TYPE.PAY_NOTIFY_STATUS, 'number'),
placeholder: '请选择通知状态',
}, },
}, },
{ {
fieldName: 'merchantOrderId', fieldName: 'merchantOrderId',
label: '商户订单编号', label: '商户订单编号',
component: 'Input', component: 'Input',
componentProps: {
placeholder: '请输入商户订单编号',
},
}, },
{ {
fieldName: 'createTime', fieldName: 'createTime',
@ -61,12 +69,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
componentProps: { componentProps: {
...getRangePickerDefaultProps(), ...getRangePickerDefaultProps(),
allowClear: true, allowClear: true,
placeholder: ['开始日期', '结束日期'],
}, },
}, },
]; ];
} }
// TODO @xingyu：缺少 placeholder
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns(): VxeTableGridOptions['columns'] { export function useGridColumns(): VxeTableGridOptions['columns'] {
return [ return [

6
apps/web-antd/src/views/pay/wallet/balance/data.ts
View File

@ -8,13 +8,15 @@ import { getDictOptions } from '@vben/hooks';
import { getRangePickerDefaultProps } from '#/utils'; import { getRangePickerDefaultProps } from '#/utils';
/** 列表的搜索表单 */ /** 列表的搜索表单 */
// TODO @xingyu：少了 placeholder
export function useGridFormSchema(): VbenFormSchema[] { export function useGridFormSchema(): VbenFormSchema[] {
return [ return [
{ {
fieldName: 'userId', fieldName: 'userId',
label: '用户编号', label: '用户编号',
component: 'Input', component: 'Input',
componentProps: {
placeholder: '请输入用户编号',
},
}, },
{ {
fieldName: 'userType', fieldName: 'userType',
@ -22,6 +24,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
component: 'Select', component: 'Select',
componentProps: { componentProps: {
options: getDictOptions(DICT_TYPE.USER_TYPE, 'number'), options: getDictOptions(DICT_TYPE.USER_TYPE, 'number'),
placeholder: '请选择用户类型',
}, },
}, },
{ {
@ -31,6 +34,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
componentProps: { componentProps: {
allowClear: true, allowClear: true,
...getRangePickerDefaultProps(), ...getRangePickerDefaultProps(),
placeholder: ['开始日期', '结束日期'],
}, },
}, },
]; ];

12
apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts
View File

@ -14,6 +14,9 @@ export function useFormSchema(): VbenFormSchema[] {
label: '套餐名', label: '套餐名',
component: 'Input', component: 'Input',
rules: 'required', rules: 'required',
componentProps: {
placeholder: '请输入套餐名称',
},
}, },
{ {
fieldName: 'payPrice', fieldName: 'payPrice',
@ -24,6 +27,7 @@ export function useFormSchema(): VbenFormSchema[] {
min: 0, min: 0,
precision: 2, precision: 2,
step: 0.01, step: 0.01,
placeholder: '请输入支付金额',
}, },
}, },
{ {
@ -35,6 +39,7 @@ export function useFormSchema(): VbenFormSchema[] {
min: 0, min: 0,
precision: 2, precision: 2,
step: 0.01, step: 0.01,
placeholder: '请输入赠送金额',
}, },
}, },
{ {
@ -44,19 +49,22 @@ export function useFormSchema(): VbenFormSchema[] {
rules: 'required', rules: 'required',
componentProps: { componentProps: {
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
placeholder: '请选择开启状态',
}, },
}, },
]; ];
} }
/** 列表的搜索表单 */ /** 列表的搜索表单 */
// TODO @xingyu：少了 placeholder
export function useGridFormSchema(): VbenFormSchema[] { export function useGridFormSchema(): VbenFormSchema[] {
return [ return [
{ {
fieldName: 'name', fieldName: 'name',
label: '套餐名称', label: '套餐名称',
component: 'Input', component: 'Input',
componentProps: {
placeholder: '请输入套餐名称',
},
}, },
{ {
fieldName: 'status', fieldName: 'status',
@ -65,6 +73,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
componentProps: { componentProps: {
allowClear: true, allowClear: true,
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
placeholder: '请选择状态',
}, },
}, },
{ {
@ -74,6 +83,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
componentProps: { componentProps: {
allowClear: true, allowClear: true,
...getRangePickerDefaultProps(), ...getRangePickerDefaultProps(),
placeholder: ['开始日期', '结束日期'],
}, },
}, },
]; ];

11
apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
View File

@ -7,14 +7,12 @@ import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
import { ref } from 'vue'; import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
import { BrokerageRecordBizTypeEnum } from '@vben/constants'; import { BrokerageRecordBizTypeEnum, DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { fenToYuan } from '@vben/utils'; import { fenToYuan } from '@vben/utils';
import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record'; import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record';
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { getRangePickerDefaultProps } from '#/utils'; import { getRangePickerDefaultProps } from '#/utils';
/** 推广订单列表 */ /** 推广订单列表 */
@ -52,16 +50,13 @@ function useFormSchema(): VbenFormSchema[] {
{ {
fieldName: 'sourceUserLevel', fieldName: 'sourceUserLevel',
label: '用户类型', label: '用户类型',
component: 'RadioGroup', component: 'Select',
// TODO @霖：这里会折行
componentProps: { componentProps: {
options: [ options: [
{ label: '全部', value: 0 }, { label: '全部', value: 0 },
{ label: '一级推广人', value: 1 }, { label: '一级推广人', value: 1 },
{ label: '二级推广人', value: 2 }, { label: '二级推广人', value: 2 },
], ],
buttonStyle: 'solid',
optionType: 'button',
}, },
defaultValue: 0, defaultValue: 0,
}, },