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/point-distribution.vue | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/pages/marketing/point-mall/point-distribution.vue b/pages/marketing/point-mall/point-distribution.vue
index 640f3d9..29925c8 100644
--- a/pages/marketing/point-mall/point-distribution.vue
+++ b/pages/marketing/point-mall/point-distribution.vue
@@ -4,7 +4,7 @@
<el-dialog title="积分变动记录" :visible.sync="dialogVisible" width="80%">
<el-bus-crud
v-if="customerId"
- :key="customerId"
+ :key="dialogId"
:extra-query="{ customerId }"
v-bind="recordTableConfig"
/>
@@ -13,11 +13,13 @@
</template>
<script>
+import { v4 as uuidv4 } from 'uuid'
export default {
data() {
return {
dialogVisible: false,
customerId: null,
+ dialogId: null,
tableConfig: {
url: 'flower/api/customer/point/page',
hasNew: false,
@@ -27,12 +29,16 @@
columns: [
{ label: '序号', type: 'index' },
{ label: '用户信息', prop: 'customerName' },
+ { label: '联系方式', prop: 'customerTel' },
{ label: '总积分', prop: 'totalPoint' },
{ label: '已使用积分', prop: 'usedPoint' },
+ { label: '过期积分', prop: 'expiredPoint' },
+ { label: '扣减积分', formatter: (row) => row.deductionPoint ?? 0 },
{
label: '剩余积分',
formatter: (row) =>
parseInt(row.totalPoint) -
+ parseInt(row.deductionPoint ?? 0) -
parseInt(row.usedPoint) -
parseInt(row.expiredPoint),
},
@@ -40,7 +46,10 @@
searchForm: [
{
type: 'row',
- items: [{ label: '用户名称', id: 'customerName', type: 'input' }],
+ items: [
+ { label: '用户名称', id: 'customerName', type: 'input' },
+ { label: '联系方式', id: 'customerTel', type: 'input' },
+ ],
},
],
extraDialogs: [
@@ -59,6 +68,7 @@
el: {
precision: 0,
min: 1,
+ max: 99999999,
controls: false,
},
rules: {
@@ -110,6 +120,7 @@
el: {
precision: 0,
min: 1,
+ max: 99999999,
controls: false,
},
rules: {
@@ -151,6 +162,7 @@
{
text: '积分变动记录',
atClick: (row) => {
+ this.dialogId = uuidv4()
this.customerId = row.customerId
this.dialogVisible = true
},
--
Gitblit v1.9.3