diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/index.ts b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/index.ts index 483d5fb4d..f27319abb 100644 --- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/index.ts +++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/index.ts @@ -3,9 +3,7 @@ import 'bpmn-js/dist/assets/diagram-js.css'; import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'; import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'; import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'; -// TODO @puhui999:样式问题:设计器那,位置不太对; export { default as MyProcessDesigner } from './designer'; -// TODO @puhui999:流程发起时,预览相关的,需要使用; export { default as MyProcessViewer } from './designer/index2'; export { default as MyProcessPenal } from './penal'; diff --git a/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue b/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue index f48a51f6a..319e538e2 100644 --- a/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue +++ b/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue @@ -133,7 +133,7 @@ watch( diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts index 57ebd0acb..613a4a7e7 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts @@ -217,6 +217,7 @@ export function useFormSchema(): VbenFormSchema[] { }, rules: 'required', }, + // TODO @puhui999:1)新增时:一直报:“请输入优惠设置”;2)修改老数据,出现报“请求参数类型错误:50.00”; { fieldName: 'rules', 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 fda9fc9f9..99e323193 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 @@ -61,7 +61,6 @@ const [Modal, modalApi] = useVbenModal({ // 提交表单 try { const values = await formApi.getValues(); - // 合并表单值和 formData(含 id、productSpuIds、productCategoryIds 等) const data = { ...formData.value, ...values }; if (data.startAndEndTime && Array.isArray(data.startAndEndTime)) { data.startTime = data.startAndEndTime[0]; @@ -74,7 +73,6 @@ const [Modal, modalApi] = useVbenModal({ item.limit = convertToInteger(item.limit || 0); } }); - // productScopeValues 已通过 data.ts 中的 dependencies.trigger 自动同步到表单值中 await (data.id ? updateRewardActivity(data as MallRewardActivityApi.RewardActivity) : createRewardActivity(data as MallRewardActivityApi.RewardActivity)); @@ -99,7 +97,6 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); try { const result = await getReward(data.id); - // antd RangePicker 需要 dayjs 对象 result.startAndEndTime = [ result.startTime ? dayjs(result.startTime) : undefined, result.endTime ? dayjs(result.endTime) : undefined, diff --git a/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue b/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue index 0ee803ae4..d92eeb16a 100644 --- a/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue +++ b/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue @@ -490,6 +490,7 @@ defineExpose({ @checkbox-all="handleSelectionChange" > +