From 2b8e4c6de5dfbe6a8f82a81d9c1744e183ea19cb Mon Sep 17 00:00:00 2001 From: xingyu Date: Wed, 24 May 2023 17:42:09 +0800 Subject: [PATCH] feat: send sms --- src/api/system/sms/smsTemplate/index.ts | 19 +++- .../system/mail/template/SendMailModal.vue | 1 - src/views/system/mail/template/index.vue | 4 +- .../system/notify/components/message.data.ts | 1 - .../system/notify/message/message.data.ts | 1 - .../notify/template/SendNotifyModal.vue | 1 - .../system/sms/template/SendSmsModal.vue | 88 +++++++++++++++++++ src/views/system/sms/template/index.vue | 5 +- .../system/sms/template/smsTemplate.data.ts | 25 ++++++ 9 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 src/views/system/sms/template/SendSmsModal.vue diff --git a/src/api/system/sms/smsTemplate/index.ts b/src/api/system/sms/smsTemplate/index.ts index 9158687..f1fa23c 100644 --- a/src/api/system/sms/smsTemplate/index.ts +++ b/src/api/system/sms/smsTemplate/index.ts @@ -18,7 +18,9 @@ export interface SmsTemplateVO { export interface SendSmsReqVO { mobile: string templateCode: string - templateParams: Map + templateParams: { + [key: string]: any + } } export interface SmsTemplatePageReqVO { @@ -66,6 +68,21 @@ export function deleteSmsTemplate(id: number) { return defHttp.delete({ url: '/system/sms-template/delete?id=' + id }) } +// 邮件模板 +export type SmsTemplate = { + name: string // 标题 + code: string // 编码 + accountId: number + nickname: string // 发送人 + title: string // 标题 + content: string // 内容 + status: number // + remark?: any // 备注 + id: number + params: string[] // 模板里的参数 + createTime: number +} + // 发送短信 export function sendSms(data: SendSmsReqVO) { return defHttp.post({ url: '/system/sms-template/send-sms', data }) diff --git a/src/views/system/mail/template/SendMailModal.vue b/src/views/system/mail/template/SendMailModal.vue index 84d9a17..b0716bf 100644 --- a/src/views/system/mail/template/SendMailModal.vue +++ b/src/views/system/mail/template/SendMailModal.vue @@ -21,7 +21,6 @@ const templateCode = ref('') const [register, { setFieldsValue, getFieldsValue, validateFields, resetFields, clearValidate, setProps }] = useForm({ labelWidth: 100, - // schemas: reactiveSchemas, 这里用动态绑定会有问题 baseColProps: { span: 24 }, diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue index af9520c..67bd9e7 100644 --- a/src/views/system/mail/template/index.vue +++ b/src/views/system/mail/template/index.vue @@ -58,7 +58,7 @@ defineOptions({ name: 'SystemMailTemplate' }) const { t } = useI18n() const { createMessage } = useMessage() const [registerTemplateModal, { openModal }] = useModal() -const [registerSendModal, { openModal: openSenModal }] = useModal() +const [registerSendModal, { openModal: openSendModal }] = useModal() const [registerTable, { reload }] = useTable({ title: '邮件模板列表', api: getMailTemplatePage, @@ -80,7 +80,7 @@ function handleCreate() { } function handleSend(record: Recordable) { - openSenModal(true, record) + openSendModal(true, record) } function handleEdit(record: Recordable) { diff --git a/src/views/system/notify/components/message.data.ts b/src/views/system/notify/components/message.data.ts index 4f1c07e..59246e1 100644 --- a/src/views/system/notify/components/message.data.ts +++ b/src/views/system/notify/components/message.data.ts @@ -22,7 +22,6 @@ export const infoSchema: DescItem[] = [ field: 'userType', label: '用户类型', render: (value) => { - console.log(value) return useRender.renderDict(value, DICT_TYPE.USER_TYPE) } }, diff --git a/src/views/system/notify/message/message.data.ts b/src/views/system/notify/message/message.data.ts index e241d7e..0e945e9 100644 --- a/src/views/system/notify/message/message.data.ts +++ b/src/views/system/notify/message/message.data.ts @@ -129,7 +129,6 @@ export const infoSchema: DescItem[] = [ field: 'userType', label: '用户类型', render: (value) => { - console.log(value) return useRender.renderDict(value, DICT_TYPE.USER_TYPE) } }, diff --git a/src/views/system/notify/template/SendNotifyModal.vue b/src/views/system/notify/template/SendNotifyModal.vue index fc86a15..0cd490b 100644 --- a/src/views/system/notify/template/SendNotifyModal.vue +++ b/src/views/system/notify/template/SendNotifyModal.vue @@ -20,7 +20,6 @@ const templateCode = ref('') const [register, { setFieldsValue, getFieldsValue, validateFields, resetFields, clearValidate, setProps }] = useForm({ labelWidth: 100, - // schemas: reactiveSchemas, 这里用动态绑定会有问题 baseColProps: { span: 24 }, diff --git a/src/views/system/sms/template/SendSmsModal.vue b/src/views/system/sms/template/SendSmsModal.vue new file mode 100644 index 0000000..88fd257 --- /dev/null +++ b/src/views/system/sms/template/SendSmsModal.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue index d6eaddd..ccee810 100644 --- a/src/views/system/sms/template/index.vue +++ b/src/views/system/sms/template/index.vue @@ -37,6 +37,7 @@ +