Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
c8a476ac7c
@ -57,6 +57,11 @@ export const updateBargainActivity = async (data: BargainActivityVO) => {
|
|||||||
return await request.put({ url: '/promotion/bargain-activity/update', data })
|
return await request.put({ url: '/promotion/bargain-activity/update', data })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 关闭砍价活动
|
||||||
|
export const closeBargainActivity = async (id: number) => {
|
||||||
|
return await request.put({ url: '/promotion/bargain-activity/close?id=' + id })
|
||||||
|
}
|
||||||
|
|
||||||
// 删除砍价活动
|
// 删除砍价活动
|
||||||
export const deleteBargainActivity = async (id: number) => {
|
export const deleteBargainActivity = async (id: number) => {
|
||||||
return await request.delete({ url: '/promotion/bargain-activity/delete?id=' + id })
|
return await request.delete({ url: '/promotion/bargain-activity/delete?id=' + id })
|
||||||
|
@ -55,6 +55,11 @@ export const updateCombinationActivity = async (data: CombinationActivityVO) =>
|
|||||||
return await request.put({ url: '/promotion/combination-activity/update', data })
|
return await request.put({ url: '/promotion/combination-activity/update', data })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 关闭拼团活动
|
||||||
|
export const closeCombinationActivity = async (id: number) => {
|
||||||
|
return await request.put({ url: '/promotion/bargain-combination/close?id=' + id })
|
||||||
|
}
|
||||||
|
|
||||||
// 删除拼团活动
|
// 删除拼团活动
|
||||||
export const deleteCombinationActivity = async (id: number) => {
|
export const deleteCombinationActivity = async (id: number) => {
|
||||||
return await request.delete({ url: '/promotion/combination-activity/delete?id=' + id })
|
return await request.delete({ url: '/promotion/combination-activity/delete?id=' + id })
|
||||||
|
@ -149,7 +149,6 @@ import * as BargainActivityApi from '@/api/mall/promotion/bargain/bargainActivit
|
|||||||
import BargainActivityForm from './BargainActivityForm.vue'
|
import BargainActivityForm from './BargainActivityForm.vue'
|
||||||
import { formatDate } from '@/utils/formatTime'
|
import { formatDate } from '@/utils/formatTime'
|
||||||
import { fenToYuanFormat } from '@/utils/formatter'
|
import { fenToYuanFormat } from '@/utils/formatter'
|
||||||
import { fenToYuan } from '@/utils'
|
|
||||||
|
|
||||||
defineOptions({ name: 'PromotionBargainActivity' })
|
defineOptions({ name: 'PromotionBargainActivity' })
|
||||||
|
|
||||||
@ -203,7 +202,7 @@ const openForm = (type: string, id?: number) => {
|
|||||||
const handleClose = async (id: number) => {
|
const handleClose = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
// 关闭的二次确认
|
// 关闭的二次确认
|
||||||
await message.confirm('确认关闭该秒杀活动吗?')
|
await message.confirm('确认关闭该砍价活动吗?')
|
||||||
// 发起关闭
|
// 发起关闭
|
||||||
await BargainActivityApi.closeSeckillActivity(id)
|
await BargainActivityApi.closeSeckillActivity(id)
|
||||||
message.success('关闭成功')
|
message.success('关闭成功')
|
||||||
@ -218,7 +217,7 @@ const handleDelete = async (id: number) => {
|
|||||||
// 删除的二次确认
|
// 删除的二次确认
|
||||||
await message.delConfirm()
|
await message.delConfirm()
|
||||||
// 发起删除
|
// 发起删除
|
||||||
await BargainActivityApi.deleteBargainActivity(id)
|
await BargainActivityApi.closeBargainActivity(id)
|
||||||
message.success(t('common.delSuccess'))
|
message.success(t('common.delSuccess'))
|
||||||
// 刷新列表
|
// 刷新列表
|
||||||
await getList()
|
await getList()
|
||||||
|
@ -114,32 +114,6 @@ const crudSchemas = reactive<CrudSchema[]>([
|
|||||||
value: 0
|
value: 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: '购买人数',
|
|
||||||
field: 'userSize',
|
|
||||||
isSearch: false,
|
|
||||||
isForm: false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '开团组数',
|
|
||||||
field: 'totalCount',
|
|
||||||
isSearch: false,
|
|
||||||
isForm: false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '成团组数',
|
|
||||||
field: 'successCount',
|
|
||||||
isSearch: false,
|
|
||||||
isForm: false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '活动状态',
|
|
||||||
field: 'status',
|
|
||||||
dictType: DICT_TYPE.COMMON_STATUS,
|
|
||||||
dictClass: 'number',
|
|
||||||
isSearch: true,
|
|
||||||
isForm: false
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: '拼团商品',
|
label: '拼团商品',
|
||||||
field: 'spuId',
|
field: 'spuId',
|
||||||
@ -149,11 +123,6 @@ const crudSchemas = reactive<CrudSchema[]>([
|
|||||||
span: 24
|
span: 24
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '操作',
|
|
||||||
field: 'action',
|
|
||||||
isForm: false
|
|
||||||
}
|
}
|
||||||
])
|
])
|
||||||
export const { allSchemas } = useCrudSchemas(crudSchemas)
|
export const { allSchemas } = useCrudSchemas(crudSchemas)
|
||||||
|
@ -1,91 +1,194 @@
|
|||||||
<template>
|
<template>
|
||||||
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
|
|
||||||
|
|
||||||
<!-- 搜索工作栏 -->
|
|
||||||
<ContentWrap>
|
<ContentWrap>
|
||||||
<Search :schema="allSchemas.searchSchema" @reset="setSearchParams" @search="setSearchParams">
|
<!-- 搜索工作栏 -->
|
||||||
<!-- 新增等操作按钮 -->
|
<el-form
|
||||||
<template #actionMore>
|
class="-mb-15px"
|
||||||
<el-button
|
:model="queryParams"
|
||||||
v-hasPermi="['promotion:combination-activity:create']"
|
ref="queryFormRef"
|
||||||
plain
|
:inline="true"
|
||||||
type="primary"
|
label-width="68px"
|
||||||
@click="openForm('create')"
|
>
|
||||||
|
<el-form-item label="活动名称" prop="name">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.name"
|
||||||
|
placeholder="请输入活动名称"
|
||||||
|
clearable
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
class="!w-240px"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="活动状态" prop="status">
|
||||||
|
<el-select
|
||||||
|
v-model="queryParams.status"
|
||||||
|
placeholder="请选择活动状态"
|
||||||
|
clearable
|
||||||
|
class="!w-240px"
|
||||||
>
|
>
|
||||||
<Icon class="mr-5px" icon="ep:plus" /> 新增
|
<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>
|
||||||
|
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||||
|
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
@click="openForm('create')"
|
||||||
|
v-hasPermi="['promotion:combination-activity:create']"
|
||||||
|
>
|
||||||
|
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</el-form-item>
|
||||||
</Search>
|
</el-form>
|
||||||
</ContentWrap>
|
</ContentWrap>
|
||||||
|
|
||||||
<!-- 列表 -->
|
<!-- 列表 -->
|
||||||
<ContentWrap>
|
<ContentWrap>
|
||||||
<Table
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||||
v-model:currentPage="tableObject.currentPage"
|
<el-table-column label="活动编号" prop="id" min-width="80" />
|
||||||
v-model:pageSize="tableObject.pageSize"
|
<el-table-column label="活动名称" prop="name" min-width="140" />
|
||||||
:columns="allSchemas.tableColumns"
|
<el-table-column label="活动时间" min-width="210">
|
||||||
:data="tableObject.tableList"
|
<template #default="scope">
|
||||||
:loading="tableObject.loading"
|
{{ formatDate(scope.row.startTime, 'YYYY-MM-DD') }}
|
||||||
:pagination="{
|
~ {{ formatDate(scope.row.endTime, 'YYYY-MM-DD') }}
|
||||||
total: tableObject.total
|
</template>
|
||||||
}"
|
</el-table-column>
|
||||||
>
|
<el-table-column label="商品图片" prop="spuName" min-width="80">
|
||||||
<template #spuId="{ row }">
|
<template #default="scope">
|
||||||
<el-image
|
<el-image
|
||||||
:src="row.picUrl"
|
:src="scope.row.picUrl"
|
||||||
class="mr-5px h-30px w-30px align-middle"
|
class="h-40px w-40px"
|
||||||
@click="imagePreview(row.picUrl)"
|
:preview-src-list="[scope.row.picUrl]"
|
||||||
/>
|
preview-teleported
|
||||||
<span class="align-middle">{{ row.spuName }}</span>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<template #action="{ row }">
|
</el-table-column>
|
||||||
<el-button
|
<el-table-column label="商品标题" prop="spuName" min-width="300" />
|
||||||
v-hasPermi="['promotion:combination-activity:update']"
|
<el-table-column
|
||||||
link
|
label="原价"
|
||||||
type="primary"
|
prop="combinationFirstPrice"
|
||||||
@click="openForm('update', row.id)"
|
min-width="100"
|
||||||
>
|
:formatter="fenToYuanFormat"
|
||||||
编辑
|
/>
|
||||||
</el-button>
|
<el-table-column
|
||||||
<el-button
|
label="拼团价"
|
||||||
v-hasPermi="['promotion:combination-activity:delete']"
|
prop="combinationMinPrice"
|
||||||
link
|
min-width="100"
|
||||||
type="danger"
|
:formatter="fenToYuanFormat"
|
||||||
@click="handleDelete(row.id)"
|
/>
|
||||||
>
|
<el-table-column label="拼团人数" prop="recordUserCount" min-width="100" />
|
||||||
删除
|
<el-table-column label="参与人数" prop="recordSuccessUserCount" min-width="110" />
|
||||||
</el-button>
|
<el-table-column label="成团人数" prop="helpUserCount" min-width="100" />
|
||||||
</template>
|
<el-table-column label="活动状态" align="center" prop="status" min-width="100">
|
||||||
</Table>
|
<template #default="scope">
|
||||||
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="库存" align="center" prop="stock" min-width="80" />
|
||||||
|
<el-table-column label="总库存" align="center" prop="totalStock" min-width="80" />
|
||||||
|
<el-table-column
|
||||||
|
label="创建时间"
|
||||||
|
align="center"
|
||||||
|
prop="createTime"
|
||||||
|
:formatter="dateFormatter"
|
||||||
|
width="180px"
|
||||||
|
/>
|
||||||
|
<el-table-column label="操作" align="center" width="150px" fixed="right">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-button
|
||||||
|
link
|
||||||
|
type="primary"
|
||||||
|
@click="openForm('update', scope.row.id)"
|
||||||
|
v-hasPermi="['promotion:combination-activity:update']"
|
||||||
|
>
|
||||||
|
编辑
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
link
|
||||||
|
type="danger"
|
||||||
|
@click="handleClose(scope.row.id)"
|
||||||
|
v-if="scope.row.status === 0"
|
||||||
|
v-hasPermi="['promotion:combination-activity:close']"
|
||||||
|
>
|
||||||
|
关闭
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
link
|
||||||
|
type="danger"
|
||||||
|
@click="handleDelete(scope.row.id)"
|
||||||
|
v-else
|
||||||
|
v-hasPermi="['promotion:combination-activity:delete']"
|
||||||
|
>
|
||||||
|
删除
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!-- 分页 -->
|
||||||
|
<Pagination
|
||||||
|
:total="total"
|
||||||
|
v-model:page="queryParams.pageNo"
|
||||||
|
v-model:limit="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
</ContentWrap>
|
</ContentWrap>
|
||||||
|
|
||||||
<!-- 表单弹窗:添加/修改 -->
|
<!-- 表单弹窗:添加/修改 -->
|
||||||
<CombinationActivityForm ref="formRef" @success="getList" />
|
<CombinationActivityForm ref="formRef" @success="getList" />
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup>
|
|
||||||
import { allSchemas } from './combinationActivity.data'
|
<script setup lang="ts">
|
||||||
|
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||||
|
import { dateFormatter } from '@/utils/formatTime'
|
||||||
import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
|
import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
|
||||||
import CombinationActivityForm from './CombinationActivityForm.vue'
|
import CombinationActivityForm from './CombinationActivityForm.vue'
|
||||||
import { sortTableColumns } from '@/hooks/web/useCrudSchemas'
|
import { formatDate } from '@/utils/formatTime'
|
||||||
import { createImageViewer } from '@/components/ImageViewer'
|
import { fenToYuanFormat } from '@/utils/formatter'
|
||||||
|
|
||||||
defineOptions({ name: 'PromotionCombinationActivity' })
|
defineOptions({ name: 'PromotionBargainActivity' })
|
||||||
|
|
||||||
// tableObject:表格的属性对象,可获得分页大小、条数等属性
|
const message = useMessage() // 消息弹窗
|
||||||
// tableMethods:表格的操作对象,可进行获得分页、删除记录等操作
|
const { t } = useI18n() // 国际化
|
||||||
// 详细可见:https://doc.iocoder.cn/vue3/crud-schema/
|
|
||||||
const { tableObject, tableMethods } = useTable({
|
const loading = ref(true) // 列表的加载中
|
||||||
getListApi: CombinationActivityApi.getCombinationActivityPage, // 分页接口
|
const total = ref(0) // 列表的总页数
|
||||||
delListApi: CombinationActivityApi.deleteCombinationActivity // 删除接口
|
const list = ref([]) // 列表的数据
|
||||||
|
const queryParams = reactive({
|
||||||
|
pageNo: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
name: null,
|
||||||
|
status: null
|
||||||
})
|
})
|
||||||
// 获得表格的各种操作
|
const queryFormRef = ref() // 搜索的表单
|
||||||
const { getList, setSearchParams } = tableMethods
|
const exportLoading = ref(false) // 导出的加载中
|
||||||
|
|
||||||
/** 商品图预览 */
|
/** 查询列表 */
|
||||||
const imagePreview = (imgUrl: string) => {
|
const getList = async () => {
|
||||||
createImageViewer({
|
loading.value = true
|
||||||
urlList: [imgUrl]
|
try {
|
||||||
})
|
const data = await CombinationActivityApi.getCombinationActivityPage(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()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 添加/修改操作 */
|
/** 添加/修改操作 */
|
||||||
@ -94,15 +197,35 @@ const openForm = (type: string, id?: number) => {
|
|||||||
formRef.value.open(type, id)
|
formRef.value.open(type, id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO 芋艿:这里要改下
|
||||||
|
/** 关闭按钮操作 */
|
||||||
|
const handleClose = async (id: number) => {
|
||||||
|
try {
|
||||||
|
// 关闭的二次确认
|
||||||
|
await message.confirm('确认关闭该秒杀活动吗?')
|
||||||
|
// 发起关闭
|
||||||
|
await CombinationActivityApi.closeCombinationActivity(id)
|
||||||
|
message.success('关闭成功')
|
||||||
|
// 刷新列表
|
||||||
|
await getList()
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
const handleDelete = (id: number) => {
|
const handleDelete = async (id: number) => {
|
||||||
tableMethods.delList(id, false)
|
try {
|
||||||
|
// 删除的二次确认
|
||||||
|
await message.delConfirm()
|
||||||
|
// 发起删除
|
||||||
|
await CombinationActivityApi.deleteCombinationActivity(id)
|
||||||
|
message.success(t('common.delSuccess'))
|
||||||
|
// 刷新列表
|
||||||
|
await getList()
|
||||||
|
} catch {}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 初始化 **/
|
/** 初始化 **/
|
||||||
onMounted(() => {
|
onMounted(async () => {
|
||||||
// 获得活动列表
|
await getList()
|
||||||
sortTableColumns(allSchemas.tableColumns, 'spuId')
|
|
||||||
getList()
|
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
Reference in New Issue
Block a user