feat(service): 商品管理模块改造为服务管理功能

- 新增selectServiceItemsSelList接口用于获取服务项目选择列表
- 将商品相关字段和服务相关字段进行统一调整，包括名称、类型、描述等
- 添加服务详情、兑换条件、所属联赛、截止核销时间等新字段
- 更新表单验证规则，增加对服务必填字段的校验逻辑
- 实现兑换条件的动态配置和JSON数据存储功能
- 集成联赛选择功能并完善相关的API调用和数据处理
- 优化UI界面布局，调整表格列显示和表单字段标签
- 添加门店变更事件处理，实现门店类型联动功能
- 完善数据导入导出功能，更新文件命名规则
- 重构组件中的商品相关文案为服务相关表述

src/api/system/business/items/index.ts

@@ -78,3 +78,9 @@ export const selectXianXiaItemsSelList = (): AxiosPromise<ItemsVO> => {
     method: 'get'
   });
 };
+export const selectServiceItemsSelList = (): AxiosPromise<ItemsVO> => {
+  return request({
+    url: '/business/items/selectServiceItemsSelList',
+    method: 'get'
+  });
+};

src/api/system/physical/product/types.ts

@@ -44,6 +44,9 @@ export interface ProductVO {
 
   productImagesOsId?: string[];
   productDetailImgOsId?: string[];
+  leagueTournamentId?: number;
+  cancelTime?: string;
+  exchangeConditions?: string;
 }
 
 export interface ProductForm extends BaseEntity {
@@ -62,6 +65,8 @@ export interface ProductForm extends BaseEntity {
    */
   typeId?: string | number;
 
+  storeTypeName?: string | number;
+
   /**
    * 门店ID，外键关联store
    */
@@ -92,6 +97,9 @@ export interface ProductForm extends BaseEntity {
 
   productImagesOsId?: string | string[];
   productDetailImgOsId?: string | string[];
+  leagueTournamentId?: number;
+  cancelTime?: string;
+  exchangeConditions?: string;
 }
 
 export interface ProductQuery extends PageQuery {

src/views/system/physical/product/index.vue

@@ -4,21 +4,21 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="商品名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="服务名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入服务名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="商品类型" prop="typeId">
+            <el-form-item label="服务类型" prop="typeId">
               <el-select v-model="queryParams.typeId" placeholder="选项">
                 <el-option v-for="item in itemOptionsType" :key="item.id" :label="item.label" :value="item.id" />
               </el-select>
             </el-form-item>
-            <el-form-item label="门店" prop="storeId">
+            <el-form-item label="所属门店" prop="storeId">
               <el-select v-model="queryParams.storeId" placeholder="选项">
                 <el-option v-for="item in itemOptionsStore" :key="item.id" :label="item.label" :value="item.id" />
               </el-select>
             </el-form-item>
-            <el-form-item label="商品说明" prop="description">
-              <el-input v-model="queryParams.description" placeholder="请输入商品说明" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="服务详情" prop="description">
+              <el-input v-model="queryParams.description" placeholder="请输入服务详情" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -54,18 +54,20 @@
 
       <el-table v-loading="loading" border :data="productList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="编号" align="center" prop="id" v-if="true" />
-        <el-table-column label="商品名称" align="center" prop="name" />
-        <el-table-column label="商品类型" align="center" prop="typeName" />
-        <el-table-column label="门店" align="center" prop="storeName" />
-        <el-table-column label="商品说明" align="center" prop="description" />
+        <el-table-column label="服务ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="服务类型" align="center" prop="typeName" />
+        <el-table-column label="门店昵称" align="center" prop="storeName" />
+        <el-table-column label="服务名称" align="center" prop="name" />
+        <el-table-column label="服务详情" align="center" prop="description" />
         <el-table-column label="剩余库存" align="center" prop="stock" />
-        <el-table-column label="商品价值" align="center" prop="price" />
+        <el-table-column label="兑换条件" align="center" prop="exchangeConditionsContent"> </el-table-column>
+        <el-table-column label="所属联赛" align="center" prop="leagueTournamentName" />
+        <el-table-column label="截止核销时间" align="center" prop="cancelTime" />
         <el-table-column label="上架状态" align="center" width="120">
           <template #default="scope">
-            <span v-if="scope.row.status === 0">下架</span>
-            <span v-else-if="scope.row.status === 1">上架</span>
-            <span v-else>未知</span>
+            <el-tag :type="scope.row.status === 1 ? 'success' : 'info'">
+              {{ scope.row.status === 1 ? '上架' : '下架' }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -83,40 +85,68 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改商品对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="productFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入商品名称，最多50字" />
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body>
+      <el-form ref="productFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="服务名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入服务名称" />
         </el-form-item>
-        <el-form-item label="商品类型" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="选项">
-            <el-option v-for="item in itemOptionsType" :key="item.id" :label="item.label" :value="item.id" />
-          </el-select>
+        <el-form-item label="服务详情" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入服务详情" />
+        </el-form-item>
+        <el-form-item label="服务图片">
+          <imageUpload v-model="form.productImagesOsId" :limit="1" />
         </el-form-item>
-        <el-form-item label="门店" prop="storeId">
-          <el-select v-model="form.storeId" placeholder="选项">
+        <el-form-item label="门店昵称" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="选项" @change="handleStoreChange">
             <el-option v-for="item in itemOptionsStore" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="商品说明" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="服务类型" prop="typeId">
+          <el-input v-model="form.typeId" placeholder="请输入服务类型" disabled />
         </el-form-item>
-        <el-form-item label="商品图片">
-          <imageUpload v-model="form.productImagesOsId" />
-        </el-form-item>
-        <el-form-item label="详情图片">
-          <imageUpload v-model="form.productDetailImgOsId" />
+        <el-form-item label="服务类型" prop="">
+          <el-input v-model="form.storeTypeName" placeholder="请输入服务类型" disabled />
         </el-form-item>
-        <el-form-item label="剩余库存" prop="stock">
+        <el-form-item label="库存" prop="stock">
           <el-input v-model="form.stock" placeholder="请输入剩余库存" />
         </el-form-item>
-        <el-form-item label="商品价值" prop="price">
+        <el-form-item label="兑换条件" prop="exchangeConditions">
+          <div>
+            <div v-for="(condition, index) in formConditions.conditions" :key="index" style="display: flex; align-items: center; margin-bottom: 8px">
+              <el-select v-model="condition.itemId" placeholder="选项" style="width: 200px; margin-right: 8px">
+                <el-option v-for="item in itemOptions" :key="item.id" :label="item.label" :value="item.id" />
+              </el-select>
+              <el-input v-model="condition.value" placeholder="请输入数量" style="width: 200px" />
+            </div>
+          </div>
+        </el-form-item>
+        <!--        <el-form-item label="详情图片">
+          <imageUpload v-model="form.productDetailImgOsId" />
+        </el-form-item>-->
+
+        <!--        <el-form-item label="商品价值" prop="price">
           <el-input v-model="form.price" placeholder="请输入商品价值" />
+        </el-form-item>-->
+        <el-form-item label="所属联赛" prop="leagueTournamentId">
+          <el-select v-model="form.leagueTournamentId" placeholder="请选择联赛" style="width: 100%">
+            <el-option v-for="item in leagueTournamentOptions" :key="item.id" :label="item.title" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="截止核销时间" prop="cancelTime">
+          <el-date-picker
+            clearable
+            v-model="form.cancelTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择截止核销时间"
+            style="width: 100%"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="上架状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择上架状态">
-            <el-option label="下架" :value="0"></el-option>
             <el-option label="上架" :value="1"></el-option>
+            <el-option label="下架" :value="0"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -139,7 +169,10 @@ import { selectAllPhysicalTagsSelList } from '@/api/system/physical/tag';
 import { selectPhysicalStoreSelList } from '@/api/system/physical/store';
 import { listByIds } from '@/api/system/oss';
 import { parseTime } from '@/utils/dateUtils';
-
+import { selectPhysicalLeagueTournamentSelList } from '@/api/system/physical/leagueTournament';
+import { selectServiceItemsSelList } from '@/api/system/business/items';
+import { LeagueTournamentVO } from '@/api/system/physical/leagueTournament/types';
+import { ElSelect } from 'element-plus';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const productList = ref<ProductVO[]>([]);
@@ -182,17 +215,43 @@ const data = reactive<PageData<ProductForm, ProductQuery>>({
     description: undefined,
     stock: undefined,
     price: undefined,
-    status: 1,
+    status: undefined,
     params: {}
   },
   rules: {
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
-    name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
-    typeId: [{ required: true, message: '商品类型不能为空', trigger: 'blur' }],
-    storeId: [{ required: true, message: '门店不能为空', trigger: 'blur' }],
-    stock: [{ required: true, message: '剩余库存不能为空', trigger: 'blur' }],
-    price: [{ required: true, message: '商品价值不能为空', trigger: 'blur' }],
-    status: [{ required: true, message: '上架状态', trigger: 'change' }]
+    name: [{ required: true, message: '服务名称不能为空', trigger: 'blur' }],
+    typeId: [{ required: true, message: '服务类型不能为空', trigger: 'blur' }],
+    storeId: [{ required: true, message: '所属门店不能为空', trigger: 'blur' }],
+    stock: [{ required: true, message: '库存不能为空', trigger: 'blur' }],
+    leagueTournamentId: [{ required: true, message: '所属联赛不能为空', trigger: 'blur' }],
+    status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
+    cancelTime: [{ required: true, message: '截止核销时间不能为空', trigger: 'change' }],
+    exchangeConditions: [
+      {
+        validator: (rule, value, callback) => {
+          const conditions = formConditions.value.conditions;
+          if (conditions.length === 0) {
+            callback(new Error('至少添加一项兑换条件'));
+            return;
+          }
+
+          for (let i = 0; i < conditions.length; i++) {
+            const condition = conditions[i];
+            if (!condition.itemId) {
+              callback(new Error(`第${i + 1}项道具不能为空`));
+              return;
+            }
+            if (!condition.value || condition.value <= 0) {
+              callback(new Error(`第${i + 1}项数量必须大于 0`));
+              return;
+            }
+          }
+          callback();
+        },
+        trigger: 'change'
+      }
+    ]
   }
 });
 
@@ -242,7 +301,7 @@ const handleSelectionChange = (selection: ProductVO[]) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = '添加商品';
+  dialog.title = '添加';
 };
 
 /** 修改按钮操作 */
@@ -286,9 +345,21 @@ const handleUpdate = async (row?: ProductVO) => {
   } else {
     form.value.productDetailImgOsId = [];
   }
-
+  if (res.data.exchangeConditions) {
+    try {
+      const conditions = JSON.parse(res.data.exchangeConditions);
+      formConditions.value.conditions = conditions.map((item: any, index: number) => ({
+        index,
+        itemId: item.itemId,
+        value: item.value
+      }));
+    } catch (error) {
+      console.error('解析兑换条件失败:', error);
+      formConditions.value.conditions = [{ index: 0, itemId: '', value: 0 }];
+    }
+  }
   dialog.visible = true;
-  dialog.title = '修改商品';
+  dialog.title = '修改';
 };
 /** 提交按钮 */
 const submitForm = () => {
@@ -313,7 +384,21 @@ const submitForm = () => {
       };
 
       form.value.productImages = await processOsIds(form.value.productImagesOsId, 'SHOW');
+/*
       form.value.productDetailImg = await processOsIds(form.value.productDetailImgOsId, 'DETAIL');
+*/
+
+      const validConditions = formConditions.value.conditions.filter((c) => c.itemId && c.value);
+      if (validConditions.length > 0) {
+        form.value.exchangeConditions = JSON.stringify(
+          validConditions.map((c) => ({
+            itemId: c.itemId,
+            value: c.value
+          }))
+        );
+      } else {
+        form.value.exchangeConditions = undefined;
+      }
 
       if (form.value.id) {
         await updateProduct(form.value).finally(() => (buttonLoading.value = false));
@@ -334,12 +419,11 @@ const getIds = async (ids: string | number) => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: ProductVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm(`是否确认删除商品编号为"${_ids}"的数据项？`).finally(() => (loading.value = false));
+  await proxy?.$modal.confirm(`是否确认删除服务ID为"${_ids}"的数据项？`).finally(() => (loading.value = false));
   await delProduct(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };
-
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download(
@@ -347,11 +431,11 @@ const handleExport = () => {
     {
       ...queryParams.value
     },
-    `商品列表${parseTime(new Date(), '{y}{m}{d}{h}{i}{s}')}.xlsx`
+    `服务详细配置${parseTime(new Date(), '{y}{m}{d}{h}{i}{s}')}.xlsx`
   );
 };
 const itemOptionsType = ref<{ id: number; label: string }[]>([]);
-const itemOptionsStore = ref<{ id: number; label: string }[]>([]);
+const itemOptionsStore = ref<{ id: number; label: string; storeTypeName?: string; storeTypeId?: string }[]>([]);
 
 const loadOptions = async (apiFunc: () => Promise<any>, targetRef: any, labelKey: string = 'serviceName') => {
   try {
@@ -370,14 +454,16 @@ const loadOptions = async (apiFunc: () => Promise<any>, targetRef: any, labelKey
 };
 
 const loadItemStructuresOptions = () => loadOptions(selectAllPhysicalTagsSelList, itemOptionsType);
-const loadStoreOptions = () => loadOptions(selectPhysicalStoreSelList, itemOptionsStore);
+const loadStoreOptions = () => loadOptions(selectPhysicalStoreSelList, itemOptionsStore, 'name');
 onMounted(() => {
   getList();
   loadItemStructuresOptions();
   loadStoreOptions();
+  loadLeagueTournamentOptions();
+  loadItemOptions();
 });
 
-watch(
+/*watch(
   () => form.value.productImagesOsId,
   (newVal, oldVal) => {
     const oldIds = Array.isArray(oldVal) ? oldVal : oldVal?.split(',') || [];
@@ -395,9 +481,8 @@ watch(
     }
   },
   { deep: true }
-);
-
-watch(
+);*/
+/*watch(
   () => form.value.productDetailImgOsId,
   (newVal, oldVal) => {
     const oldIds = Array.isArray(oldVal) ? oldVal : oldVal?.split(',') || [];
@@ -415,7 +500,80 @@ watch(
     }
   },
   { deep: true }
-);
+);*/
+// 响应式变量
+const leagueTournamentOptions = ref<LeagueTournamentVO[]>([]);
+
+const loadLeagueTournamentOptions = async () => {
+  try {
+    const res = await selectPhysicalLeagueTournamentSelList();
+    if (res.code === 200 && Array.isArray(res.data)) {
+      leagueTournamentOptions.value = res.data;
+    } else {
+      ElMessage.error('加载失败：' + res.msg);
+    }
+  } catch (error) {
+    console.error('请求出错:', error);
+    ElMessage.error('请求失败，请检查网络');
+  }
+};
+const itemOptions = ref<{ id: number; label: string }[]>([]);
+// 加载报名条件选项
+const loadItemOptions = async () => {
+  try {
+    const res = await selectServiceItemsSelList();
+    if (res.code === 200) {
+      // 类型断言
+      const data = res.data as unknown as { id: number; name: string }[];
+
+      // 过滤掉 id === 2 的项，并映射为 { id, label }
+      itemOptions.value = data
+        .filter((item) => item.id !== 2) // ✅ 过滤 id 为 2 的
+        .map((item) => ({
+          id: item.id,
+          label: item.name
+        }));
+    } else {
+      ElMessage.error('加载失败：' + res.msg);
+    }
+  } catch (error) {
+    console.error('请求出错:', error);
+    ElMessage.error('请求失败，请检查网络');
+  }
+};
+interface ConditionItem {
+  index: number;
+  itemId: string;
+  value: number;
+}
+
+interface FormConditions {
+  conditions: ConditionItem[];
+}
+const formConditions = ref<FormConditions>({
+  conditions: [{ index: 0, itemId: '', value: 0 }]
+});
+const handleStoreChange = (storeId: number) => {
+  const selectedStore = itemOptionsStore.value.find((item) => item.id === storeId);
+  if (selectedStore && selectedStore.storeTypeName) {
+    form.value.storeTypeName = selectedStore.storeTypeName;
+  }
+  if (selectedStore && selectedStore.storeTypeId) {
+    form.value.typeId = selectedStore.storeTypeId;
+  }
+};
+const formatExchangeConditions = (conditions: string) => {
+  if (!conditions) return '-';
+  try {
+    const data = JSON.parse(conditions);
+    if (Array.isArray(data) && data.length > 0) {
+      return data.map((item) => `${item.itemId}:${item.value}`).join('; ');
+    }
+    return '-';
+  } catch (error) {
+    return '-';
+  }
+};
 </script>
 <style scoped>
 .upload-images :deep(.el-upload-list__item) {