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
---
utils/coupon-form.js | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/utils/coupon-form.js b/utils/coupon-form.js
index cf3e885..49fa43e 100644
--- a/utils/coupon-form.js
+++ b/utils/coupon-form.js
@@ -55,6 +55,7 @@
type: 'input-number',
el: {
min: 0,
+ max: 99999999,
precision: 2,
controls: false,
},
@@ -73,6 +74,7 @@
type: 'input-number',
el: {
min: 0.01,
+ max: 99999999,
precision: 2,
controls: false,
},
@@ -144,18 +146,14 @@
}
// 优惠券领取/发放记录
-export const couponRecordColumn = () => {
+export const couponRecordColumn = (timeName) => {
return [
{ label: '序号', type: 'index' },
{ label: '店铺名称', prop: 'customerName' },
- { label: '优惠券类型', prop: 'couponDiscountTypeName' },
- {
- label: '使用条件',
- formatter: (row) => `满${row.minOrderAmount}`,
- },
- { label: '优惠券面值', prop: 'couponDiscountValue' },
+ { label: '联系方式', prop: 'tel' },
+ { label: timeName, prop: 'createTime' },
{ label: '状态', prop: 'statusName' },
- { label: '使用时间', prop: 'index' },
+ { label: '使用时间', prop: 'usedTime' },
{ label: '订单号', prop: 'orderNo' },
]
}
--
Gitblit v1.9.3