From aa6eb520b269743c4e003a897119171b61ff0e74 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 九月 2024 10:47:56 +0800
Subject: [PATCH] add:”地址“模糊搜索查询订单

---
 pages/marketing/point-mall/point-distribution.vue |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/pages/marketing/point-mall/point-distribution.vue b/pages/marketing/point-mall/point-distribution.vue
index 640f3d9..8406679 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,
@@ -29,10 +31,13 @@
           { label: '用户信息', prop: 'customerName' },
           { 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),
           },
@@ -59,6 +64,7 @@
                 el: {
                   precision: 0,
                   min: 1,
+                  max: 99999999,
                   controls: false,
                 },
                 rules: {
@@ -110,6 +116,7 @@
                 el: {
                   precision: 0,
                   min: 1,
+                  max: 99999999,
                   controls: false,
                 },
                 rules: {
@@ -151,6 +158,7 @@
           {
             text: '积分变动记录',
             atClick: (row) => {
+              this.dialogId = uuidv4()
               this.customerId = row.customerId
               this.dialogVisible = true
             },

--
Gitblit v1.9.3