From fb37b7eec3205182d8edefbcf44aa59e760222c9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 7 Oct 2025 09:26:12 +0800 Subject: [PATCH 01/31] =?UTF-8?q?feat=EF=BC=9A=E3=80=90antd=E3=80=91?= =?UTF-8?q?=E3=80=90ele=E3=80=91=E3=80=90member=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E3=80=91config=20=E8=BF=81=E7=A7=BB=20antd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/crm/contract/config/data.ts | 37 ++++++++ .../src/views/crm/contract/config/index.vue | 44 +-------- .../src/views/crm/customer/poolConfig/data.ts | 78 ++++++++++++++++ .../views/crm/customer/poolConfig/index.vue | 85 +---------------- .../src/views/mall/trade/config/index.vue | 1 - apps/web-antd/src/views/member/config/data.ts | 52 +++++++++++ .../src/views/member/config/index.vue | 93 +++++-------------- .../src/views/mall/trade/config/index.vue | 1 - .../web-ele/src/views/member/config/index.vue | 1 - 9 files changed, 194 insertions(+), 198 deletions(-) create mode 100644 apps/web-antd/src/views/crm/contract/config/data.ts create mode 100644 apps/web-antd/src/views/crm/customer/poolConfig/data.ts create mode 100644 apps/web-antd/src/views/member/config/data.ts diff --git a/apps/web-antd/src/views/crm/contract/config/data.ts b/apps/web-antd/src/views/crm/contract/config/data.ts new file mode 100644 index 000000000..2792b3601 --- /dev/null +++ b/apps/web-antd/src/views/crm/contract/config/data.ts @@ -0,0 +1,37 @@ +import type { VbenFormSchema } from '#/adapter/form'; + +export const schema: VbenFormSchema[] = [ + { + component: 'RadioGroup', + fieldName: 'notifyEnabled', + label: '提前提醒设置', + componentProps: { + options: [ + { label: '提醒', value: true }, + { label: '不提醒', value: false }, + ], + }, + defaultValue: true, + }, + { + component: 'InputNumber', + fieldName: 'notifyDays', + componentProps: { + min: 0, + precision: 0, + }, + renderComponentContent: () => ({ + addonBefore: () => '提前', + addonAfter: () => '天提醒', + }), + dependencies: { + triggerFields: ['notifyEnabled'], + show: (values) => values.notifyEnabled, + trigger(values) { + if (!values.notifyEnabled) { + values.notifyDays = undefined; + } + }, + }, + }, +]; diff --git a/apps/web-antd/src/views/crm/contract/config/index.vue b/apps/web-antd/src/views/crm/contract/config/index.vue index 932dbe30e..d85040bcc 100644 --- a/apps/web-antd/src/views/crm/contract/config/index.vue +++ b/apps/web-antd/src/views/crm/contract/config/index.vue @@ -1,5 +1,4 @@ -- Gitee From f6ca135efb9fda2e8ce350bb374966acd86726f5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 7 Oct 2025 09:46:47 +0800 Subject: [PATCH 04/31] =?UTF-8?q?feat=EF=BC=9A=E3=80=90antd=E3=80=91?= =?UTF-8?q?=E3=80=90ele=E3=80=91=E3=80=90member=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E3=80=91group=20=E8=BF=81=E7=A7=BB=20ele?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-ele/src/views/member/group/data.ts | 39 +++++++++++++++++-- apps/web-ele/src/views/member/group/index.vue | 16 ++++---- .../src/views/member/group/modules/form.vue | 6 +-- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/apps/web-ele/src/views/member/group/data.ts b/apps/web-ele/src/views/member/group/data.ts index 2edab3943..7f8c1afcd 100644 --- a/apps/web-ele/src/views/member/group/data.ts +++ b/apps/web-ele/src/views/member/group/data.ts @@ -10,17 +10,18 @@ import { z } from '#/adapter/form'; export function useFormSchema(): VbenFormSchema[] { return [ { - component: 'Input', fieldName: 'id', + component: 'Input', dependencies: { triggerFields: [''], show: () => false, }, }, { - component: 'Input', fieldName: 'name', label: '分组名称', + component: 'Input', + rules: 'required', }, { fieldName: 'status', @@ -33,6 +34,14 @@ export function useFormSchema(): VbenFormSchema[] { }, rules: z.number().default(CommonStatusEnum.ENABLE), }, + { + fieldName: 'remark', + label: '备注', + component: 'Textarea', + componentProps: { + placeholder: '请输入备注', + }, + }, ]; } @@ -43,14 +52,28 @@ export function useGridFormSchema(): VbenFormSchema[] { fieldName: 'name', label: '分组名称', component: 'Input', + componentProps: { + placeholder: '请输入分组名称', + allowClear: true, + }, }, { fieldName: 'status', label: '状态', component: 'Select', componentProps: { - clearable: true, options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), + placeholder: '请选择状态', + allowClear: true, + }, + }, + { + fieldName: 'createTime', + label: '创建时间', + component: 'RangePicker', + componentProps: { + placeholder: ['开始日期', '结束日期'], + allowClear: true, }, }, ]; @@ -62,14 +85,23 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '编号', + minWidth: 100, }, { field: 'name', title: '分组名称', + minWidth: 150, + }, + { + field: 'remark', + title: '备注', + minWidth: 200, + showOverflow: 'tooltip', }, { field: 'status', title: '状态', + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, @@ -78,6 +110,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-ele/src/views/member/group/index.vue b/apps/web-ele/src/views/member/group/index.vue index e87baf7f2..5e06fc356 100644 --- a/apps/web-ele/src/views/member/group/index.vue +++ b/apps/web-ele/src/views/member/group/index.vue @@ -19,7 +19,7 @@ const [FormModal, formModalApi] = useVbenModal({ }); /** 刷新表格 */ -function onRefresh() { +function handleRefresh() { gridApi.query(); } @@ -39,9 +39,9 @@ async function handleDelete(row: MemberGroupApi.Group) { text: $t('ui.actionMessage.deleting', [row.name]), }); try { - await deleteGroup(row.id as number); + await deleteGroup(row.id!); ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name])); - onRefresh(); + handleRefresh(); } finally { loadingInstance.close(); } @@ -68,6 +68,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isHover: true, }, toolbarConfig: { refresh: true, @@ -79,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({