商品 spu 脱离优惠卷模块

src/views/mall/product/spu/form/ActivityOrdersSort.vue

@@ -54,6 +54,13 @@ const initSortable = () => {
 }
 onMounted(async () => {
   await nextTick()
+  // 如果活动排序为空也就是新增的时候加入活动
+  if (props.activityOrders && props.activityOrders.length === 0) {
+    emit(
+      'update:activityOrders',
+      props.promotionTypes.map((item) => item.value as number)
+    )
+  }
   initSortable()
 })
 </script>

src/views/mall/product/spu/form/CouponSelect.vue

@@ -1,223 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="65%">
-    <!-- 搜索工作栏 -->
-    <ContentWrap>
-      <el-form
-        ref="queryFormRef"
-        :inline="true"
-        :model="queryParams"
-        class="-mb-15px"
-        label-width="82px"
-      >
-        <el-form-item label="优惠券名称" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            class="!w-240px"
-            clearable
-            placeholder="请输入优惠劵名"
-            @keyup="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="优惠类型" prop="discountType">
-          <el-select
-            v-model="queryParams.discountType"
-            class="!w-240px"
-            clearable
-            placeholder="请选择优惠券类型"
-          >
-            <el-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_DISCOUNT_TYPE)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="优惠券状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            class="!w-240px"
-            clearable
-            placeholder="请选择优惠券状态"
-          >
-            <el-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
-          <el-date-picker
-            v-model="queryParams.createTime"
-            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-240px"
-            end-placeholder="结束日期"
-            start-placeholder="开始日期"
-            type="daterange"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
-            搜索
-          </el-button>
-          <el-button @click="resetQuery">
-            <Icon class="mr-5px" icon="ep:refresh" />
-            重置
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </ContentWrap>
-
-    <!-- 列表 -->
-    <ContentWrap>
-      <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
-        <el-table-column label="优惠券名称" min-width="140" prop="name" />
-        <el-table-column label="类型" min-width="80" prop="productScope">
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.PROMOTION_PRODUCT_SCOPE" :value="scope.row.productScope" />
-          </template>
-        </el-table-column>
-        <el-table-column label="优惠" min-width="100" prop="discount">
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="scope.row.discountType" />
-            {{ discountFormat(scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="领取方式" min-width="100" prop="takeType">
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.PROMOTION_COUPON_TAKE_TYPE" :value="scope.row.takeType" />
-          </template>
-        </el-table-column>
-        <el-table-column
-          :formatter="validityTypeFormat"
-          align="center"
-          label="使用时间"
-          prop="validityType"
-          width="185"
-        />
-        <el-table-column align="center" label="发放数量" prop="totalCount" />
-        <el-table-column
-          :formatter="remainedCountFormat"
-          align="center"
-          label="剩余数量"
-          prop="totalCount"
-        />
-        <el-table-column
-          :formatter="takeLimitCountFormat"
-          align="center"
-          label="领取上限"
-          prop="takeLimitCount"
-        />
-        <el-table-column align="center" label="状态" prop="status">
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
-          </template>
-        </el-table-column>
-        <el-table-column
-          :formatter="dateFormatter"
-          align="center"
-          label="创建时间"
-          prop="createTime"
-          width="180"
-        />
-      </el-table>
-      <!-- 分页 -->
-      <Pagination
-        v-model:limit="queryParams.pageSize"
-        v-model:page="queryParams.pageNo"
-        :total="total"
-        @pagination="getList"
-      />
-    </ContentWrap>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import {
-  discountFormat,
-  remainedCountFormat,
-  takeLimitCountFormat,
-  validityTypeFormat
-} from '@/views/mall/promotion/coupon/formatter'
-import { dateFormatter } from '@/utils/formatTime'
-import * as CouponTemplateApi from '@/api/mall/promotion/coupon/couponTemplate'
-import type { GiveCouponTemplate } from '@/api/mall/product/spu'
-
-defineOptions({ name: 'CouponSelect' })
-
-defineProps<{
-  multipleSelection: GiveCouponTemplate[]
-}>()
-const emit = defineEmits<{
-  (e: 'update:multipleSelection', v: GiveCouponTemplate[])
-}>()
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('选择优惠卷') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const loading = ref(true) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([]) // 字典表格数据
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  name: null,
-  status: null,
-  discountType: null,
-  type: null,
-  createTime: []
-})
-const queryFormRef = ref() // 搜索的表单
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    // 执行查询
-    const data = await CouponTemplateApi.getCouponTemplatePage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef?.value?.resetFields()
-  handleQuery()
-}
-
-/** 打开弹窗 */
-const open = async () => {
-  dialogVisible.value = true
-  resetQuery()
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-const handleSelectionChange = (val: CouponTemplateApi.CouponTemplateVO[]) => {
-  emit(
-    'update:multipleSelection',
-    val.map((item) => ({ id: item.id, name: item.name }))
-  )
-}
-
-const submitForm = () => {
-  dialogVisible.value = false
-}
-// TODO @puhui999：提前 todo，先不用改；未来单独成组件，其它模块可以服用；例如说，满减送，可以选择优惠劵；
-</script>

src/views/mall/product/spu/form/OtherSettingsForm.vue

@@ -42,25 +42,12 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="活动优先级">
-          <!-- TODO @puhui999：这个目前先写死；主要是，这个优惠类型不好用 promotion_type_enum；因为优惠劵、会员折扣都算。 -->
           <ActivityOrdersSort
             v-model:activity-orders="formData.activityOrders"
             :promotion-types="promotionTypes"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24">
-        <el-form-item label="赠送优惠劵">
-          <el-tag
-            v-for="coupon in formData.giveCouponTemplates"
-            :key="coupon.id as number"
-            class="mr-[10px]"
-          >
-            {{ coupon.name }}
-          </el-tag>
-          <el-button @click="openCouponSelect">选择优惠券</el-button>
-        </el-form-item>
-      </el-col>
     </el-row>
   </el-form>
 
@@ -91,17 +78,7 @@
         {{ promotionTypes.find((item) => item.value === activityType)?.label }}
       </el-tag>
     </template>
-    <template #giveCouponTemplates="{ row }">
-      <el-tag
-        v-for="coupon in row.giveCouponTemplates"
-        :key="coupon.id as number"
-        class="mr-[10px]"
-      >
-        {{ coupon.name }}
-      </el-tag>
-    </template>
   </Descriptions>
-  <CouponSelect ref="couponSelectRef" v-model:multiple-selection="formData.giveCouponTemplates" />
 </template>
 <script lang="ts" setup>
 import type { Spu } from '@/api/mall/product/spu'
@@ -109,8 +86,7 @@ import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { copyValueToTarget } from '@/utils'
 import { otherSettingsSchema } from './spu.data'
-import { DICT_TYPE, DictDataType, getIntDictOptions } from '@/utils/dict'
-import CouponSelect from './CouponSelect.vue'
+import { DICT_TYPE, DictDataType } from '@/utils/dict'
 import ActivityOrdersSort from './ActivityOrdersSort.vue'
 
 defineOptions({ name: 'OtherSettingsForm' })
@@ -128,14 +104,66 @@ const props = defineProps({
   isDetail: propTypes.bool.def(false) // 是否作为详情组件
 })
 
-// 优惠卷
-const couponSelectRef = ref() // 优惠卷模版选择 Ref
-const openCouponSelect = () => {
-  couponSelectRef.value?.open()
-}
-
+// TODO @puhui999：这个目前先写死；主要是，这个优惠类型不好用 promotion_type_enum；因为优惠劵、会员折扣都算
 // 活动优先级处理
-const promotionTypes = ref<DictDataType[]>(getIntDictOptions(DICT_TYPE.PROMOTION_TYPE_ENUM))
+const promotionTypes = ref<DictDataType[]>([
+  {
+    dictType: 'promotionTypes',
+    label: '秒杀活动',
+    value: 1,
+    colorType: 'warning',
+    cssClass: ''
+  },
+  {
+    dictType: 'promotionTypes',
+    label: '砍价活动',
+    value: 2,
+    colorType: 'warning',
+    cssClass: ''
+  },
+  {
+    dictType: 'promotionTypes',
+    label: '拼团活动',
+    value: 3,
+    colorType: 'warning',
+    cssClass: ''
+  },
+  {
+    dictType: 'promotionTypes',
+    label: '限时折扣',
+    value: 4,
+    colorType: 'warning',
+    cssClass: ''
+  },
+  {
+    dictType: 'promotionTypes',
+    label: '满减送',
+    value: 5,
+    colorType: 'warning',
+    cssClass: ''
+  },
+  {
+    dictType: 'promotionTypes',
+    label: '会员折扣',
+    value: 6,
+    colorType: 'warning',
+    cssClass: ''
+  },
+  {
+    dictType: 'promotionTypes',
+    label: '优惠劵',
+    value: 7,
+    colorType: 'warning',
+    cssClass: ''
+  },
+  {
+    dictType: 'promotionTypes',
+    label: '积分',
+    value: 8,
+    colorType: 'warning',
+    cssClass: ''
+  }
+])
 
 const otherSettingsFormRef = ref() // 表单Ref
 // 表单数据
@@ -148,8 +176,7 @@ const formData = ref<Spu>({
   recommendBest: false, // 是否精品
   recommendNew: false, // 是否新品
   recommendGood: false, // 是否优品
-  activityOrders: [], // 活动排序
-  giveCouponTemplates: [] // 赠送的优惠券
+  activityOrders: [] // 活动排序
 })
 // 表单规则
 const rules = reactive({

src/views/mall/product/spu/form/index.vue

@@ -95,8 +95,7 @@ const formData = ref<ProductSpuApi.Spu>({
   recommendBest: false, // 是否精品
   recommendNew: false, // 是否新品
   recommendGood: false, // 是否优品
-  activityOrders: [], // 活动排序
-  giveCouponTemplates: [] // 赠送的优惠券
+  activityOrders: [] // 活动排序
 })
 
 /** 获得详情 */

src/views/mall/product/spu/form/spu.data.ts

@@ -94,10 +94,6 @@ export const otherSettingsSchema = reactive<CrudSchema[]>([
     label: '是否优品推荐',
     field: 'recommendGood'
   },
-  {
-    label: '赠送的优惠劵',
-    field: 'giveCouponTemplates'
-  },
   {
     label: '活动显示排序',
     field: 'activityOrders'