feat:【system 系统功能】邮箱增加抄送、密送,支持多个

pull/191/head^2
YunaiV 2025-08-05 22:23:29 +08:00
parent 55061b73de
commit d48b78a462
7 changed files with 90 additions and 17 deletions

View File

@ -8,7 +8,9 @@ export namespace SystemMailLogApi {
id: number; id: number;
userId: number; userId: number;
userType: number; userType: number;
toMail: string; toMails: string[];
ccMails?: string[];
bccMails?: string[];
accountId: number; accountId: number;
fromMail: string; fromMail: string;
templateId: number; templateId: number;

View File

@ -20,7 +20,9 @@ export namespace SystemMailTemplateApi {
/** 邮件发送信息 */ /** 邮件发送信息 */
export interface MailSendReqVO { export interface MailSendReqVO {
mail: string; toMails: string[];
ccMails?: string[];
bccMails?: string[];
templateCode: string; templateCode: string;
templateParams: Record<string, any>; templateParams: Record<string, any>;
} }

View File

@ -91,9 +91,28 @@ export function useGridColumns<T = SystemMailLogApi.MailLog>(
formatter: 'formatDateTime', formatter: 'formatDateTime',
}, },
{ {
field: 'toMail', field: 'userType',
title: '收件邮箱', title: '接收用户',
minWidth: 160, minWidth: 150,
slots: { default: 'userInfo' },
},
{
field: 'toMails',
title: '接收信息',
minWidth: 300,
formatter: ({ row }) => {
const lines: string[] = [];
if (row.toMails && row.toMails.length > 0) {
lines.push(`收件:${row.toMails.join('、')}`);
}
if (row.ccMails && row.ccMails.length > 0) {
lines.push(`抄送:${row.ccMails.join('、')}`);
}
if (row.bccMails && row.bccMails.length > 0) {
lines.push(`密送:${row.bccMails.join('、')}`);
}
return lines.join('\n');
},
}, },
{ {
field: 'templateTitle', field: 'templateTitle',

View File

@ -9,6 +9,8 @@ import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { getMailLogPage } from '#/api/system/mail/log'; import { getMailLogPage } from '#/api/system/mail/log';
import { DictTag } from '#/components/dict-tag';
import { DICT_TYPE } from '#/utils';
import { useGridColumns, useGridFormSchema } from './data'; import { useGridColumns, useGridFormSchema } from './data';
import Detail from './modules/detail.vue'; import Detail from './modules/detail.vue';
@ -78,6 +80,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
<DetailModal @success="onRefresh" /> <DetailModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">
<template #userInfo="{ row }">
<div v-if="row.userType && row.userId" class="flex items-center gap-1">
<DictTag :type="DICT_TYPE.USER_TYPE" :value="row.userType" />
<span>({{ row.userId }})</span>
</div>
<div v-else>-</div>
</template>
<template #toolbar-tools> </template> <template #toolbar-tools> </template>
</Grid> </Grid>
</Page> </Page>

View File

@ -47,17 +47,31 @@ const [Modal, modalApi] = useVbenModal({
<ElDescriptionsItem label="创建时间"> <ElDescriptionsItem label="创建时间">
{{ formatDateTime(formData?.createTime || '') }} {{ formatDateTime(formData?.createTime || '') }}
</ElDescriptionsItem> </ElDescriptionsItem>
<ElDescriptionsItem label="收件邮箱">
{{ formData?.toMail }}
</ElDescriptionsItem>
<ElDescriptionsItem label="发送邮箱"> <ElDescriptionsItem label="发送邮箱">
{{ formData?.fromMail }} {{ formData?.fromMail }}
</ElDescriptionsItem> </ElDescriptionsItem>
<ElDescriptionsItem label="用户编号"> <ElDescriptionsItem label="接收用户">
{{ formData?.userId }} <div
v-if="formData?.userType && formData?.userId"
class="flex items-center gap-1"
>
<DictTag :type="DICT_TYPE.USER_TYPE" :value="formData.userType" />
<span>({{ formData.userId }})</span>
</div>
<div v-else></div>
</ElDescriptionsItem> </ElDescriptionsItem>
<ElDescriptionsItem label="用户类型"> <ElDescriptionsItem label="接收信息" :span="2">
{{ formData?.userType }} <div v-if="formData">
<div v-if="formData.toMails && formData.toMails.length > 0">
收件{{ formData.toMails.join('、') }}
</div>
<div v-if="formData.ccMails && formData.ccMails.length > 0">
抄送{{ formData.ccMails.join('、') }}
</div>
<div v-if="formData.bccMails && formData.bccMails.length > 0">
密送{{ formData.bccMails.join('、') }}
</div>
</div>
</ElDescriptionsItem> </ElDescriptionsItem>
<ElDescriptionsItem label="模板编号"> <ElDescriptionsItem label="模板编号">
{{ formData?.templateId }} {{ formData?.templateId }}

View File

@ -126,13 +126,31 @@ export function useSendMailFormSchema(): VbenFormSchema[] {
}, },
}, },
{ {
fieldName: 'mail', fieldName: 'toMails',
label: '收件邮箱', label: '收件邮箱',
component: 'Input', component: 'Textarea',
componentProps: { componentProps: {
placeholder: '请输入收件邮箱', placeholder: '请输入收件邮箱,每行一个邮箱地址',
rows: 3,
},
},
{
fieldName: 'ccMails',
label: '抄送邮箱',
component: 'Textarea',
componentProps: {
placeholder: '请输入抄送邮箱,每行一个邮箱地址',
rows: 2,
},
},
{
fieldName: 'bccMails',
label: '密送邮箱',
component: 'Textarea',
componentProps: {
placeholder: '请输入密送邮箱,每行一个邮箱地址',
rows: 2,
}, },
rules: z.string().email('请输入正确的邮箱'),
}, },
]; ];
} }

View File

@ -42,8 +42,17 @@ const [Modal, modalApi] = useVbenModal({
paramsObj[param] = values[`param_${param}`]; paramsObj[param] = values[`param_${param}`];
}); });
} }
const parseEmails = (text: string): string[] => {
if (!text) return [];
return text
.split('\n')
.map((email) => email.trim())
.filter((email) => email.length > 0);
};
const data: SystemMailTemplateApi.MailSendReqVO = { const data: SystemMailTemplateApi.MailSendReqVO = {
mail: values.mail, toMails: parseEmails(values.toMails || ''),
ccMails: parseEmails(values.ccMails || ''),
bccMails: parseEmails(values.bccMails || ''),
templateCode: formData.value?.code || '', templateCode: formData.value?.code || '',
templateParams: paramsObj, templateParams: paramsObj,
}; };