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/order/after-sale/index.vue | 3 ++-
pages/marketing/point-mall/coupon/index.vue | 16 +++++++++++++---
pages/order/after-sale/_action/_id.vue | 3 ++-
pages/marketing/point-mall/coupon/_id.vue | 4 +++-
pages/marketing/point-mall/goods.vue | 12 ++++++++++--
5 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/pages/marketing/point-mall/coupon/_id.vue b/pages/marketing/point-mall/coupon/_id.vue
index 9b63a71..6d0e8a1 100644
--- a/pages/marketing/point-mall/coupon/_id.vue
+++ b/pages/marketing/point-mall/coupon/_id.vue
@@ -41,7 +41,9 @@
return `${row.usageTimeNum}${row.usageTimeTypeName}`
},
},
- { label: '库存：', id: 'couponAmount' },
+ { label: '发放数量：', id: 'couponAmount' },
+ { label: '已兑换：', id: 'getNum' },
+ { label: '库存：', id: 'unGetNum' },
{ label: '积分数量：', id: 'point' },
],
},
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: '积分数量：',
diff --git a/pages/marketing/point-mall/goods.vue b/pages/marketing/point-mall/goods.vue
index 3c7e751..3fc5758 100644
--- a/pages/marketing/point-mall/goods.vue
+++ b/pages/marketing/point-mall/goods.vue
@@ -86,7 +86,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: '商品图片：',
@@ -126,7 +134,7 @@
extraButtons: [
{
text: '上架',
- show: (row) => row.status === 'I' && row.stock>0,
+ show: (row) => row.status === 'I' && row.stock > 0,
atClick: async (row) => {
try {
await this.$elBusUtil.confirm('确定要上架吗？')
diff --git a/pages/order/after-sale/_action/_id.vue b/pages/order/after-sale/_action/_id.vue
index 0a14faf..f478df7 100644
--- a/pages/order/after-sale/_action/_id.vue
+++ b/pages/order/after-sale/_action/_id.vue
@@ -124,7 +124,8 @@
{ label: '级别：', id: 'flowerLevelStr' },
{ label: '颜色：', id: 'flowerColor' },
{ label: '规格：', id: 'flowerUnit' },
- { label: '商品价格(元)：', id: 'price' },
+ { label: '原价(元)：', id: 'price' },
+ { label: '券后单价(元)：', id: 'realPrice' },
{ label: '供应商价格(元)：', id: 'supplierPrice' },
{ label: '合伙人加价(元)：', id: 'markupPartner' },
{ label: '申请数量：', id: 'num' },
diff --git a/pages/order/after-sale/index.vue b/pages/order/after-sale/index.vue
index ba62eb4..fa90fc6 100644
--- a/pages/order/after-sale/index.vue
+++ b/pages/order/after-sale/index.vue
@@ -120,7 +120,8 @@
items: [
{ label: '商品名称：', id: 'flowerName', type: 'input' },
{ label: '合伙人加价(元)：', id: 'markupPartner', type: 'input' },
- { label: '商品价格(元)：', id: 'price', type: 'input' },
+ { label: '原价(元)：', id: 'price', type: 'input' },
+ { label: '券后单价(元)：', id: 'realPrice', type: 'input' },
{ label: '供应商价格(元)：', id: 'supplierPrice', type: 'input' },
{ label: '商品数量：', id: 'flowerNum', type: 'input' },
{ label: '申请售后数量：', id: 'num', type: 'input' },
--
Gitblit v1.9.3