From ccd49727ee9faf36c004ce9460bd60bce758f017 Mon Sep 17 00:00:00 2001
From: mayf <m13160102112@163.com>
Date: 星期日, 22 九月 2024 21:56:34 +0800
Subject: [PATCH] 积分变动时间筛选 还原积分优惠券库存
---
pages/marketing/point-mall/coupon/index.vue | 10 ++++------
package.json | 2 +-
pages/marketing/point-mall/point-distribution.vue | 16 +++++++++++++++-
pages/marketing/point-mall/coupon/_id.vue | 4 +---
4 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/package.json b/package.json
index d0d17c3..f922b03 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "1.0.0",
"private": true,
"scripts": {
- "start": "cross-env NODE_APP_INSTANCE=dev NODE_ENV=development nuxt",
+ "start": "cross-env NODE_APP_INSTANCE=prod NODE_ENV=development nuxt",
"build:dev": "cross-env NODE_APP_INSTANCE=dev NODE_ENV=production nuxt build",
"build:prod": "cross-env NODE_APP_INSTANCE=prod NODE_ENV=production nuxt build",
"launch": "nuxt start",
diff --git a/pages/marketing/point-mall/coupon/_id.vue b/pages/marketing/point-mall/coupon/_id.vue
index 6d0e8a1..9b63a71 100644
--- a/pages/marketing/point-mall/coupon/_id.vue
+++ b/pages/marketing/point-mall/coupon/_id.vue
@@ -41,9 +41,7 @@
return `${row.usageTimeNum}${row.usageTimeTypeName}`
},
},
- { label: '发放数量：', id: 'couponAmount' },
- { label: '已兑换：', id: 'getNum' },
- { label: '库存：', id: 'unGetNum' },
+ { label: '库存：', id: 'couponAmount' },
{ label: '积分数量：', id: 'point' },
],
},
diff --git a/pages/marketing/point-mall/coupon/index.vue b/pages/marketing/point-mall/coupon/index.vue
index ffaf7d2..28008a5 100644
--- a/pages/marketing/point-mall/coupon/index.vue
+++ b/pages/marketing/point-mall/coupon/index.vue
@@ -38,9 +38,7 @@
},
...couponColumn(),
{ label: '状态', prop: 'statusName', minWidth: 120 },
- { label: '发放数量', prop: 'couponAmount', minWidth: 120 },
- { label: '已兑换', prop: 'getNum', minWidth: 120 },
- { label: '库存', prop: 'unGetNum', minWidth: 120 },
+ { label: '库存', prop: 'couponAmount', minWidth: 120 },
{ label: '所需积分', prop: 'point', minWidth: 120 },
],
searchForm: [
@@ -71,7 +69,7 @@
},
},
{
- label: '发放数量：',
+ label: '库存：',
id: 'couponAmount',
type: 'input-number',
el: {
@@ -81,11 +79,11 @@
controls: false,
},
rules: [
- { required: true, message: '请输入发放数量', trigger: 'blur' },
+ { required: true, message: '请输入库存', trigger: 'blur' },
{
type: 'number',
min: 1,
- message: '发放数量必须大于0',
+ message: '库存必须大于0',
trigger: 'blur',
},
],
diff --git a/pages/marketing/point-mall/point-distribution.vue b/pages/marketing/point-mall/point-distribution.vue
index 29925c8..52ea16f 100644
--- a/pages/marketing/point-mall/point-distribution.vue
+++ b/pages/marketing/point-mall/point-distribution.vue
@@ -193,7 +193,7 @@
{ label: '变动类型', prop: 'changeTypeStr' },
{ label: '变动积分', prop: 'point' },
{ label: '变动原因', prop: 'typeStr' },
- { label: '变动时间', prop: 'recordDate' },
+ { label: '变动时间', prop: 'createTime' },
{ label: '备注', prop: 'remarks' },
],
searchFormAttrs: {
@@ -217,6 +217,20 @@
span: 24,
},
{
+ label: '变动时间：',
+ id: 'createTimeStartStr',
+ component: 'el-bus-date-range',
+ el: {
+ type: 'datetime',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ valueFormat: 'yyyy-MM-dd HH:mm:ss',
+ },
+ commonFormat: true,
+ commonFormatProps: ['createTimeStartStr', 'createTimeEndStr'],
+ searchImmediately: true,
+ span: 24,
+ },
+ {
label: '备注：',
id: 'remarks',
type: 'input',
--
Gitblit v1.9.3