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 |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pages/marketing/point-mall/coupon/index.vue b/pages/marketing/point-mall/coupon/index.vue
index f9c55c8..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: [
@@ -69,7 +71,7 @@
             },
           },
           {
-            label: '库存:',
+            label: '发放数量:',
             id: 'couponAmount',
             type: 'input-number',
             el: {
@@ -78,7 +80,15 @@
               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: '积分数量:',

--
Gitblit v1.9.3