diff --git a/apps/web-antd/src/api/bpm/task/index.ts b/apps/web-antd/src/api/bpm/task/index.ts index 8572b7e6e..b396594f7 100644 --- a/apps/web-antd/src/api/bpm/task/index.ts +++ b/apps/web-antd/src/api/bpm/task/index.ts @@ -7,13 +7,29 @@ import { requestClient } from '#/api/request'; export namespace BpmTaskApi { /** 流程任务 */ export interface Task { - id: number; // 编号 - name: string; // 监听器名字 - type: string; // 监听器类型 - status: number; // 监听器状态 - event: string; // 监听事件 - valueType: string; // 监听器值类型 - processInstance?: BpmProcessInstanceApi.ProcessInstance; // 流程实例 + id: string; // 编号 + name: string; // 任务名字 + status: number; // 任务状态 + createTime: number; // 创建时间 + endTime: number; // 结束时间 + durationInMillis: number; // 持续时间 + reason: string; // 审批理由 + ownerUser: any; // 负责人 + assigneeUser: any; // 处理人 + taskDefinitionKey: string; // 任务定义的标识 + processInstanceId: string; // 流程实例id + processInstance: BpmProcessInstanceApi.ProcessInstance; // 流程实例 + parentTaskId: any; // 父任务id + children: any; // 子任务 + formId: any; // 表单id + formName: any; // 表单名称 + formConf: any; // 表单配置 + formFields: any; // 表单字段 + formVariables: any; // 表单变量 + buttonsSetting: any; // 按钮设置 + signEnable: any; // 签名设置 + reasonRequire: any; // 原因设置 + nodeType: any; // 节点类型 } } diff --git a/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts b/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts index d6bd1b209..4bd28f89b 100644 --- a/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/bargain/activity/data.ts @@ -133,6 +133,7 @@ export function useFormSchema(): VbenFormSchema[] { placeholder: '请输入最大砍价金额', }, }, + // TODO @puhui999:这里交互不太对,可以对比下 element-plus 版本呢 { fieldName: 'spuId', label: '砍价商品', diff --git a/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts b/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts index 3cb04435b..25eda342e 100644 --- a/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/combination/activity/data.ts @@ -105,6 +105,7 @@ export function useFormSchema(): VbenFormSchema[] { options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'), }, }, + // TODO @puhui999:这里交互不太对,可以对比下 element-plus 版本呢 { fieldName: 'spuId', label: '拼团商品', diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue index ca56e951e..0bc2190fb 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue @@ -78,7 +78,6 @@ const [Modal, modalApi] = useVbenModal({ switch (data.productScope) { case PromotionProductScopeEnum.CATEGORY.scope: { const categoryIds = data.productCategoryIds; - data.productScopeValues = Array.isArray(categoryIds) ? categoryIds : categoryIds diff --git a/apps/web-ele/src/api/bpm/task/index.ts b/apps/web-ele/src/api/bpm/task/index.ts index 4f329abc7..b396594f7 100644 --- a/apps/web-ele/src/api/bpm/task/index.ts +++ b/apps/web-ele/src/api/bpm/task/index.ts @@ -7,7 +7,7 @@ import { requestClient } from '#/api/request'; export namespace BpmTaskApi { /** 流程任务 */ export interface Task { - id: number; // 编号 + id: string; // 编号 name: string; // 任务名字 status: number; // 任务状态 createTime: number; // 创建时间 diff --git a/apps/web-ele/src/views/bpm/processListener/data.ts b/apps/web-ele/src/views/bpm/processListener/data.ts index 339f2b8bf..ea26dbfc8 100644 --- a/apps/web-ele/src/views/bpm/processListener/data.ts +++ b/apps/web-ele/src/views/bpm/processListener/data.ts @@ -8,22 +8,22 @@ import { z } from '#/adapter/form'; export const EVENT_EXECUTION_OPTIONS = [ { - label: 'start', + label: '开始', value: 'start', }, { - label: 'end', + label: '结束', value: 'end', }, ]; export const EVENT_OPTIONS = [ - { label: 'create', value: 'create' }, - { label: 'assignment', value: 'assignment' }, - { label: 'complete', value: 'complete' }, - { label: 'delete', value: 'delete' }, - { label: 'update', value: 'update' }, - { label: 'timeout', value: 'timeout' }, + { label: '创建', value: 'create' }, + { label: '指派', value: 'assignment' }, + { label: '完成', value: 'complete' }, + { label: '删除', value: 'delete' }, + { label: '更新', value: 'update' }, + { label: '超时', value: 'timeout' }, ]; /** 新增/修改的表单 */ diff --git a/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue b/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue index c8b735ccc..69e5d8f1a 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue @@ -145,5 +145,6 @@ async function processLoadData( diff --git a/apps/web-ele/src/views/mp/material/modules/video-table.vue b/apps/web-ele/src/views/mp/material/modules/video-table.vue index c67e296cd..e93f30a38 100644 --- a/apps/web-ele/src/views/mp/material/modules/video-table.vue +++ b/apps/web-ele/src/views/mp/material/modules/video-table.vue @@ -4,6 +4,7 @@ import type { MpMaterialApi } from '#/api/mp/material'; import { watch } from 'vue'; +import { $t } from '@vben/locales'; import { openWindow } from '@vben/utils'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';