From 7f177f5915a1dbdf8ad6cd840b4d7408b9f3598f Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 14 九月 2024 15:16:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/marketing/coupon/activity/index.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/pages/marketing/coupon/activity/index.vue b/pages/marketing/coupon/activity/index.vue
index 1dd3278..f534a7a 100644
--- a/pages/marketing/coupon/activity/index.vue
+++ b/pages/marketing/coupon/activity/index.vue
@@ -53,9 +53,11 @@
formatter: getActivityEffectiveTime,
minWidth: 320,
},
+ { label: '领取渠道', prop: 'getTypeName', minWidth: 120 },
{ label: '已领取总数', prop: 'getNum', minWidth: 150 },
{ label: '剩余未领取总数', prop: 'unGetNum', minWidth: 150 },
{ label: '状态', prop: 'statusName', minWidth: 120 },
+ { label: '领取渠道', prop: 'getTypeName', minWidth: 120 },
{ label: '操作人', prop: 'createByName', minWidth: 120 },
],
// 页面上要到分，后端要传到秒
@@ -88,8 +90,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(),
@@ -165,6 +178,7 @@
el: {
inputAttrs: {
min: 1,
+ max: 99999999,
precision: 0,
controls: false,
},
@@ -182,6 +196,7 @@
el: {
precision: 0,
min: 1,
+ max: 99999999,
controls: false,
},
unit: '张',
@@ -198,6 +213,7 @@
el: {
precision: 0,
min: 1,
+ max: 99999999,
controls: false,
},
unit: '张',
--
Gitblit v1.9.3