diff --git a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue index d9a1aee5b..4071c1e16 100644 --- a/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue +++ b/apps/web-antd/src/views/bpm/model/modules/category-draggable-model.vue @@ -464,8 +464,6 @@ function handleRenameSuccess() { >
-
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 37e7937ef..bd4ff8353 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 @@ -168,10 +168,6 @@ async function initProcessInfo(row: any, formVariables?: any) { await router.push({ path: row.formCustomCreatePath, }); - // 返回选择流程 - // 这里为啥要有个 cancel 事件哈?目前看 vue3 + element-plus 貌似不需要呀; - // @芋艿 不加貌似会有点问题。 - emit('cancel'); } } diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue index 69f09011f..3dd8c1867 100644 --- a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue @@ -229,36 +229,32 @@ const [Modal, modalApi] = useVbenModal({ if (!valid) { return; } - // 校验是否选择了商品 if (spuList.value.length === 0) { ElMessage.warning('请选择活动商品'); return; } - modalApi.lock(); + // 提交表单 try { // 获取折扣商品配置 const products = cloneDeep( spuAndSkuListRef.value?.getSkuConfigs('productConfig') || [], ) as MallDiscountActivityApi.DiscountProduct[]; - // 转换金额为分 products.forEach((item) => { item.discountPercent = convertToInteger(item.discountPercent); item.discountPrice = convertToInteger(item.discountPrice); }); - const data = cloneDeep( await formApi.getValues(), ) as MallDiscountActivityApi.DiscountActivity; data.products = products; - // 提交请求 await (formData.value?.id ? updateDiscountActivity(data) : createDiscountActivity(data)); - + // 关闭并提示 await modalApi.close(); emit('success'); ElMessage.success($t('ui.actionMessage.operationSuccess')); @@ -271,18 +267,15 @@ const [Modal, modalApi] = useVbenModal({ await resetForm(); return; } - // 加载数据 const data = modalApi.getData(); if (!data || !data.id) { return; } - modalApi.lock(); try { const activityData = await getDiscountActivity(data.id); formData.value = activityData; - // 加载商品详情 if (activityData.products && activityData.products.length > 0) { // 按 spuId 分组 @@ -297,15 +290,13 @@ const [Modal, modalApi] = useVbenModal({ } spuProductsMap.get(spuId)!.push(product); } - // 加载每个 SPU 的详情 for (const [spuId, products] of spuProductsMap) { const skuIdArr = products.map((p) => p.skuId); await getSpuDetails(spuId, skuIdArr, products, 'load'); } } - - // 设置表单值 + // 设置到 values await formApi.setValues(activityData); } finally { modalApi.unlock(); diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue index f210f4953..1bf6a89d2 100644 --- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue @@ -117,7 +117,6 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); try { const result = await getReward(data.id); - // valueFormat: 'x' 配置下,直接使用时间戳字符串 result.startAndEndTime = [ result.startTime ? String(result.startTime) : undefined, result.endTime ? String(result.endTime) : undefined,