From 3daca1ec45c99fb28a21dd5c94dc6172ca901415 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 22 九月 2024 17:23:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/marketing/point-mall/coupon/index.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/pages/marketing/point-mall/coupon/index.vue b/pages/marketing/point-mall/coupon/index.vue
index 0d6fcc3..ffaf7d2 100644
--- a/pages/marketing/point-mall/coupon/index.vue
+++ b/pages/marketing/point-mall/coupon/index.vue
@@ -38,7 +38,9 @@
},
...couponColumn(),
{ label: '状态', prop: 'statusName', minWidth: 120 },
- { label: '库存', prop: 'couponAmount', minWidth: 120 },
+ { label: '发放数量', prop: 'couponAmount', minWidth: 120 },
+ { label: '已兑换', prop: 'getNum', minWidth: 120 },
+ { label: '库存', prop: 'unGetNum', minWidth: 120 },
{ label: '所需积分', prop: 'point', minWidth: 120 },
],
searchForm: [
@@ -59,6 +61,7 @@
el: {
inputAttrs: {
min: 1,
+ max: 99999999,
precision: 0,
controls: false,
},
@@ -68,15 +71,24 @@
},
},
{
- label: '库存：',
+ label: '发放数量：',
id: 'couponAmount',
type: 'input-number',
el: {
precision: 0,
min: 0,
+ max: 99999999,
controls: false,
},
- rules: { required: true, message: '请输入库存', trigger: 'blur' },
+ rules: [
+ { required: true, message: '请输入发放数量', trigger: 'blur' },
+ {
+ type: 'number',
+ min: 1,
+ message: '发放数量必须大于0',
+ trigger: 'blur',
+ },
+ ],
},
{
label: '积分数量：',
@@ -85,6 +97,7 @@
el: {
precision: 0,
min: 1,
+ max: 99999999,
controls: false,
},
rules: {
@@ -98,7 +111,8 @@
{
text: '上架',
show: (row) =>
- row.status === 'inactive' || row.status === 'expired',
+ (row.status === 'inactive' || row.status === 'expired') &&
+ row.couponAmount > 0,
atClick: async (row) => {
try {
await this.$elBusUtil.confirm('确定要上架吗？')
--
Gitblit v1.9.3