From 2bc7d6bb5cfd9ed2034f2f616366d69e226c4d5d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 14 九月 2024 15:51:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/marketing/coupon/activity/index.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/pages/marketing/coupon/activity/index.vue b/pages/marketing/coupon/activity/index.vue
index e9564a1..265bbb3 100644
--- a/pages/marketing/coupon/activity/index.vue
+++ b/pages/marketing/coupon/activity/index.vue
@@ -63,6 +63,7 @@
formatter: getActivityEffectiveTime,
minWidth: 320,
},
+ { label: '领取渠道', prop: 'getTypeName', minWidth: 120 },
{ label: '已领取总数', prop: 'getNum', minWidth: 150 },
{ label: '剩余未领取总数', prop: 'unGetNum', minWidth: 150 },
{ label: '状态', prop: 'statusName', minWidth: 120 },
@@ -99,8 +100,19 @@
searchForm: [
{
type: 'row',
- items: [...couponSearchForm()],
+ items: [...couponSearchForm(),
+ {
+ label: '领取渠道：',
+ id: 'getType',
+ type: 'bus-select-dict',
+ el: {
+ code: 'COUPON_GET_TYPE',
+ style: 'width:100%',
+ },
+ },
+ ],
},
+
],
form: [
...couponForm(),
--
Gitblit v1.9.3