From 348cc35aecb951c5a71f35c9013a31eb32b414df Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 20 Dec 2025 08:33:40 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90antd=E3=80=91=E3=80=90mal?=
 =?UTF-8?q?l=E3=80=91combination=20=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promotion/combination/activity/data.ts    |  32 +-
 .../combination/activity/modules/form.vue     | 345 +++++++++---------
 2 files changed, 189 insertions(+), 188 deletions(-)

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 c3362dab4..8891f892c 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
@@ -24,16 +24,7 @@ export function useFormSchema(): VbenFormSchema[] {
         placeholder: '请输入活动名称',
       },
       rules: 'required',
-    },
-    {
-      fieldName: 'status',
-      label: '活动状态',
-      component: 'Select',
-      componentProps: {
-        placeholder: '请选择活动状态',
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-      },
-      rules: 'required',
+      formItemClass: 'col-span-2',
     },
     {
       fieldName: 'startTime',
@@ -41,9 +32,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'DatePicker',
       componentProps: {
         placeholder: '请选择开始时间',
-        showTime: false,
+        showTime: true,
         valueFormat: 'x',
-        format: 'YYYY-MM-DD',
+        format: 'YYYY-MM-DD HH:mm:ss',
       },
       rules: 'required',
     },
@@ -53,18 +44,18 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'DatePicker',
       componentProps: {
         placeholder: '请选择结束时间',
-        showTime: false,
+        showTime: true,
         valueFormat: 'x',
-        format: 'YYYY-MM-DD',
+        format: 'YYYY-MM-DD HH:mm:ss',
       },
       rules: 'required',
     },
     {
       fieldName: 'userSize',
-      label: '用户数量',
+      label: '拼团人数',
       component: 'InputNumber',
       componentProps: {
-        placeholder: '请输入用户数量',
+        placeholder: '达到该人数即成团',
         min: 2,
       },
       rules: 'required',
@@ -74,7 +65,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '限制时长',
       component: 'InputNumber',
       componentProps: {
-        placeholder: '请输入限制时长(小时)',
+        placeholder: '限制时长(小时)',
         min: 0,
       },
       rules: 'required',
@@ -105,6 +96,13 @@ export function useFormSchema(): VbenFormSchema[] {
         options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
       },
     },
+    {
+      fieldName: 'spuId',
+      label: '拼团商品',
+      component: 'Input',
+      rules: 'required',
+      formItemClass: 'col-span-2',
+    },
   ];
 }
 
diff --git a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
index 234d3d73d..22c3cbb45 100644
--- a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
@@ -1,13 +1,20 @@
 <script lang="ts" setup>
+import type { MallSpuApi } from '#/api/mall/product/spu';
 import type { MallCombinationActivityApi } from '#/api/mall/promotion/combination/combinationActivity';
+import type {
+  RuleConfig,
+  SpuProperty,
+} from '#/views/mall/product/spu/components';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { cloneDeep, convertToInteger, formatToFraction } from '@vben/utils';
 
-import { Button, message } from 'ant-design-vue';
+import { Button, InputNumber, message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { VxeColumn } from '#/adapter/vxe-table';
 import { getSpu } from '#/api/mall/product/spu';
 import {
   createCombinationActivity,
@@ -15,58 +22,25 @@ import {
   updateCombinationActivity,
 } from '#/api/mall/promotion/combination/combinationActivity';
 import { $t } from '#/locales';
-import { SpuSkuSelect } from '#/views/mall/product/spu/components';
+import {
+  getPropertyList,
+  SpuAndSkuList,
+  SpuSkuSelect,
+} from '#/views/mall/product/spu/components';
 
 import { useFormSchema } from '../data';
 
 defineOptions({ name: 'CombinationActivityForm' });
 
 const emit = defineEmits(['success']);
-const formData = ref<MallCombinationActivityApi.CombinationActivity>();
 
+const formData = ref<MallCombinationActivityApi.CombinationActivity>();
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['拼团活动'])
     : $t('ui.actionTitle.create', ['拼团活动']);
 });
 
-// ================= 商品选择相关 =================
-const spuId = ref<number>();
-const spuName = ref<string>('');
-const skuTableData = ref<any[]>([]);
-
-const spuSkuSelectRef = ref(); // 商品选择弹窗 Ref
-
-/** 打开商品选择弹窗 */
-const handleSelectProduct = () => {
-  spuSkuSelectRef.value?.open();
-};
-
-/** 选择商品后的回调 */
-async function handleSpuSelected(selectedSpuId: number, skuIds?: number[]) {
-  const spu = await getSpu(selectedSpuId);
-  if (!spu) return;
-
-  spuId.value = spu.id;
-  spuName.value = spu.name || '';
-
-  // 筛选指定的 SKU
-  const selectedSkus = skuIds
-    ? spu.skus?.filter((sku) => skuIds.includes(sku.id!))
-    : spu.skus;
-
-  skuTableData.value =
-    selectedSkus?.map((sku) => ({
-      skuId: sku.id!,
-      skuName: sku.name || '',
-      picUrl: sku.picUrl || spu.picUrl || '',
-      price: sku.price || 0,
-      combinationPrice: 0,
-    })) || [];
-}
-
-// ================= end =================
-
 const [Form, formApi] = useVbenForm({
   commonConfig: {
     componentProps: {
@@ -74,49 +48,126 @@ const [Form, formApi] = useVbenForm({
     },
     labelWidth: 100,
   },
-  wrapperClass: 'grid-cols-2',
   layout: 'horizontal',
   schema: useFormSchema(),
   showDefaultActions: false,
 });
 
+// ================= 商品选择相关 =================
+
+const spuSkuSelectRef = ref(); // 商品和属性选择 Ref
+const spuAndSkuListRef = ref(); // SPU 和 SKU 列表组件 Ref
+
+const ruleConfig: RuleConfig[] = [
+  {
+    name: 'productConfig.combinationPrice',
+    rule: (arg) => arg >= 0.01,
+    message: '商品拼团价格不能小于 0.01 ！！！',
+  },
+];
+
+const spuList = ref<MallSpuApi.Spu[]>([]); // 选择的 SPU 列表
+const spuPropertyList = ref<SpuProperty<MallSpuApi.Spu>[]>([]); // SPU 属性列表
+
+/** 打开商品选择器 */
+function openSpuSelect() {
+  spuSkuSelectRef.value?.open();
+}
+
+/** 选择商品后的回调 */
+async function handleSpuSelected(spuId: number, skuIds?: number[]) {
+  await formApi.setFieldValue('spuId', spuId);
+  await getSpuDetails(spuId, skuIds);
+}
+
+/** 获取 SPU 详情 */
+async function getSpuDetails(
+  spuId: number,
+  skuIds?: number[],
+  products?: MallCombinationActivityApi.CombinationProduct[],
+) {
+  const res = await getSpu(spuId);
+  if (!res) {
+    return;
+  }
+
+  spuList.value = [];
+
+  // 筛选指定的 SKU
+  const selectSkus =
+    skuIds === undefined
+      ? res.skus
+      : res.skus?.filter((sku) => skuIds.includes(sku.id!));
+
+  // 为每个 SKU 配置拼团活动相关的配置
+  selectSkus?.forEach((sku) => {
+    let config: MallCombinationActivityApi.CombinationProduct = {
+      spuId: res.id!,
+      skuId: sku.id!,
+      combinationPrice: 0,
+    };
+    // 如果是编辑模式，回填已有配置
+    if (products !== undefined) {
+      const product = products.find((item) => item.skuId === sku.id);
+      if (product) {
+        // 分转元
+        product.combinationPrice = formatToFraction(
+          product.combinationPrice,
+        ) as unknown as number;
+      }
+      config = product || config;
+    }
+    // 动态添加 productConfig 属性到 SKU
+    (
+      sku as MallSpuApi.Sku & {
+        productConfig: MallCombinationActivityApi.CombinationProduct;
+      }
+    ).productConfig = config;
+  });
+  res.skus = selectSkus;
+
+  const spuProperties: SpuProperty<MallSpuApi.Spu>[] = [
+    {
+      spuId: res.id!,
+      spuDetail: res,
+      propertyList: getPropertyList(res),
+    },
+  ];
+
+  // 直接赋值，因为拼团活动只选择一个 SPU
+  spuList.value = [res];
+  spuPropertyList.value = spuProperties;
+}
+
+// ================= end =================
+
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-
-    // 验证商品和 SKU 配置
-    if (!spuId.value) {
-      message.error('请选择拼团商品');
-      return;
-    }
-    if (skuTableData.value.length === 0) {
-      message.error('请至少配置一个 SKU');
-      return;
-    }
-    // 验证 SKU 配置
-    const hasInvalidSku = skuTableData.value.some(
-      (sku) => sku.combinationPrice < 0.01,
-    );
-    if (hasInvalidSku) {
-      message.error('请正确配置 SKU 的拼团价格（≥0.01）');
-      return;
-    }
-
-    // 提交表单
     modalApi.lock();
     try {
+      // 获取拼团商品配置（深拷贝避免直接修改原对象）
+      const products: MallCombinationActivityApi.CombinationProduct[] =
+        cloneDeep(spuAndSkuListRef.value?.getSkuConfigs('productConfig') || []);
+      if (products.length === 0) {
+        message.error('请选择拼团商品');
+        return;
+      }
+      // 价格需要转为分
+      products.forEach((item) => {
+        item.combinationPrice = convertToInteger(item.combinationPrice);
+      });
+
+      // 提交表单
       const values = await formApi.getValues();
-      const data: any = {
+      const data = {
         ...values,
-        spuId: spuId.value,
-        products: skuTableData.value.map((sku) => ({
-          skuId: sku.skuId,
-          combinationPrice: Math.round(sku.combinationPrice * 100), // 转换为分
-        })),
-      };
+        products,
+      } as MallCombinationActivityApi.CombinationActivity;
+
       await (formData.value?.id
         ? updateCombinationActivity(data)
         : createCombinationActivity(data));
@@ -131,46 +182,29 @@ const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
-      spuId.value = undefined;
-      spuName.value = '';
-      skuTableData.value = [];
+      spuList.value = [];
+      spuPropertyList.value = [];
       return;
     }
+
     // 加载数据
     const data =
       modalApi.getData<MallCombinationActivityApi.CombinationActivity>();
     if (!data || !data.id) {
       return;
     }
+    // 加载数据
     modalApi.lock();
     try {
       formData.value = await getCombinationActivity(data.id);
-      await nextTick();
+      // 对齐活动商品处理结构
+      await getSpuDetails(
+        formData.value.spuId!,
+        formData.value.products?.map((sku) => sku.skuId),
+        formData.value.products,
+      );
+      // 设置表单值
       await formApi.setValues(formData.value);
-      // 加载商品和 SKU 信息
-      // TODO @puhui999：if return，简化括号层级
-      if (formData.value.spuId) {
-        const spu = await getSpu(formData.value.spuId);
-        if (spu) {
-          spuId.value = spu.id;
-          spuName.value = spu.name || '';
-          // 回填 SKU 配置
-          const products = formData.value.products || [];
-          skuTableData.value =
-            spu.skus
-              ?.filter((sku) => products.some((p) => p.skuId === sku.id))
-              .map((sku) => {
-                const product = products.find((p) => p.skuId === sku.id);
-                return {
-                  skuId: sku.id!,
-                  skuName: sku.name || '',
-                  picUrl: sku.picUrl || spu.picUrl || '',
-                  price: sku.price || 0,
-                  combinationPrice: (product?.combinationPrice || 0) / 100, // 分转元
-                };
-              }) || [];
-        }
-      }
     } finally {
       modalApi.unlock();
     }
@@ -179,80 +213,49 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-4/5" :title="getTitle">
-    <div class="mx-4">
-      <Form />
+  <div>
+    <Modal :title="getTitle" class="w-[70%]">
+      <Form class="mx-4">
+        <!-- 商品选择 -->
+        <template #spuId>
+          <div class="w-full">
+            <Button v-if="!formData?.id" type="primary" @click="openSpuSelect">
+              选择商品
+            </Button>
 
-      <!-- 商品选择区域 -->
-      <div class="mt-4">
-        <div class="mb-2 flex items-center">
-          <span class="text-sm font-medium">拼团活动商品:</span>
-          <Button class="ml-2" type="primary" @click="handleSelectProduct">
-            选择商品
-          </Button>
-          <span v-if="spuName" class="ml-4 text-sm text-gray-600">
-            已选择: {{ spuName }}
-          </span>
-        </div>
+            <!-- SPU 和 SKU 列表展示 -->
+            <SpuAndSkuList
+              ref="spuAndSkuListRef"
+              :rule-config="ruleConfig"
+              :spu-list="spuList"
+              :spu-property-list-p="spuPropertyList"
+              class="mt-4"
+            >
+              <!-- 扩展列：拼团活动特有配置 -->
+              <template #default>
+                <VxeColumn align="center" min-width="168" title="拼团价格(元)">
+                  <template #default="{ row: sku }">
+                    <InputNumber
+                      v-model:value="sku.productConfig.combinationPrice"
+                      :min="0"
+                      :precision="2"
+                      :step="0.1"
+                      class="w-full"
+                    />
+                  </template>
+                </VxeColumn>
+              </template>
+            </SpuAndSkuList>
+          </div>
+        </template>
+      </Form>
+    </Modal>
 
-        <!-- SKU 配置表格 -->
-        <div v-if="skuTableData.length > 0" class="mt-4">
-          <table class="w-full border-collapse border border-gray-300">
-            <thead>
-              <tr class="bg-gray-100">
-                <th class="border border-gray-300 px-4 py-2">商品图片</th>
-                <th class="border border-gray-300 px-4 py-2">SKU 名称</th>
-                <th class="border border-gray-300 px-4 py-2">原价(元)</th>
-                <th class="border border-gray-300 px-4 py-2">拼团价格(元)</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr v-for="(sku, index) in skuTableData" :key="index">
-                <td class="border border-gray-300 px-4 py-2 text-center">
-                  <img
-                    v-if="sku.picUrl"
-                    :src="sku.picUrl"
-                    alt="商品图片"
-                    class="h-16 w-16 object-cover"
-                  />
-                </td>
-                <!-- TODO @puhui999：这里貌似和 element-plus 没对齐；；ps：是不是用 grid 组件呀？或者 vxe 组件
-                 图片
-                  商品条码
-                  销售价(元)
-                  市场价(元)
-                  成本价(元)
-                  库存
-                  拼团价格(元)
-                 -->
-                <td class="border border-gray-300 px-4 py-2">
-                  {{ sku.skuName }}
-                </td>
-                <td class="border border-gray-300 px-4 py-2 text-center">
-                  ¥{{ (sku.price / 100).toFixed(2) }}
-                </td>
-                <td class="border border-gray-300 px-4 py-2">
-                  <!-- TODO @puhui999：是不是要使用 antd 的哈？ -->
-                  <input
-                    v-model.number="sku.combinationPrice"
-                    type="number"
-                    min="0"
-                    step="0.01"
-                    class="w-full rounded border border-gray-300 px-2 py-1"
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </Modal>
-
-  <!-- 商品选择器弹窗 -->
-  <SpuSkuSelect
-    ref="spuSkuSelectRef"
-    :is-select-sku="true"
-    @select="handleSpuSelected"
-  />
+    <!-- 商品选择器弹窗 -->
+    <SpuSkuSelect
+      ref="spuSkuSelectRef"
+      :is-select-sku="true"
+      @select="handleSpuSelected"
+    />
+  </div>
 </template>