From daa0b51b0b3609c683da3066c2815d3e9eb42b3f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:39:46 +0800
Subject: [PATCH] 1.订单管理的异常订单

---
 pages/marketing/point-mall/point-distribution.vue |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pages/marketing/point-mall/point-distribution.vue b/pages/marketing/point-mall/point-distribution.vue
index 1137570..52ea16f 100644
--- a/pages/marketing/point-mall/point-distribution.vue
+++ b/pages/marketing/point-mall/point-distribution.vue
@@ -29,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),
           },
@@ -42,7 +46,10 @@
         searchForm: [
           {
             type: 'row',
-            items: [{ label: '用户名称', id: 'customerName', type: 'input' }],
+            items: [
+              { label: '用户名称', id: 'customerName', type: 'input' },
+              { label: '联系方式', id: 'customerTel', type: 'input' },
+            ],
           },
         ],
         extraDialogs: [
@@ -186,7 +193,7 @@
           { label: '变动类型', prop: 'changeTypeStr' },
           { label: '变动积分', prop: 'point' },
           { label: '变动原因', prop: 'typeStr' },
-          { label: '变动时间', prop: 'recordDate' },
+          { label: '变动时间', prop: 'createTime' },
           { label: '备注', prop: 'remarks' },
         ],
         searchFormAttrs: {
@@ -210,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