diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 55ffed3b..1fc0ab27 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -181,5 +181,6 @@ export enum DICT_TYPE {
PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
- PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status' // 砍价记录的状态
+ PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
+ PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status' // 拼团记录的状态
}
diff --git a/src/views/mall/promotion/combination/record/index.vue b/src/views/mall/promotion/combination/record/index.vue
index 08f92fd8..2f9b1ee4 100644
--- a/src/views/mall/promotion/combination/record/index.vue
+++ b/src/views/mall/promotion/combination/record/index.vue
@@ -65,44 +65,63 @@
-
-
-
- 时间段：
-
- 拼团状态：
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+ 重置
+
+
+
+
+
-
-
-
-
-
+
+
+
+ {{
+ row.headId ? pageList.find((item) => item.id === row.headId)?.nickname : row.nickname
+ }}
+
+
-
+
-
+
@@ -159,7 +181,6 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { createImageViewer } from '@/components/ImageViewer'
import * as CombinationRecordApi from '@/api/mall/promotion/combination/combinationRecord'
-import { TabsPaneContext } from 'element-plus'
defineOptions({ name: 'CombinationRecord' })
const queryParams = ref({
@@ -169,15 +190,16 @@ const queryParams = ref({
pageSize: 10,
pageNo: 1
})
+const queryFormRef = ref() // 搜索的表单
const loading = ref(true) // 列表的加载中
const total = ref(0) // 总记录数
-const pageList = ref([]) // 分页数据
+const pageList = ref([]) // 分页数据
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await CombinationRecordApi.getCombinationRecordPage(queryParams.value)
- pageList.value = data.list
+ pageList.value = data.list as CombinationRecordApi.CombinationRecordVO[]
total.value = data.total
} finally {
loading.value = false
@@ -193,64 +215,85 @@ const recordSummary = ref({
const getSummary = async () => {
recordSummary.value = await CombinationRecordApi.getCombinationRecordSummary()
}
-
-// tabs 数据
-const tabsData = ref([
+// 日期快捷选项
+const shortcuts = ref([
{
- count: 0,
- name: '全部',
- type: 'all',
- value: 0
- },
- {
- count: 0,
- name: '今天',
+ text: '今天',
type: 'toDay',
- value: 1
+ value: () => {
+ queryParams.value.dateType = 1
+ return new Date()
+ }
},
{
- count: 0,
- name: '昨天',
+ text: '昨天',
type: 'yesterday',
- value: 2
+ value: () => {
+ const date = new Date()
+ date.setTime(date.getTime() - 3600 * 1000 * 24)
+ queryParams.value.dateType = 2
+ return [date, date]
+ }
},
{
- count: 0,
- name: '最近七天',
+ text: '最近七天',
type: 'lastSevenDays',
- value: 3
+ value: () => {
+ const date = new Date()
+ date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+ queryParams.value.dateType = 3
+ return [date, new Date()]
+ }
},
{
- count: 0,
- name: '最近30天',
+ text: '最近30天',
type: 'last30Days',
- value: 4
+ value: () => {
+ const date = new Date()
+ date.setTime(date.getTime() - 3600 * 1000 * 24 * 30)
+ queryParams.value.dateType = 4
+ return [date, new Date()]
+ }
},
{
- count: 0,
- name: '本月',
+ text: '本月',
type: 'thisMonth',
- value: 5
+ value: () => {
+ const date = new Date()
+ date.setDate(1) // 设置为当前月的第一天
+ queryParams.value.dateType = 5
+ return [date, new Date()]
+ }
},
{
- count: 0,
- name: '今年',
+ text: '今年',
type: 'thisYear',
- value: 6
+ value: () => {
+ const date = new Date()
+ queryParams.value.dateType = 6
+ return [new Date(`${date.getFullYear()}-01-01`), date]
+ }
}
])
/** 获得每个 Tab 的数量 */
const getTabsCount = async () => {
const res = await CombinationRecordApi.getCombinationRecordCount()
- tabsData.value.forEach((tab) => {
- tab.count = res[tab.type]
+ shortcuts.value.forEach((tab) => {
+ tab.text += `(${res[tab.type]})`
})
}
-const handleTabClick = async (tab: TabsPaneContext) => {
- queryParams.value.dateType = tab.paneName as number
- await getList()
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ queryParams.value.pageNo = 1
+ getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
}
/** 商品图预览 */