diff --git a/apps/web-antd/src/api/bpm/definition/index.ts b/apps/web-antd/src/api/bpm/definition/index.ts index adf26c5ad..befd60650 100644 --- a/apps/web-antd/src/api/bpm/definition/index.ts +++ b/apps/web-antd/src/api/bpm/definition/index.ts @@ -4,8 +4,7 @@ import { requestClient } from '#/api/request'; export namespace BpmProcessDefinitionApi { /** 流程定义 */ - // TODO @ziye:不用 VO 后缀哈 - export interface ProcessDefinitionVO { + export interface ProcessDefinition { id: string; version: number; deploymentTime: number; @@ -21,7 +20,7 @@ export namespace BpmProcessDefinitionApi { /** 查询流程定义 */ export async function getProcessDefinition(id?: string, key?: string) { - return requestClient.get( + return requestClient.get( '/bpm/process-definition/get', { params: { id, key }, @@ -32,13 +31,13 @@ export async function getProcessDefinition(id?: string, key?: string) { /** 分页查询流程定义 */ export async function getProcessDefinitionPage(params: PageParam) { return requestClient.get< - PageResult + PageResult >('/bpm/process-definition/page', { params }); } /** 查询流程定义列表 */ export async function getProcessDefinitionList(params: any) { - return requestClient.get( + return requestClient.get( '/bpm/process-definition/list', { params, @@ -49,6 +48,6 @@ export async function getProcessDefinitionList(params: any) { /** 查询流程定义列表(简单列表) */ export async function getSimpleProcessDefinitionList() { return requestClient.get< - PageResult + PageResult >('/bpm/process-definition/simple-list'); } diff --git a/apps/web-antd/src/api/bpm/oa/leave/index.ts b/apps/web-antd/src/api/bpm/oa/leave/index.ts index 90f6e2602..b1afbd255 100644 --- a/apps/web-antd/src/api/bpm/oa/leave/index.ts +++ b/apps/web-antd/src/api/bpm/oa/leave/index.ts @@ -3,8 +3,7 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace BpmOALeaveApi { - // TODO @ziye:不用 VO 后缀 - export interface LeaveVO { + export interface Leave { id: number; status: number; type: number; @@ -18,23 +17,23 @@ export namespace BpmOALeaveApi { } /** 创建请假申请 */ -export async function createLeave(data: BpmOALeaveApi.LeaveVO) { +export async function createLeave(data: BpmOALeaveApi.Leave) { return requestClient.post('/bpm/oa/leave/create', data); } /** 更新请假申请 */ -export async function updateLeave(data: BpmOALeaveApi.LeaveVO) { +export async function updateLeave(data: BpmOALeaveApi.Leave) { return requestClient.post('/bpm/oa/leave/update', data); } /** 获得请假申请 */ export async function getLeave(id: number) { - return requestClient.get(`/bpm/oa/leave/get?id=${id}`); + return requestClient.get(`/bpm/oa/leave/get?id=${id}`); } /** 获得请假申请分页 */ export async function getLeavePage(params: PageParam) { - return requestClient.get>( + return requestClient.get>( '/bpm/oa/leave/page', { params }, ); diff --git a/apps/web-antd/src/api/bpm/processExpression/index.ts b/apps/web-antd/src/api/bpm/processExpression/index.ts index 3408c38c3..ee90d7588 100644 --- a/apps/web-antd/src/api/bpm/processExpression/index.ts +++ b/apps/web-antd/src/api/bpm/processExpression/index.ts @@ -3,9 +3,8 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace BpmProcessExpressionApi { - // TODO @ziye:不用 VO 后缀 - /** 流程表达式 VO */ - export interface ProcessExpressionVO { + /** 流程表达式 */ + export interface ProcessExpression { id: number; // 编号 name: string; // 表达式名字 status: number; // 表达式状态 @@ -16,27 +15,27 @@ export namespace BpmProcessExpressionApi { /** 查询流程表达式分页 */ export async function getProcessExpressionPage(params: PageParam) { return requestClient.get< - PageResult + PageResult >('/bpm/process-expression/page', { params }); } /** 查询流程表达式详情 */ export async function getProcessExpression(id: number) { - return requestClient.get( + return requestClient.get( `/bpm/process-expression/get?id=${id}`, ); } /** 新增流程表达式 */ export async function createProcessExpression( - data: BpmProcessExpressionApi.ProcessExpressionVO, + data: BpmProcessExpressionApi.ProcessExpression, ) { return requestClient.post('/bpm/process-expression/create', data); } /** 修改流程表达式 */ export async function updateProcessExpression( - data: BpmProcessExpressionApi.ProcessExpressionVO, + data: BpmProcessExpressionApi.ProcessExpression, ) { return requestClient.put('/bpm/process-expression/update', data); } diff --git a/apps/web-antd/src/api/bpm/processInstance/index.ts b/apps/web-antd/src/api/bpm/processInstance/index.ts index 80ede2b76..0550b595f 100644 --- a/apps/web-antd/src/api/bpm/processInstance/index.ts +++ b/apps/web-antd/src/api/bpm/processInstance/index.ts @@ -9,29 +9,29 @@ import { requestClient } from '#/api/request'; export namespace BpmProcessInstanceApi { // TODO @芋艿:一些注释缺少或者不对; - export type Task = { + export interface Task { id: number; name: string; - }; + } - export type User = { + export interface User { avatar: string; id: number; nickname: string; - }; + } // 审批任务信息 - export type ApprovalTaskInfo = { + export interface ApprovalTaskInfo { assigneeUser: User; id: number; ownerUser: User; reason: string; signPicUrl: string; status: number; - }; + } // 审批节点信息 - export type ApprovalNodeInfo = { + export interface ApprovalNodeInfo { candidateStrategy?: BpmCandidateStrategyEnum; candidateUsers?: User[]; endTime?: Date; @@ -41,10 +41,10 @@ export namespace BpmProcessInstanceApi { startTime?: Date; status: number; tasks: ApprovalTaskInfo[]; - }; + } /** 流程实例 */ - export type ProcessInstanceVO = { + export interface ProcessInstance { businessKey: string; category: string; createTime: string; @@ -61,20 +61,20 @@ export namespace BpmProcessInstanceApi { startUser?: User; status: number; tasks?: BpmProcessInstanceApi.Task[]; - }; + } // 审批详情 - export type ApprovalDetail = { + export interface ApprovalDetail { activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; formFieldsPermission: any; processDefinition: BpmModelApi.ProcessDefinition; - processInstance: BpmProcessInstanceApi.ProcessInstanceVO; + processInstance: BpmProcessInstanceApi.ProcessInstance; status: number; - todoTask: BpmTaskApi.TaskVO; - }; + todoTask: BpmTaskApi.Task; + } - // 抄送流程实例 VO - export type CopyVO = { + // 抄送流程实例 + export interface Copy { activityId: string; activityName: string; createTime: number; @@ -90,12 +90,12 @@ export namespace BpmProcessInstanceApi { value: string; }[]; taskId: string; - }; + } } /** 查询我的流程实例分页 */ export async function getProcessInstanceMyPage(params: PageParam) { - return requestClient.get>( + return requestClient.get>( '/bpm/process-instance/my-page', { params }, ); @@ -103,7 +103,7 @@ export async function getProcessInstanceMyPage(params: PageParam) { /** 查询管理员流程实例分页 */ export async function getProcessInstanceManagerPage(params: PageParam) { - return requestClient.get>( + return requestClient.get>( '/bpm/process-instance/manager-page', { params }, ); @@ -111,7 +111,7 @@ export async function getProcessInstanceManagerPage(params: PageParam) { /** 新增流程实例 */ export async function createProcessInstance(data: any) { - return requestClient.post( + return requestClient.post( '/bpm/process-instance/create', data, ); @@ -142,14 +142,14 @@ export async function cancelProcessInstanceByAdmin(id: number, reason: string) { /** 查询流程实例详情 */ export async function getProcessInstance(id: number) { - return requestClient.get( + return requestClient.get( `/bpm/process-instance/get?id=${id}`, ); } /** 查询复制流程实例分页 */ export async function getProcessInstanceCopyPage(params: PageParam) { - return requestClient.get>( + return requestClient.get>( '/bpm/process-instance/copy/page', { params }, ); @@ -157,9 +157,9 @@ export async function getProcessInstanceCopyPage(params: PageParam) { /** 更新流程实例 */ export async function updateProcessInstance( - data: BpmProcessInstanceApi.ProcessInstanceVO, + data: BpmProcessInstanceApi.ProcessInstance, ) { - return requestClient.put( + return requestClient.put( '/bpm/process-instance/update', data, ); @@ -183,7 +183,7 @@ export async function getNextApprovalNodes(params: any) { /** 获取表单字段权限 */ export async function getFormFieldsPermission(params: any) { - return requestClient.get( + return requestClient.get( `/bpm/process-instance/get-form-fields-permission`, { params }, ); @@ -191,7 +191,7 @@ export async function getFormFieldsPermission(params: any) { /** 获取流程实例 BPMN 模型视图 */ export async function getProcessInstanceBpmnModelView(id: string) { - return requestClient.get( + return requestClient.get( `/bpm/process-instance/get-bpmn-model-view?id=${id}`, ); } diff --git a/apps/web-antd/src/api/bpm/processListener/index.ts b/apps/web-antd/src/api/bpm/processListener/index.ts index 8d93107ac..df5ba3788 100644 --- a/apps/web-antd/src/api/bpm/processListener/index.ts +++ b/apps/web-antd/src/api/bpm/processListener/index.ts @@ -3,9 +3,8 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace BpmProcessListenerApi { - // TODO @ziye:不用 VO 后缀 - /** BPM 流程监听器 VO */ - export interface ProcessListenerVO { + /** BPM 流程监听器 */ + export interface ProcessListener { id: number; // 编号 name: string; // 监听器名字 type: string; // 监听器类型 @@ -18,7 +17,7 @@ export namespace BpmProcessListenerApi { /** 查询流程监听器分页 */ export async function getProcessListenerPage(params: PageParam) { - return requestClient.get>( + return requestClient.get>( '/bpm/process-listener/page', { params }, ); @@ -26,21 +25,21 @@ export async function getProcessListenerPage(params: PageParam) { /** 查询流程监听器详情 */ export async function getProcessListener(id: number) { - return requestClient.get( + return requestClient.get( `/bpm/process-listener/get?id=${id}`, ); } /** 新增流程监听器 */ export async function createProcessListener( - data: BpmProcessListenerApi.ProcessListenerVO, + data: BpmProcessListenerApi.ProcessListener, ) { return requestClient.post('/bpm/process-listener/create', data); } /** 修改流程监听器 */ export async function updateProcessListener( - data: BpmProcessListenerApi.ProcessListenerVO, + data: BpmProcessListenerApi.ProcessListener, ) { return requestClient.put('/bpm/process-listener/update', data); } diff --git a/apps/web-antd/src/api/bpm/task/index.ts b/apps/web-antd/src/api/bpm/task/index.ts index 89a8ceede..510ea1747 100644 --- a/apps/web-antd/src/api/bpm/task/index.ts +++ b/apps/web-antd/src/api/bpm/task/index.ts @@ -5,9 +5,8 @@ import type { BpmProcessInstanceApi } from '../processInstance'; import { requestClient } from '#/api/request'; export namespace BpmTaskApi { - // TODO @ziye:不用 VO 后缀;注释使用 /** */ 风格; - /** BPM 流程监听器 VO */ - export interface TaskVO { + /** BPM 流程监听器 */ + export interface Task { id: number; // 编号 name: string; // 监听器名字 type: string; // 监听器类型 @@ -16,8 +15,8 @@ export namespace BpmTaskApi { valueType: string; // 监听器值类型 } - // 流程任务 VO - export interface TaskManagerVO { + // 流程任务 + export interface TaskManager { id: string; // 编号 name: string; // 任务名称 createTime: number; // 创建时间 @@ -29,7 +28,7 @@ export namespace BpmTaskApi { assigneeUser: any; // 处理人 taskDefinitionKey: string; // 任务定义key processInstanceId: string; // 流程实例id - processInstance: BpmProcessInstanceApi.ProcessInstanceVO; // 流程实例 + processInstance: BpmProcessInstanceApi.ProcessInstance; // 流程实例 parentTaskId: any; // 父任务id children: any; // 子任务 formId: any; // 表单id @@ -46,27 +45,21 @@ export namespace BpmTaskApi { /** 查询待办任务分页 */ export async function getTaskTodoPage(params: PageParam) { - return requestClient.get>( - '/bpm/task/todo-page', - { - params, - }, - ); + return requestClient.get>('/bpm/task/todo-page', { + params, + }); } /** 查询已办任务分页 */ export async function getTaskDonePage(params: PageParam) { - return requestClient.get>( - '/bpm/task/done-page', - { - params, - }, - ); + return requestClient.get>('/bpm/task/done-page', { + params, + }); } /** 查询任务管理分页 */ export async function getTaskManagerPage(params: PageParam) { - return requestClient.get>( + return requestClient.get>( '/bpm/task/manager-page', { params }, ); diff --git a/apps/web-antd/src/api/bpm/userGroup/index.ts b/apps/web-antd/src/api/bpm/userGroup/index.ts index bae30827e..9e8f9a1bc 100644 --- a/apps/web-antd/src/api/bpm/userGroup/index.ts +++ b/apps/web-antd/src/api/bpm/userGroup/index.ts @@ -3,9 +3,8 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace BpmUserGroupApi { - // TODO @ziye:不用 VO 后缀 - /** BPM 用户组 VO */ - export interface UserGroupVO { + /** BPM 用户组 */ + export interface UserGroup { id: number; name: string; description: string; @@ -18,7 +17,7 @@ export namespace BpmUserGroupApi { /** 查询用户组分页 */ export async function getUserGroupPage(params: PageParam) { - return requestClient.get>( + return requestClient.get>( '/bpm/user-group/page', { params }, ); @@ -26,18 +25,18 @@ export async function getUserGroupPage(params: PageParam) { /** 查询用户组详情 */ export async function getUserGroup(id: number) { - return requestClient.get( + return requestClient.get( `/bpm/user-group/get?id=${id}`, ); } /** 新增用户组 */ -export async function createUserGroup(data: BpmUserGroupApi.UserGroupVO) { +export async function createUserGroup(data: BpmUserGroupApi.UserGroup) { return requestClient.post('/bpm/user-group/create', data); } /** 修改用户组 */ -export async function updateUserGroup(data: BpmUserGroupApi.UserGroupVO) { +export async function updateUserGroup(data: BpmUserGroupApi.UserGroup) { return requestClient.put('/bpm/user-group/update', data); } @@ -48,7 +47,7 @@ export async function deleteUserGroup(id: number) { /** 查询用户组列表 */ export async function getUserGroupSimpleList() { - return requestClient.get( + return requestClient.get( `/bpm/user-group/simple-list`, ); } diff --git a/apps/web-antd/src/api/infra/codegen/index.ts b/apps/web-antd/src/api/infra/codegen/index.ts index 1c2d97ba3..c09ab425f 100644 --- a/apps/web-antd/src/api/infra/codegen/index.ts +++ b/apps/web-antd/src/api/infra/codegen/index.ts @@ -65,13 +65,13 @@ export namespace InfraCodegenApi { } /** 更新代码生成请求 */ - export interface CodegenUpdateReqVO { + export interface CodegenUpdateReq { table: any | CodegenTable; columns: CodegenColumn[]; } /** 创建代码生成请求 */ - export interface CodegenCreateListReqVO { + export interface CodegenCreateListReq { dataSourceConfigId?: number; tableNames: string[]; } @@ -106,7 +106,7 @@ export function getCodegenTable(tableId: number) { } /** 修改代码生成表定义 */ -export function updateCodegenTable(data: InfraCodegenApi.CodegenUpdateReqVO) { +export function updateCodegenTable(data: InfraCodegenApi.CodegenUpdateReq) { return requestClient.put('/infra/codegen/update', data); } @@ -136,9 +136,7 @@ export function getSchemaTableList(params: any) { } /** 基于数据库的表结构,创建代码生成器的表定义 */ -export function createCodegenList( - data: InfraCodegenApi.CodegenCreateListReqVO, -) { +export function createCodegenList(data: InfraCodegenApi.CodegenCreateListReq) { return requestClient.post('/infra/codegen/create-list', data); } diff --git a/apps/web-antd/src/api/infra/file/index.ts b/apps/web-antd/src/api/infra/file/index.ts index a399db67d..982789885 100644 --- a/apps/web-antd/src/api/infra/file/index.ts +++ b/apps/web-antd/src/api/infra/file/index.ts @@ -19,7 +19,7 @@ export namespace InfraFileApi { } /** 文件预签名地址 */ - export interface FilePresignedUrlRespVO { + export interface FilePresignedUrlResp { configId: number; // 文件配置编号 uploadUrl: string; // 文件上传 URL url: string; // 文件 URL @@ -27,7 +27,7 @@ export namespace InfraFileApi { } /** 上传文件 */ - export interface FileUploadReqVO { + export interface FileUploadReq { file: globalThis.File; directory?: string; } @@ -47,7 +47,7 @@ export function deleteFile(id: number) { /** 获取文件预签名地址 */ export function getFilePresignedUrl(name: string, directory?: string) { - return requestClient.get( + return requestClient.get( '/infra/file/presigned-url', { params: { name, directory }, @@ -62,7 +62,7 @@ export function createFile(data: InfraFileApi.File) { /** 上传文件 */ export function uploadFile( - data: InfraFileApi.FileUploadReqVO, + data: InfraFileApi.FileUploadReq, onUploadProgress?: AxiosProgressEvent, ) { // 特殊:由于 upload 内部封装,即使 directory 为 undefined,也会传递给后端 diff --git a/apps/web-antd/src/api/mall/statistics/common.ts b/apps/web-antd/src/api/mall/statistics/common.ts index 871457086..bb474b5cc 100644 --- a/apps/web-antd/src/api/mall/statistics/common.ts +++ b/apps/web-antd/src/api/mall/statistics/common.ts @@ -1,5 +1,5 @@ -/** 数据对照 Response VO */ -export interface MallDataComparisonRespVO { +/** 数据对照 Response */ +export interface MallDataComparisonResp { value: T; reference: T; } diff --git a/apps/web-antd/src/api/mall/statistics/member.ts b/apps/web-antd/src/api/mall/statistics/member.ts index c839d5fe2..fb7a6b01a 100644 --- a/apps/web-antd/src/api/mall/statistics/member.ts +++ b/apps/web-antd/src/api/mall/statistics/member.ts @@ -1,32 +1,32 @@ -import type { MallDataComparisonRespVO } from './common'; +import type { MallDataComparisonResp } from './common'; import { formatDate } from '@vben/utils'; import { requestClient } from '#/api/request'; export namespace MallMemberStatisticsApi { - /** 会员分析 Request VO */ + /** 会员分析 Request */ export interface AnalyseReq { times: Date[]; } - /** 会员分析对照数据 Response VO */ + /** 会员分析对照数据 Response */ export interface AnalyseComparison { registerUserCount: number; visitUserCount: number; rechargeUserCount: number; } - /** 会员分析 Response VO */ + /** 会员分析 Response */ export interface Analyse { visitUserCount: number; orderUserCount: number; payUserCount: number; atv: number; - comparison: MallDataComparisonRespVO; + comparison: MallDataComparisonResp; } - /** 会员地区统计 Response VO */ + /** 会员地区统计 Response */ export interface AreaStatistics { areaId: number; areaName: string; @@ -36,13 +36,13 @@ export namespace MallMemberStatisticsApi { orderPayPrice: number; } - /** 会员性别统计 Response VO */ + /** 会员性别统计 Response */ export interface SexStatistics { sex: number; userCount: number; } - /** 会员统计 Response VO */ + /** 会员统计 Response */ export interface Summary { userCount: number; rechargeUserCount: number; @@ -50,13 +50,13 @@ export namespace MallMemberStatisticsApi { expensePrice: number; } - /** 会员终端统计 Response VO */ + /** 会员终端统计 Response */ export interface TerminalStatistics { terminal: number; userCount: number; } - /** 会员数量统计 Response VO */ + /** 会员数量统计 Response */ export interface Count { /** 用户访问量 */ visitUserCount: string; @@ -64,7 +64,7 @@ export namespace MallMemberStatisticsApi { registerUserCount: number; } - /** 会员注册数量 Response VO */ + /** 会员注册数量 Response */ export interface RegisterCount { date: string; count: number; @@ -114,7 +114,7 @@ export function getMemberTerminalStatisticsList() { /** 获得用户数量量对照 */ export function getUserCountComparison() { return requestClient.get< - MallDataComparisonRespVO + MallDataComparisonResp >('/statistics/member/user-count-comparison'); } diff --git a/apps/web-antd/src/api/mall/statistics/pay.ts b/apps/web-antd/src/api/mall/statistics/pay.ts index 958bfa8b0..d78ea034d 100644 --- a/apps/web-antd/src/api/mall/statistics/pay.ts +++ b/apps/web-antd/src/api/mall/statistics/pay.ts @@ -2,7 +2,7 @@ import { requestClient } from '#/api/request'; export namespace MallPayStatisticsApi { /** 支付统计 */ - export interface PaySummaryRespVO { + export interface PaySummaryResp { /** 充值金额,单位分 */ rechargePrice: number; } @@ -10,7 +10,7 @@ export namespace MallPayStatisticsApi { /** 获取钱包充值金额 */ export function getWalletRechargePrice() { - return requestClient.get( + return requestClient.get( '/statistics/pay/summary', ); } diff --git a/apps/web-antd/src/api/mall/statistics/product.ts b/apps/web-antd/src/api/mall/statistics/product.ts index 4b0ee9938..d458d4353 100644 --- a/apps/web-antd/src/api/mall/statistics/product.ts +++ b/apps/web-antd/src/api/mall/statistics/product.ts @@ -1,6 +1,6 @@ import type { PageParam, PageResult } from '@vben/request'; -import type { MallDataComparisonRespVO } from './common'; +import type { MallDataComparisonResp } from './common'; import { requestClient } from '#/api/request'; @@ -43,7 +43,7 @@ export namespace MallProductStatisticsApi { /** 获得商品统计分析 */ export function getProductStatisticsAnalyse(params: PageParam) { return requestClient.get< - MallDataComparisonRespVO + MallDataComparisonResp >('/statistics/product/analyse', { params }); } diff --git a/apps/web-antd/src/api/mall/statistics/trade.ts b/apps/web-antd/src/api/mall/statistics/trade.ts index b4b0195e3..1f866c636 100644 --- a/apps/web-antd/src/api/mall/statistics/trade.ts +++ b/apps/web-antd/src/api/mall/statistics/trade.ts @@ -1,11 +1,11 @@ -import type { MallDataComparisonRespVO } from './common'; +import type { MallDataComparisonResp } from './common'; import { formatDate } from '@vben/utils'; import { requestClient } from '#/api/request'; export namespace MallTradeStatisticsApi { - /** 交易统计 Response VO */ + /** 交易统计 Response */ export interface TradeSummary { yesterdayOrderCount: number; monthOrderCount: number; @@ -13,12 +13,12 @@ export namespace MallTradeStatisticsApi { monthPayPrice: number; } - /** 交易状况 Request VO */ + /** 交易状况 Request */ export interface TradeTrendReq { times: [Date, Date]; } - /** 交易状况统计 Response VO */ + /** 交易状况统计 Response */ export interface TradeTrendSummary { time: string; turnoverPrice: number; @@ -30,7 +30,7 @@ export namespace MallTradeStatisticsApi { afterSaleRefundPrice: number; } - /** 交易订单数量 Response VO */ + /** 交易订单数量 Response */ export interface TradeOrderCount { /** 待发货 */ undelivered?: number; @@ -42,7 +42,7 @@ export namespace MallTradeStatisticsApi { auditingWithdraw?: number; } - /** 交易订单统计 Response VO */ + /** 交易订单统计 Response */ export interface TradeOrderSummary { /** 支付订单商品数 */ orderPayCount?: number; @@ -50,7 +50,7 @@ export namespace MallTradeStatisticsApi { orderPayPrice?: number; } - /** 订单量趋势统计 Response VO */ + /** 订单量趋势统计 Response */ export interface TradeOrderTrend { /** 日期 */ date: string; @@ -71,7 +71,7 @@ const formatDateParam = (params: MallTradeStatisticsApi.TradeTrendReq) => { /** 查询交易统计 */ export function getTradeStatisticsSummary() { return requestClient.get< - MallDataComparisonRespVO + MallDataComparisonResp >('/statistics/trade/summary'); } @@ -80,7 +80,7 @@ export function getTradeStatisticsAnalyse( params: MallTradeStatisticsApi.TradeTrendReq, ) { return requestClient.get< - MallDataComparisonRespVO + MallDataComparisonResp >('/statistics/trade/analyse', { params: formatDateParam(params) }); } @@ -113,7 +113,7 @@ export function getOrderCount() { /** 获得交易订单数量对照 */ export function getOrderComparison() { return requestClient.get< - MallDataComparisonRespVO + MallDataComparisonResp >('/statistics/trade/order-comparison'); } @@ -124,7 +124,7 @@ export function getOrderCountTrendComparison( endTime: Date, ) { return requestClient.get< - MallDataComparisonRespVO[] + MallDataComparisonResp[] >('/statistics/trade/order-count-trend', { params: { type, diff --git a/apps/web-antd/src/api/pay/app/index.ts b/apps/web-antd/src/api/pay/app/index.ts index 2b09c57d2..d44e5ae2b 100644 --- a/apps/web-antd/src/api/pay/app/index.ts +++ b/apps/web-antd/src/api/pay/app/index.ts @@ -24,7 +24,7 @@ export namespace PayAppApi { status: number; } - export interface AppPageReqVO extends PageParam { + export interface AppPageReq extends PageParam { name?: string; status?: number; remark?: string; @@ -37,7 +37,7 @@ export namespace PayAppApi { } /** 查询支付应用列表 */ -export function getAppPage(params: PayAppApi.AppPageReqVO) { +export function getAppPage(params: PayAppApi.AppPageReq) { return requestClient.get>('/pay/app/page', { params, }); diff --git a/apps/web-antd/src/api/pay/demo/order/index.ts b/apps/web-antd/src/api/pay/demo/order/index.ts index 262351059..63cb1396d 100644 --- a/apps/web-antd/src/api/pay/demo/order/index.ts +++ b/apps/web-antd/src/api/pay/demo/order/index.ts @@ -20,7 +20,7 @@ export namespace DemoOrderApi { createTime?: Date; } - export interface OrderPageReqVO extends PageParam { + export interface OrderPageReq extends PageParam { spuId?: number; createTime?: Date[]; } @@ -32,7 +32,7 @@ export function createDemoOrder(data: DemoOrderApi.Order) { } /** 获得示例订单分页 */ -export function getDemoOrderPage(params: DemoOrderApi.OrderPageReqVO) { +export function getDemoOrderPage(params: DemoOrderApi.OrderPageReq) { return requestClient.get>( '/pay/demo-order/page', { diff --git a/apps/web-antd/src/api/pay/order/index.ts b/apps/web-antd/src/api/pay/order/index.ts index 31ba880d8..aff890dfa 100644 --- a/apps/web-antd/src/api/pay/order/index.ts +++ b/apps/web-antd/src/api/pay/order/index.ts @@ -40,7 +40,7 @@ export namespace PayOrderApi { } /** 支付订单分页请求 */ - export interface OrderPageReqVO extends PageParam { + export interface OrderPageReq extends PageParam { merchantId?: number; appId?: number; channelId?: number; @@ -66,7 +66,7 @@ export namespace PayOrderApi { } /** 支付订单导出请求 */ - export interface OrderExportReqVO { + export interface OrderExportReq { merchantId?: number; appId?: number; channelId?: number; @@ -93,7 +93,7 @@ export namespace PayOrderApi { } /** 查询支付订单列表 */ -export function getOrderPage(params: PayOrderApi.OrderPageReqVO) { +export function getOrderPage(params: PayOrderApi.OrderPageReq) { return requestClient.get>('/pay/order/page', { params, }); @@ -120,6 +120,6 @@ export function submitOrder(data: any) { } /** 导出支付订单 */ -export function exportOrder(params: PayOrderApi.OrderExportReqVO) { +export function exportOrder(params: PayOrderApi.OrderExportReq) { return requestClient.download('/pay/order/export-excel', { params }); } diff --git a/apps/web-antd/src/api/pay/refund/index.ts b/apps/web-antd/src/api/pay/refund/index.ts index 133a8bcb1..44c36b7c6 100644 --- a/apps/web-antd/src/api/pay/refund/index.ts +++ b/apps/web-antd/src/api/pay/refund/index.ts @@ -35,7 +35,7 @@ export namespace PayRefundApi { } /** 退款订单分页请求 */ - export interface RefundPageReqVO extends PageParam { + export interface RefundPageReq extends PageParam { merchantId?: number; appId?: number; channelId?: number; @@ -64,7 +64,7 @@ export namespace PayRefundApi { } /** 退款订单导出请求 */ - export interface RefundExportReqVO { + export interface RefundExportReq { merchantId?: number; appId?: number; channelId?: number; @@ -94,7 +94,7 @@ export namespace PayRefundApi { } /** 查询退款订单列表 */ -export function getRefundPage(params: PayRefundApi.RefundPageReqVO) { +export function getRefundPage(params: PayRefundApi.RefundPageReq) { return requestClient.get>( '/pay/refund/page', { @@ -124,6 +124,6 @@ export function deleteRefund(id: number) { } /** 导出退款订单 */ -export function exportRefund(params: PayRefundApi.RefundExportReqVO) { +export function exportRefund(params: PayRefundApi.RefundExportReq) { return requestClient.download('/pay/refund/export-excel', { params }); } diff --git a/apps/web-antd/src/api/pay/transfer/index.ts b/apps/web-antd/src/api/pay/transfer/index.ts index ba206ec5c..4c588cb65 100644 --- a/apps/web-antd/src/api/pay/transfer/index.ts +++ b/apps/web-antd/src/api/pay/transfer/index.ts @@ -21,7 +21,7 @@ export namespace PayTransferApi { } /** 转账单分页请求 */ - export interface TransferPageReqVO extends PageParam { + export interface TransferPageReq extends PageParam { appId?: number; channelId?: number; channelCode?: string; @@ -36,7 +36,7 @@ export namespace PayTransferApi { } /** 查询转账单列表 */ -export function getTransferPage(params: PayTransferApi.TransferPageReqVO) { +export function getTransferPage(params: PayTransferApi.TransferPageReq) { return requestClient.get>( '/pay/transfer/page', { diff --git a/apps/web-antd/src/api/pay/wallet/balance/index.ts b/apps/web-antd/src/api/pay/wallet/balance/index.ts index 25a442809..71e8e76d6 100644 --- a/apps/web-antd/src/api/pay/wallet/balance/index.ts +++ b/apps/web-antd/src/api/pay/wallet/balance/index.ts @@ -4,12 +4,12 @@ import { requestClient } from '#/api/request'; export namespace PayWalletApi { /** 用户钱包查询参数 */ - export interface PayWalletUserReqVO { + export interface PayWalletUserReq { userId: number; } /** 钱包信息 */ - export interface WalletVO { + export interface Wallet { id: number; userId: number; userType: number; @@ -20,7 +20,7 @@ export namespace PayWalletApi { } /** 钱包分页请求 */ - export interface WalletPageReqVO extends PageParam { + export interface WalletPageReq extends PageParam { userId?: number; userType?: number; balance?: number; @@ -31,15 +31,15 @@ export namespace PayWalletApi { } /** 查询用户钱包详情 */ -export function getWallet(params: PayWalletApi.PayWalletUserReqVO) { - return requestClient.get('/pay/wallet/get', { +export function getWallet(params: PayWalletApi.PayWalletUserReq) { + return requestClient.get('/pay/wallet/get', { params, }); } /** 查询会员钱包列表 */ -export function getWalletPage(params: PayWalletApi.WalletPageReqVO) { - return requestClient.get>( +export function getWalletPage(params: PayWalletApi.WalletPageReq) { + return requestClient.get>( '/pay/wallet/page', { params, @@ -48,6 +48,6 @@ export function getWalletPage(params: PayWalletApi.WalletPageReqVO) { } /** 修改会员钱包余额 */ -export function updateWalletBalance(data: PayWalletApi.WalletVO) { +export function updateWalletBalance(data: PayWalletApi.Wallet) { return requestClient.put('/pay/wallet/update-balance', data); } diff --git a/apps/web-antd/src/api/system/mail/template/index.ts b/apps/web-antd/src/api/system/mail/template/index.ts index 34b4a09d0..7bae8e91b 100644 --- a/apps/web-antd/src/api/system/mail/template/index.ts +++ b/apps/web-antd/src/api/system/mail/template/index.ts @@ -19,7 +19,7 @@ export namespace SystemMailTemplateApi { } /** 邮件发送信息 */ - export interface MailSendReqVO { + export interface MailSendReq { mail: string; templateCode: string; templateParams: Record; @@ -57,6 +57,6 @@ export function deleteMailTemplate(id: number) { } /** 发送邮件 */ -export function sendMail(data: SystemMailTemplateApi.MailSendReqVO) { +export function sendMail(data: SystemMailTemplateApi.MailSendReq) { return requestClient.post('/system/mail-template/send-mail', data); } diff --git a/apps/web-antd/src/api/system/notify/template/index.ts b/apps/web-antd/src/api/system/notify/template/index.ts index 5f2e3de29..18b44124d 100644 --- a/apps/web-antd/src/api/system/notify/template/index.ts +++ b/apps/web-antd/src/api/system/notify/template/index.ts @@ -17,7 +17,7 @@ export namespace SystemNotifyTemplateApi { } /** 发送站内信请求 */ - export interface NotifySendReqVO { + export interface NotifySendReq { userId: number; userType: number; templateCode: string; @@ -67,6 +67,6 @@ export function exportNotifyTemplate(params: any) { } /** 发送站内信 */ -export function sendNotify(data: SystemNotifyTemplateApi.NotifySendReqVO) { +export function sendNotify(data: SystemNotifyTemplateApi.NotifySendReq) { return requestClient.post('/system/notify-template/send-notify', data); } diff --git a/apps/web-antd/src/api/system/oauth2/open/index.ts b/apps/web-antd/src/api/system/oauth2/open/index.ts index 16d9c7e62..591eaa753 100644 --- a/apps/web-antd/src/api/system/oauth2/open/index.ts +++ b/apps/web-antd/src/api/system/oauth2/open/index.ts @@ -3,7 +3,7 @@ import { requestClient } from '#/api/request'; /** OAuth2.0 授权信息响应 */ export namespace SystemOAuth2ClientApi { /** 授权信息 */ - export interface AuthorizeInfoRespVO { + export interface AuthorizeInfoResp { client: { logo: string; name: string; @@ -17,7 +17,7 @@ export namespace SystemOAuth2ClientApi { /** 获得授权信息 */ export function getAuthorize(clientId: string) { - return requestClient.get( + return requestClient.get( `/system/oauth2/authorize?clientId=${clientId}`, ); } diff --git a/apps/web-antd/src/api/system/permission/index.ts b/apps/web-antd/src/api/system/permission/index.ts index 9039d9a05..076dffc40 100644 --- a/apps/web-antd/src/api/system/permission/index.ts +++ b/apps/web-antd/src/api/system/permission/index.ts @@ -2,19 +2,19 @@ import { requestClient } from '#/api/request'; export namespace SystemPermissionApi { /** 分配用户角色请求 */ - export interface AssignUserRoleReqVO { + export interface AssignUserRoleReq { userId: number; roleIds: number[]; } /** 分配角色菜单请求 */ - export interface AssignRoleMenuReqVO { + export interface AssignRoleMenuReq { roleId: number; menuIds: number[]; } /** 分配角色数据权限请求 */ - export interface AssignRoleDataScopeReqVO { + export interface AssignRoleDataScopeReq { roleId: number; dataScope: number; dataScopeDeptIds: number[]; @@ -30,14 +30,14 @@ export async function getRoleMenuList(roleId: number) { /** 赋予角色菜单权限 */ export async function assignRoleMenu( - data: SystemPermissionApi.AssignRoleMenuReqVO, + data: SystemPermissionApi.AssignRoleMenuReq, ) { return requestClient.post('/system/permission/assign-role-menu', data); } /** 赋予角色数据权限 */ export async function assignRoleDataScope( - data: SystemPermissionApi.AssignRoleDataScopeReqVO, + data: SystemPermissionApi.AssignRoleDataScopeReq, ) { return requestClient.post('/system/permission/assign-role-data-scope', data); } @@ -51,7 +51,7 @@ export async function getUserRoleList(userId: number) { /** 赋予用户角色 */ export async function assignUserRole( - data: SystemPermissionApi.AssignUserRoleReqVO, + data: SystemPermissionApi.AssignUserRoleReq, ) { return requestClient.post('/system/permission/assign-user-role', data); } diff --git a/apps/web-antd/src/api/system/sms/template/index.ts b/apps/web-antd/src/api/system/sms/template/index.ts index 63660bdf9..0ea7425a1 100644 --- a/apps/web-antd/src/api/system/sms/template/index.ts +++ b/apps/web-antd/src/api/system/sms/template/index.ts @@ -20,7 +20,7 @@ export namespace SystemSmsTemplateApi { } /** 发送短信请求 */ - export interface SmsSendReqVO { + export interface SmsSendReq { mobile: string; templateCode: string; templateParams: Record; @@ -65,6 +65,6 @@ export function exportSmsTemplate(params: any) { } /** 发送短信 */ -export function sendSms(data: SystemSmsTemplateApi.SmsSendReqVO) { +export function sendSms(data: SystemSmsTemplateApi.SmsSendReq) { return requestClient.post('/system/sms-template/send-sms', data); } diff --git a/apps/web-antd/src/api/system/social/user/index.ts b/apps/web-antd/src/api/system/social/user/index.ts index b91f15064..fd0316e82 100644 --- a/apps/web-antd/src/api/system/social/user/index.ts +++ b/apps/web-antd/src/api/system/social/user/index.ts @@ -20,14 +20,14 @@ export namespace SystemSocialUserApi { } /** 社交绑定请求 */ - export interface SocialUserBindReqVO { + export interface SocialUserBindReq { type: number; code: string; state: string; } /** 取消社交绑定请求 */ - export interface SocialUserUnbindReqVO { + export interface SocialUserUnbindReq { type: number; openid: string; } @@ -49,12 +49,12 @@ export function getSocialUser(id: number) { } /** 社交绑定,使用 code 授权码 */ -export function socialBind(data: SystemSocialUserApi.SocialUserBindReqVO) { +export function socialBind(data: SystemSocialUserApi.SocialUserBindReq) { return requestClient.post('/system/social-user/bind', data); } /** 取消社交绑定 */ -export function socialUnbind(data: SystemSocialUserApi.SocialUserUnbindReqVO) { +export function socialUnbind(data: SystemSocialUserApi.SocialUserUnbindReq) { return requestClient.delete('/system/social-user/unbind', { data }); } diff --git a/apps/web-antd/src/api/system/user/profile/index.ts b/apps/web-antd/src/api/system/user/profile/index.ts index 97898e71a..b2c42bcc3 100644 --- a/apps/web-antd/src/api/system/user/profile/index.ts +++ b/apps/web-antd/src/api/system/user/profile/index.ts @@ -2,7 +2,7 @@ import { requestClient } from '#/api/request'; export namespace SystemUserProfileApi { /** 用户个人中心信息 */ - export interface UserProfileRespVO { + export interface UserProfileResp { id: number; username: string; nickname: string; @@ -19,13 +19,13 @@ export namespace SystemUserProfileApi { } /** 更新密码请求 */ - export interface UpdatePasswordReqVO { + export interface UpdatePasswordReq { oldPassword: string; newPassword: string; } /** 更新个人信息请求 */ - export interface UpdateProfileReqVO { + export interface UpdateProfileReq { nickname?: string; email?: string; mobile?: string; @@ -36,21 +36,19 @@ export namespace SystemUserProfileApi { /** 获取登录用户信息 */ export function getUserProfile() { - return requestClient.get( + return requestClient.get( '/system/user/profile/get', ); } /** 修改用户个人信息 */ -export function updateUserProfile( - data: SystemUserProfileApi.UpdateProfileReqVO, -) { +export function updateUserProfile(data: SystemUserProfileApi.UpdateProfileReq) { return requestClient.put('/system/user/profile/update', data); } /** 修改用户个人密码 */ export function updateUserPassword( - data: SystemUserProfileApi.UpdatePasswordReqVO, + data: SystemUserProfileApi.UpdatePasswordReq, ) { return requestClient.put('/system/user/profile/update-password', data); } diff --git a/apps/web-antd/src/components/simple-process-design/components/simple-process-designer.vue b/apps/web-antd/src/components/simple-process-design/components/simple-process-designer.vue index 5677c5f1a..f4adf6097 100644 --- a/apps/web-antd/src/components/simple-process-design/components/simple-process-designer.vue +++ b/apps/web-antd/src/components/simple-process-design/components/simple-process-designer.vue @@ -97,7 +97,7 @@ const postOptions = ref([]); // 岗位列表 const userOptions = ref([]); // 用户列表 const deptOptions = ref([]); // 部门列表 const deptTreeOptions = ref(); -const userGroupOptions = ref([]); // 用户组列表 +const userGroupOptions = ref([]); // 用户组列表 provide('formFields', formFields); provide('formType', formType); diff --git a/apps/web-antd/src/components/simple-process-design/helpers.ts b/apps/web-antd/src/components/simple-process-design/helpers.ts index c346de209..0d1670a5c 100644 --- a/apps/web-antd/src/components/simple-process-design/helpers.ts +++ b/apps/web-antd/src/components/simple-process-design/helpers.ts @@ -260,7 +260,7 @@ export function useNodeForm(nodeType: BpmNodeTypeEnum) { const postOptions = inject>('postList', ref([])); // 岗位列表 const userOptions = inject>('userList', ref([])); // 用户列表 const deptOptions = inject>('deptList', ref([])); // 部门列表 - const userGroupOptions = inject>( + const userGroupOptions = inject>( 'userGroupList', ref([]), ); // 用户组列表 diff --git a/apps/web-antd/src/components/upload/use-upload.ts b/apps/web-antd/src/components/upload/use-upload.ts index 3160585f1..471091f51 100644 --- a/apps/web-antd/src/components/upload/use-upload.ts +++ b/apps/web-antd/src/components/upload/use-upload.ts @@ -136,7 +136,7 @@ export function getUploadUrl(): string { * @param file 文件 */ function createFile0( - vo: InfraFileApi.FilePresignedUrlRespVO, + vo: InfraFileApi.FilePresignedUrlResp, file: File, ): InfraFileApi.File { const fileVO = { diff --git a/apps/web-antd/src/views/_core/profile/index.vue b/apps/web-antd/src/views/_core/profile/index.vue index 8c8035733..b061868f9 100644 --- a/apps/web-antd/src/views/_core/profile/index.vue +++ b/apps/web-antd/src/views/_core/profile/index.vue @@ -19,7 +19,7 @@ const authStore = useAuthStore(); const activeName = ref('basicInfo'); /** 加载个人信息 */ -const profile = ref(); +const profile = ref(); async function loadProfile() { profile.value = await getUserProfile(); } diff --git a/apps/web-antd/src/views/_core/profile/modules/base-info.vue b/apps/web-antd/src/views/_core/profile/modules/base-info.vue index f4b9393b8..d404b3d9b 100644 --- a/apps/web-antd/src/views/_core/profile/modules/base-info.vue +++ b/apps/web-antd/src/views/_core/profile/modules/base-info.vue @@ -14,7 +14,7 @@ import { updateUserProfile } from '#/api/system/user/profile'; import { DICT_TYPE, getDictOptions } from '#/utils'; const props = defineProps<{ - profile?: SystemUserProfileApi.UserProfileRespVO; + profile?: SystemUserProfileApi.UserProfileResp; }>(); const emit = defineEmits<{ (e: 'success'): void; @@ -77,7 +77,7 @@ async function handleSubmit(values: Recordable) { try { formApi.setLoading(true); // 提交表单 - await updateUserProfile(values as SystemUserProfileApi.UpdateProfileReqVO); + await updateUserProfile(values as SystemUserProfileApi.UpdateProfileReq); // 关闭并提示 emit('success'); message.success($t('ui.actionMessage.operationSuccess')); diff --git a/apps/web-antd/src/views/_core/profile/modules/profile-user.vue b/apps/web-antd/src/views/_core/profile/modules/profile-user.vue index 51121d4b7..fafbb3694 100644 --- a/apps/web-antd/src/views/_core/profile/modules/profile-user.vue +++ b/apps/web-antd/src/views/_core/profile/modules/profile-user.vue @@ -14,7 +14,7 @@ import { CropperAvatar } from '#/components/cropper'; import { useUpload } from '#/components/upload/use-upload'; const props = defineProps<{ - profile?: SystemUserProfileApi.UserProfileRespVO; + profile?: SystemUserProfileApi.UserProfileResp; }>(); const emit = defineEmits<{ diff --git a/apps/web-antd/src/views/bpm/group/index.vue b/apps/web-antd/src/views/bpm/group/index.vue index e3310c7ee..772243b24 100644 --- a/apps/web-antd/src/views/bpm/group/index.vue +++ b/apps/web-antd/src/views/bpm/group/index.vue @@ -33,12 +33,12 @@ function handleCreate() { } /** 编辑用户分组 */ -function handleEdit(row: BpmUserGroupApi.UserGroupVO) { +function handleEdit(row: BpmUserGroupApi.UserGroup) { formModalApi.setData(row).open(); } /** 删除用户分组 */ -async function handleDelete(row: BpmUserGroupApi.UserGroupVO) { +async function handleDelete(row: BpmUserGroupApi.UserGroup) { const hideLoading = message.loading({ content: $t('ui.actionMessage.deleting', [row.name]), key: 'action_key_msg', @@ -88,7 +88,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ refresh: { code: 'query' }, search: true, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/group/modules/form.vue b/apps/web-antd/src/views/bpm/group/modules/form.vue index 836873468..6dc204df9 100644 --- a/apps/web-antd/src/views/bpm/group/modules/form.vue +++ b/apps/web-antd/src/views/bpm/group/modules/form.vue @@ -18,7 +18,7 @@ import { $t } from '#/locales'; import { useFormSchema } from '../data'; const emit = defineEmits(['success']); -const formData = ref(); +const formData = ref(); const getTitle = computed(() => { return formData.value?.id ? $t('ui.actionTitle.edit', ['用户分组']) @@ -46,7 +46,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); // 提交表单 - const data = (await formApi.getValues()) as BpmUserGroupApi.UserGroupVO; + const data = (await formApi.getValues()) as BpmUserGroupApi.UserGroup; try { await (formData.value?.id ? updateUserGroup(data) @@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({ return; } // 加载数据 - const data = modalApi.getData(); + const data = modalApi.getData(); if (!data || !data.id) { return; } diff --git a/apps/web-antd/src/views/bpm/model/definition/data.ts b/apps/web-antd/src/views/bpm/model/definition/data.ts index 7a6d93727..979d466f2 100644 --- a/apps/web-antd/src/views/bpm/model/definition/data.ts +++ b/apps/web-antd/src/views/bpm/model/definition/data.ts @@ -4,7 +4,7 @@ import type { BpmProcessDefinitionApi } from '#/api/bpm/definition'; import { DICT_TYPE } from '#/utils'; /** 列表的字段 */ -export function useGridColumns(): VxeTableGridOptions['columns'] { +export function useGridColumns(): VxeTableGridOptions['columns'] { return [ { field: 'id', diff --git a/apps/web-antd/src/views/bpm/model/form/index.vue b/apps/web-antd/src/views/bpm/model/form/index.vue index 9c37744bf..f2dc17ba6 100644 --- a/apps/web-antd/src/views/bpm/model/form/index.vue +++ b/apps/web-antd/src/views/bpm/model/form/index.vue @@ -37,7 +37,7 @@ defineOptions({ name: 'BpmModelCreate' }); // 流程定义类型 type BpmProcessDefinitionType = Omit< - BpmProcessDefinitionApi.ProcessDefinitionVO, + BpmProcessDefinitionApi.ProcessDefinition, 'modelId' | 'modelType' > & { id?: string; diff --git a/apps/web-antd/src/views/bpm/oa/leave/create.vue b/apps/web-antd/src/views/bpm/oa/leave/create.vue index 3cee3e1d4..012725f3d 100644 --- a/apps/web-antd/src/views/bpm/oa/leave/create.vue +++ b/apps/web-antd/src/views/bpm/oa/leave/create.vue @@ -30,7 +30,7 @@ const tempStartUserSelectAssignees = ref({}); // 历史发起人选择审批人 const activityNodes = ref([]); // 审批节点信息 const processDefinitionId = ref(''); -const formData = ref(); +const formData = ref(); const getTitle = computed(() => { return formData.value?.id ? $t('ui.actionTitle.edit', ['请假']) @@ -70,7 +70,7 @@ async function onSubmit() { } // 提交表单 - const data = (await formApi.getValues()) as BpmOALeaveApi.LeaveVO; + const data = (await formApi.getValues()) as BpmOALeaveApi.Leave; // 审批相关:设置指定审批人 if (startUserSelectTasks.value?.length > 0) { @@ -78,7 +78,7 @@ async function onSubmit() { } // 格式化开始时间和结束时间的值 - const submitData: BpmOALeaveApi.LeaveVO = { + const submitData: BpmOALeaveApi.Leave = { ...data, startTime: Number(data.startTime), endTime: Number(data.endTime), @@ -112,10 +112,10 @@ async function onDraft() { return; } - const data = (await formApi.getValues()) as BpmOALeaveApi.LeaveVO; + const data = (await formApi.getValues()) as BpmOALeaveApi.Leave; // 格式化开始时间和结束时间的值 - const submitData: BpmOALeaveApi.LeaveVO = { + const submitData: BpmOALeaveApi.Leave = { ...data, startTime: Number(data.startTime), endTime: Number(data.endTime), diff --git a/apps/web-antd/src/views/bpm/oa/leave/detail.vue b/apps/web-antd/src/views/bpm/oa/leave/detail.vue index 494ccbe28..f2ccc7b4c 100644 --- a/apps/web-antd/src/views/bpm/oa/leave/detail.vue +++ b/apps/web-antd/src/views/bpm/oa/leave/detail.vue @@ -14,7 +14,7 @@ const props = defineProps<{ id: string; }>(); const datailLoading = ref(false); -const detailData = ref(); +const detailData = ref(); const { query } = useRoute(); const queryId = computed(() => query.id as string); diff --git a/apps/web-antd/src/views/bpm/oa/leave/index.vue b/apps/web-antd/src/views/bpm/oa/leave/index.vue index 72c407a3c..34d77af78 100644 --- a/apps/web-antd/src/views/bpm/oa/leave/index.vue +++ b/apps/web-antd/src/views/bpm/oa/leave/index.vue @@ -41,7 +41,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ refresh: { code: 'query' }, search: true, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); /** 创建请假 */ @@ -55,7 +55,7 @@ function handleCreate() { } /** 查看请假详情 */ -function handleDetail(row: BpmOALeaveApi.LeaveVO) { +function handleDetail(row: BpmOALeaveApi.Leave) { router.push({ name: 'OALeaveDetail', query: { id: row.id }, @@ -63,7 +63,7 @@ function handleDetail(row: BpmOALeaveApi.LeaveVO) { } /** 取消请假 */ -function handleCancel(row: BpmOALeaveApi.LeaveVO) { +function handleCancel(row: BpmOALeaveApi.Leave) { prompt({ async beforeClose(scope) { if (scope.isConfirm) { @@ -96,7 +96,7 @@ function handleCancel(row: BpmOALeaveApi.LeaveVO) { } /** 审批进度 */ -function handleProgress(row: BpmOALeaveApi.LeaveVO) { +function handleProgress(row: BpmOALeaveApi.Leave) { router.push({ name: 'BpmProcessInstanceDetail', query: { id: row.processInstanceId }, diff --git a/apps/web-antd/src/views/bpm/processExpression/index.vue b/apps/web-antd/src/views/bpm/processExpression/index.vue index d97005a41..5296c731e 100644 --- a/apps/web-antd/src/views/bpm/processExpression/index.vue +++ b/apps/web-antd/src/views/bpm/processExpression/index.vue @@ -32,12 +32,12 @@ function handleCreate() { } /** 编辑流程表达式 */ -function handleEdit(row: BpmProcessExpressionApi.ProcessExpressionVO) { +function handleEdit(row: BpmProcessExpressionApi.ProcessExpression) { formModalApi.setData(row).open(); } /** 删除流程表达式 */ -async function handleDelete(row: BpmProcessExpressionApi.ProcessExpressionVO) { +async function handleDelete(row: BpmProcessExpressionApi.ProcessExpression) { const hideLoading = message.loading({ content: $t('ui.actionMessage.deleting', [row.name]), key: 'action_key_msg', @@ -80,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ refresh: { code: 'query' }, search: true, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/processExpression/modules/form.vue b/apps/web-antd/src/views/bpm/processExpression/modules/form.vue index 03e0eae05..7a358428f 100644 --- a/apps/web-antd/src/views/bpm/processExpression/modules/form.vue +++ b/apps/web-antd/src/views/bpm/processExpression/modules/form.vue @@ -18,7 +18,7 @@ import { $t } from '#/locales'; import { useFormSchema } from '../data'; const emit = defineEmits(['success']); -const formData = ref(); +const formData = ref(); const getTitle = computed(() => { return formData.value?.id ? $t('ui.actionTitle.edit', ['流程表达式']) @@ -40,7 +40,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); // 提交表单 const data = - (await formApi.getValues()) as BpmProcessExpressionApi.ProcessExpressionVO; + (await formApi.getValues()) as BpmProcessExpressionApi.ProcessExpression; try { await (formData.value?.id ? updateProcessExpression(data) @@ -58,8 +58,7 @@ const [Modal, modalApi] = useVbenModal({ return; } // 加载数据 - const data = - modalApi.getData(); + const data = modalApi.getData(); if (!data || !data.id) { return; } diff --git a/apps/web-antd/src/views/bpm/processInstance/create/index.vue b/apps/web-antd/src/views/bpm/processInstance/create/index.vue index 8c519daa4..cc2055682 100644 --- a/apps/web-antd/src/views/bpm/processInstance/create/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/create/index.vue @@ -26,17 +26,23 @@ import ProcessDefinitionDetail from './modules/form.vue'; defineOptions({ name: 'BpmProcessInstanceCreate' }); -const route = useRoute(); // 路由 +const route = useRoute(); -const searchName = ref(''); // 当前搜索关键字 -const isSearching = ref(false); // 是否处于搜索状态 -const processInstanceId: any = route.query.processInstanceId; // 流程实例编号。场景:重新发起时 -const loading = ref(true); // 加载中 -const categoryList: any = ref([]); // 分类的列表 -const activeCategory = ref(''); // 当前选中的分类 -const processDefinitionList = ref< - BpmProcessDefinitionApi.ProcessDefinitionVO[] ->([]); // 流程定义的列表 +// 当前搜索关键字 +const searchName = ref(''); +const isSearching = ref(false); +// 流程实例编号。场景:重新发起时 +const processInstanceId: any = route.query.processInstanceId; +// 加载中 +const loading = ref(true); +// 分类的列表 +const categoryList: any = ref([]); +// 当前选中的分类 +const activeCategory = ref(''); +// 流程定义的列表 +const processDefinitionList = ref( + [], +); // 实现 groupBy 功能 function groupBy(array: any[], key: string) { @@ -112,7 +118,7 @@ async function handleGetProcessDefinitionList() { /** 用于存储搜索过滤后的流程定义 */ const filteredProcessDefinitionList = ref< - BpmProcessDefinitionApi.ProcessDefinitionVO[] + BpmProcessDefinitionApi.ProcessDefinition[] >([]); /** 搜索流程 */ @@ -159,13 +165,13 @@ const processDefinitionGroup = computed(() => { // 按照 categoryList 的顺序重新组织数据 const orderedGroup: Record< string, - BpmProcessDefinitionApi.ProcessDefinitionVO[] + BpmProcessDefinitionApi.ProcessDefinition[] > = {}; categoryList.value.forEach((category: BpmCategoryApi.Category) => { if (grouped[category.code]) { orderedGroup[category.code] = grouped[ category.code - ] as BpmProcessDefinitionApi.ProcessDefinitionVO[]; + ] as BpmProcessDefinitionApi.ProcessDefinition[]; } }); return orderedGroup; @@ -183,7 +189,7 @@ const processDefinitionDetailRef = ref(); /** 处理选择流程的按钮操作 */ async function handleSelect( - row: BpmProcessDefinitionApi.ProcessDefinitionVO, + row: BpmProcessDefinitionApi.ProcessDefinition, formVariables?: any, ) { // 设置选择的流程 diff --git a/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue b/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue index b59c0f009..8b03a7ed7 100644 --- a/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue +++ b/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue @@ -166,7 +166,7 @@ async function initProcessInfo(row: any, formVariables?: any) { }); // 加载流程图 - const processDefinitionDetail: BpmProcessDefinitionApi.ProcessDefinitionVO = + const processDefinitionDetail: BpmProcessDefinitionApi.ProcessDefinition = await getProcessDefinition(row.id); if (processDefinitionDetail) { bpmnXML.value = processDefinitionDetail.bpmnXml; diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue index 40a03e637..3cead2a90 100644 --- a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue @@ -63,7 +63,7 @@ enum FieldPermissionType { } const processInstanceLoading = ref(false); // 流程实例的加载中 -const processInstance = ref(); // 流程实例 +const processInstance = ref(); // 流程实例 const processDefinition = ref({}); // 流程定义 const processModelView = ref({}); // 流程模型视图 const operationButtonRef = ref(); // 操作按钮组件 ref diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/task-list.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/task-list.vue index aa6727ac7..4ce1be991 100644 --- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/task-list.vue +++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/task-list.vue @@ -36,7 +36,7 @@ const columns = shallowRef([ field: 'approver', title: '审批人', slots: { - default: ({ row }: { row: BpmTaskApi.TaskManagerVO }) => { + default: ({ row }: { row: BpmTaskApi.TaskManager }) => { return row.assigneeUser?.nickname || row.ownerUser?.nickname; }, }, @@ -106,7 +106,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ cellConfig: { height: 60, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); /** @@ -137,7 +137,7 @@ const taskForm = ref({ * 显示表单详情 * @param row 任务数据 */ -async function showFormDetail(row: BpmTaskApi.TaskManagerVO): Promise { +async function showFormDetail(row: BpmTaskApi.TaskManager): Promise { // 设置表单配置和表单字段 taskForm.value = { rule: [], diff --git a/apps/web-antd/src/views/bpm/processInstance/index.vue b/apps/web-antd/src/views/bpm/processInstance/index.vue index 584a0de9b..0b99e8602 100644 --- a/apps/web-antd/src/views/bpm/processInstance/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/index.vue @@ -27,7 +27,7 @@ function onRefresh() { } /** 查看流程实例 */ -function handleDetail(row: BpmTaskApi.TaskVO) { +function handleDetail(row: BpmTaskApi.Task) { router.push({ name: 'BpmProcessInstanceDetail', query: { id: row.id }, @@ -35,7 +35,7 @@ function handleDetail(row: BpmTaskApi.TaskVO) { } /** 取消流程实例 */ -function handleCancel(row: BpmTaskApi.TaskVO) { +function handleCancel(row: BpmTaskApi.Task) { prompt({ async beforeClose(scope) { if (scope.isConfirm) { @@ -96,7 +96,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ cellConfig: { height: 64, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/processInstance/manager/index.vue b/apps/web-antd/src/views/bpm/processInstance/manager/index.vue index 4c4d04d0c..4ebfe92b7 100644 --- a/apps/web-antd/src/views/bpm/processInstance/manager/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/manager/index.vue @@ -33,7 +33,7 @@ function onTaskClick(task: BpmProcessInstanceApi.Task) { } /** 查看流程实例 */ -function handleDetail(row: BpmProcessInstanceApi.ProcessInstanceVO) { +function handleDetail(row: BpmProcessInstanceApi.ProcessInstance) { console.warn(row); router.push({ name: 'BpmProcessInstanceDetail', @@ -42,7 +42,7 @@ function handleDetail(row: BpmProcessInstanceApi.ProcessInstanceVO) { } /** 取消流程实例 */ -function handleCancel(row: BpmProcessInstanceApi.ProcessInstanceVO) { +function handleCancel(row: BpmProcessInstanceApi.ProcessInstance) { prompt({ async beforeClose(scope) { if (scope.isConfirm) { @@ -102,7 +102,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ refresh: { code: 'query' }, search: true, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/processInstance/report/data.ts b/apps/web-antd/src/views/bpm/processInstance/report/data.ts index 885a1b437..32ed126c2 100644 --- a/apps/web-antd/src/views/bpm/processInstance/report/data.ts +++ b/apps/web-antd/src/views/bpm/processInstance/report/data.ts @@ -93,8 +93,8 @@ export function useGridFormSchema( /** 列表的字段 */ export function useGridColumns( formFields: any[] = [], -): VxeTableGridOptions['columns'] { - const baseColumns: VxeGridPropTypes.Columns = +): VxeTableGridOptions['columns'] { + const baseColumns: VxeGridPropTypes.Columns = [ { field: 'name', diff --git a/apps/web-antd/src/views/bpm/processInstance/report/index.vue b/apps/web-antd/src/views/bpm/processInstance/report/index.vue index e4a575621..878ad8813 100644 --- a/apps/web-antd/src/views/bpm/processInstance/report/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/report/index.vue @@ -70,7 +70,7 @@ function onRefresh() { } /** 查看详情 */ -const handleDetail = (row: BpmProcessInstanceApi.ProcessInstanceVO) => { +const handleDetail = (row: BpmProcessInstanceApi.ProcessInstance) => { router.push({ name: 'BpmProcessInstanceDetail', query: { @@ -80,7 +80,7 @@ const handleDetail = (row: BpmProcessInstanceApi.ProcessInstanceVO) => { }; /** 取消按钮操作 */ -const handleCancel = async (row: BpmProcessInstanceApi.ProcessInstanceVO) => { +const handleCancel = async (row: BpmProcessInstanceApi.ProcessInstance) => { cancelReason.value = ''; // 重置取消原因 confirm({ title: '取消流程', diff --git a/apps/web-antd/src/views/bpm/processListener/index.vue b/apps/web-antd/src/views/bpm/processListener/index.vue index 28e9b9fa8..bd13f990d 100644 --- a/apps/web-antd/src/views/bpm/processListener/index.vue +++ b/apps/web-antd/src/views/bpm/processListener/index.vue @@ -32,12 +32,12 @@ function handleCreate() { } /** 编辑流程监听器 */ -function handleEdit(row: BpmProcessListenerApi.ProcessListenerVO) { +function handleEdit(row: BpmProcessListenerApi.ProcessListener) { formModalApi.setData(row).open(); } /** 删除流程监听器 */ -async function handleDelete(row: BpmProcessListenerApi.ProcessListenerVO) { +async function handleDelete(row: BpmProcessListenerApi.ProcessListener) { const hideLoading = message.loading({ content: $t('ui.actionMessage.deleting', [row.name]), key: 'action_key_msg', @@ -80,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ refresh: { code: 'query' }, search: true, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/processListener/modules/form.vue b/apps/web-antd/src/views/bpm/processListener/modules/form.vue index ef436b707..20830e954 100644 --- a/apps/web-antd/src/views/bpm/processListener/modules/form.vue +++ b/apps/web-antd/src/views/bpm/processListener/modules/form.vue @@ -18,7 +18,7 @@ import { $t } from '#/locales'; import { useFormSchema } from '../data'; const emit = defineEmits(['success']); -const formData = ref(); +const formData = ref(); const getTitle = computed(() => { return formData.value?.id ? $t('ui.actionTitle.edit', ['流程监听器']) @@ -47,7 +47,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); // 提交表单 const data = - (await formApi.getValues()) as BpmProcessListenerApi.ProcessListenerVO; + (await formApi.getValues()) as BpmProcessListenerApi.ProcessListener; try { await (formData.value?.id ? updateProcessListener(data) @@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({ return; } // 加载数据 - const data = modalApi.getData(); + const data = modalApi.getData(); if (!data || !data.id) { return; } diff --git a/apps/web-antd/src/views/bpm/task/copy/index.vue b/apps/web-antd/src/views/bpm/task/copy/index.vue index 3578344ab..bf008ded1 100644 --- a/apps/web-antd/src/views/bpm/task/copy/index.vue +++ b/apps/web-antd/src/views/bpm/task/copy/index.vue @@ -14,7 +14,7 @@ import { useGridColumns, useGridFormSchema } from './data'; defineOptions({ name: 'BpmCopyTask' }); /** 任务详情 */ -function handleDetail(row: BpmProcessInstanceApi.CopyVO) { +function handleDetail(row: BpmProcessInstanceApi.Copy) { const query = { id: row.processInstanceId, ...(row.activityId && { activityId: row.activityId }), @@ -54,7 +54,7 @@ const [Grid] = useVbenVxeGrid({ cellConfig: { height: 64, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/task/done/index.vue b/apps/web-antd/src/views/bpm/task/done/index.vue index 522288f48..280773cff 100644 --- a/apps/web-antd/src/views/bpm/task/done/index.vue +++ b/apps/web-antd/src/views/bpm/task/done/index.vue @@ -13,7 +13,7 @@ import { useGridColumns, useGridFormSchema } from './data'; defineOptions({ name: 'BpmDoneTask' }); /** 查看历史 */ -function handleHistory(row: BpmTaskApi.TaskManagerVO) { +function handleHistory(row: BpmTaskApi.TaskManager) { router.push({ name: 'BpmProcessInstanceDetail', query: { @@ -52,7 +52,7 @@ const [Grid] = useVbenVxeGrid({ cellConfig: { height: 64, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/task/manager/index.vue b/apps/web-antd/src/views/bpm/task/manager/index.vue index 173f47e53..d1ed284be 100644 --- a/apps/web-antd/src/views/bpm/task/manager/index.vue +++ b/apps/web-antd/src/views/bpm/task/manager/index.vue @@ -13,7 +13,7 @@ import { useGridColumns, useGridFormSchema } from './data'; defineOptions({ name: 'BpmManagerTask' }); /** 查看历史 */ -function handleHistory(row: BpmTaskApi.TaskManagerVO) { +function handleHistory(row: BpmTaskApi.TaskManager) { router.push({ name: 'BpmProcessInstanceDetail', query: { @@ -51,7 +51,7 @@ const [Grid] = useVbenVxeGrid({ cellConfig: { height: 64, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/bpm/task/todo/index.vue b/apps/web-antd/src/views/bpm/task/todo/index.vue index 13c770fc7..fb85ea0cc 100644 --- a/apps/web-antd/src/views/bpm/task/todo/index.vue +++ b/apps/web-antd/src/views/bpm/task/todo/index.vue @@ -13,7 +13,7 @@ import { useGridColumns, useGridFormSchema } from './data'; defineOptions({ name: 'BpmTodoTask' }); /** 办理任务 */ -function handleAudit(row: BpmTaskApi.TaskVO) { +function handleAudit(row: BpmTaskApi.Task) { console.warn(row); router.push({ name: 'BpmProcessInstanceDetail', @@ -53,7 +53,7 @@ const [Grid] = useVbenVxeGrid({ cellConfig: { height: 64, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/infra/codegen/modules/import-table.vue b/apps/web-antd/src/views/infra/codegen/modules/import-table.vue index 01efe463a..cc16ac165 100644 --- a/apps/web-antd/src/views/infra/codegen/modules/import-table.vue +++ b/apps/web-antd/src/views/infra/codegen/modules/import-table.vue @@ -21,7 +21,7 @@ const emit = defineEmits<{ (e: 'success'): void; }>(); -const formData = reactive({ +const formData = reactive({ dataSourceConfigId: 0, tableNames: [], // 已选择的表列表 }); diff --git a/apps/web-antd/src/views/member/user/components/user-account-info.vue b/apps/web-antd/src/views/member/user/components/user-account-info.vue index 846fd584f..cb2b69012 100644 --- a/apps/web-antd/src/views/member/user/components/user-account-info.vue +++ b/apps/web-antd/src/views/member/user/components/user-account-info.vue @@ -12,7 +12,7 @@ withDefaults( defineProps<{ mode?: 'kefu' | 'member'; user: MemberUserApi.User; - wallet: PayWalletApi.WalletVO; + wallet: PayWalletApi.Wallet; }>(), { mode: 'member', diff --git a/apps/web-antd/src/views/member/user/modules/detail.vue b/apps/web-antd/src/views/member/user/modules/detail.vue index 9c09a37eb..f36c6275d 100644 --- a/apps/web-antd/src/views/member/user/modules/detail.vue +++ b/apps/web-antd/src/views/member/user/modules/detail.vue @@ -33,13 +33,13 @@ const [FormModal, formModalApi] = useVbenModal({ const userId = Number(route.query.id); const user = ref(); -const wallet = ref(); +const wallet = ref(); /* 钱包初始化数据 */ const WALLET_INIT_DATA = { balance: 0, totalExpense: 0, totalRecharge: 0, -} as PayWalletApi.WalletVO; +} as PayWalletApi.Wallet; async function getUserDetail() { if (!userId) { diff --git a/apps/web-antd/src/views/pay/wallet/balance/index.vue b/apps/web-antd/src/views/pay/wallet/balance/index.vue index cf9915c9f..56dce1771 100644 --- a/apps/web-antd/src/views/pay/wallet/balance/index.vue +++ b/apps/web-antd/src/views/pay/wallet/balance/index.vue @@ -21,7 +21,7 @@ const [WalletModal, walletModalApi] = useVbenModal({ destroyOnClose: true, }); -function handleDetail(row: Required) { +function handleDetail(row: Required) { walletModalApi.setData(row).open(); } @@ -51,7 +51,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ refresh: { code: 'query' }, search: true, }, - } as VxeTableGridOptions, + } as VxeTableGridOptions, }); diff --git a/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue b/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue index 4a8c3128f..eed1b9f0b 100644 --- a/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue +++ b/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue @@ -15,7 +15,7 @@ const [Modal, modalApi] = useVbenModal({ return; } // 加载数据 - const data = modalApi.getData(); + const data = modalApi.getData(); if (!data || !data.id) { return; } diff --git a/apps/web-antd/src/views/system/mail/template/modules/send-form.vue b/apps/web-antd/src/views/system/mail/template/modules/send-form.vue index 0b578e17b..1752ad06f 100644 --- a/apps/web-antd/src/views/system/mail/template/modules/send-form.vue +++ b/apps/web-antd/src/views/system/mail/template/modules/send-form.vue @@ -42,7 +42,7 @@ const [Modal, modalApi] = useVbenModal({ paramsObj[param] = values[`param_${param}`]; }); } - const data: SystemMailTemplateApi.MailSendReqVO = { + const data: SystemMailTemplateApi.MailSendReq = { mail: values.mail, templateCode: formData.value?.code || '', templateParams: paramsObj, diff --git a/apps/web-antd/src/views/system/notify/template/modules/send-form.vue b/apps/web-antd/src/views/system/notify/template/modules/send-form.vue index 6197b892a..611e74ad8 100644 --- a/apps/web-antd/src/views/system/notify/template/modules/send-form.vue +++ b/apps/web-antd/src/views/system/notify/template/modules/send-form.vue @@ -43,7 +43,7 @@ const [Modal, modalApi] = useVbenModal({ paramsObj[param] = values[`param_${param}`]; }); } - const data: SystemNotifyTemplateApi.NotifySendReqVO = { + const data: SystemNotifyTemplateApi.NotifySendReq = { userId: values.userId, userType: values.userType, templateCode: formData.value?.code || '', diff --git a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue index ae82a3b32..53aecc46f 100644 --- a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue +++ b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue @@ -42,7 +42,7 @@ const [Modal, modalApi] = useVbenModal({ paramsObj[param] = values[`param_${param}`]; }); } - const data: SystemSmsTemplateApi.SmsSendReqVO = { + const data: SystemSmsTemplateApi.SmsSendReq = { mobile: values.mobile, templateCode: formData.value?.code || '', templateParams: paramsObj,