feat: add remaining rights range filter and reset functionality

- Introduced a new filter for remaining rights range in the member portrait dialog and query input DTO. - Implemented a resetData method to clear all data when switching members to prevent displaying stale information. - Updated the fetchData method to clear lists upon member change. - Enhanced the LqKhxxService to handle remaining rights range in queries. - Improved the layout of the search form in the lqKhxx view for better usability.

feat: add remaining rights range filter and reset functionality
- Introduced a new filter for remaining rights range in the member portrait dialog and query input DTO. - Implemented a resetData method to clear all data when switching members to prevent displaying stale information. - Updated the fetchData method to clear lists upon member change. - Enhanced the LqKhxxService to handle remaining rights range in queries. - Improved the layout of the search form in the lqKhxx view for better usability.
“wangming”
1 parent 5652f5e0
Showing 5 changed files with 139 additions and 7 deletions
antis-ncc-admin/src/components/member-portrait-dialog.vue
antis-ncc-admin/src/views/lqKhxx/index.vue
docs/美业系统升级项目需求拆分表.xlsx
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
@@ -431,12 +431,35 @@ export default {
     }
   },
   methods: {
+    /** 重置所有数据，避免二次进入时显示旧数据 */
+    resetData() {
+      this.baseInfo = {}
+      this.behaviorSummary = {}
+      this.remainingItems = []
+      this.monthlyTrend = []
+      this.consumptionAnalysis = null
+      this.billingList = []
+      this.billingPagination = { pageIndex: 1, pageSize: 10, total: 0 }
+      this.consumeList = []
+      this.consumePagination = { pageIndex: 1, pageSize: 10, total: 0 }
+      this.refundList = []
+      this.refundPagination = { pageIndex: 1, pageSize: 10, total: 0 }
+      this.activeTab = 'overview'
+    },
     async fetchData() {
       if (!this.memberId) {
         this.$message.warning('会员ID不能为空')
         return
       }
+      // 切换会员时清空列表数据，避免显示上一次的列表
+      this.billingList = []
+      this.billingPagination = { pageIndex: 1, pageSize: 10, total: 0 }
+      this.consumeList = []
+      this.consumePagination = { pageIndex: 1, pageSize: 10, total: 0 }
+      this.refundList = []
+      this.refundPagination = { pageIndex: 1, pageSize: 10, total: 0 }
+
       this.loading = true
       try {
         const res = await request({
@@ -715,6 +738,7 @@ export default {
         this.trendChart.dispose()
         this.trendChart = null
       }
+      this.resetData()
       this.$emit('update:visible', false)
       this.$emit('closed')
     }
-<template>
+<template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
 			<!-- 现代化筛选卡片 -->
@@ -80,7 +80,7 @@
 							</el-col>
 						</el-row>
 						<el-row :gutter="16" class="search-row search-row-3">
-							<el-col :span="5">
+							<el-col :span="6">
 								<el-form-item label="进店渠道">
 									<el-select v-model="query.jdqd" placeholder="请选择渠道" clearable filterable
 										style="width: 100%">
@@ -89,7 +89,7 @@
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="5">
+							<el-col :span="6">
 								<el-form-item label="沉睡天数">
 									<el-select v-model="query.sleepDaysRange" placeholder="请选择天数范围" clearable
 										style="width: 100%">
@@ -98,7 +98,18 @@
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="5">
+							<el-col :span="6">
+								<el-form-item label="剩余权益">
+									<div class="remaining-rights-range">
+										<el-input v-model.number="query.remainingRightsMin" placeholder="最小(元)"
+											type="number" clearable style="flex: 1" />
+										<span class="range-sep">-</span>
+										<el-input v-model.number="query.remainingRightsMax" placeholder="最大(元)"
+											type="number" clearable style="flex: 1" />
+									</div>
+								</el-form-item>
+							</el-col>
+							<el-col :span="6">
 								<el-form-item label="注册时间">
 									<el-date-picker v-model="query.zcsj" type="daterange" value-format="timestamp"
 										format="yyyy-MM-dd" start-placeholder="开始" end-placeholder="结束"
@@ -106,7 +117,9 @@
 									</el-date-picker>
 								</el-form-item>
 							</el-col>
-							<el-col :span="5">
+						</el-row>
+						<el-row :gutter="16" class="search-row search-row-4">
+							<el-col :span="6">
 								<el-form-item label="出生日期">
 									<el-date-picker v-model="query.yanglsr" type="daterange" value-format="timestamp"
 										format="yyyy-MM-dd" start-placeholder="开始" end-placeholder="结束"
@@ -528,6 +541,8 @@ export default {
 				ml: undefined,
 				consumeLevel: undefined, // 消费等级
 				sleepDaysRange: undefined, // 沉睡天数范围
+				remainingRightsMin: undefined, // 剩余权益最小值(元)
+				remainingRightsMax: undefined, // 剩余权益最大值(元)
 			},
 			list: [],
 			listLoading: true,
@@ -745,6 +760,15 @@ export default {
 				}
 			}
+			// 组装剩余权益范围为 "min,max" 格式（支持自定义输入）
+			const hasMin = _query.remainingRightsMin != null && _query.remainingRightsMin !== ''
+			const hasMax = _query.remainingRightsMax != null && _query.remainingRightsMax !== ''
+			if (hasMin || hasMax) {
+				const min = hasMin ? Number(_query.remainingRightsMin) : 0
+				const max = hasMax ? Number(_query.remainingRightsMax) : 999999999
+				_query.remainingRightsRange = `${min},${max}`
+			}
+
 			let query = {}
 			for (let key in _query) {
 				if (Array.isArray(_query[key])) {
@@ -837,6 +861,15 @@ export default {
 				}
 			}
+			// 组装剩余权益范围为 "min,max" 格式（支持自定义输入）
+			const hasMin = query.remainingRightsMin != null && query.remainingRightsMin !== ''
+			const hasMax = query.remainingRightsMax != null && query.remainingRightsMax !== ''
+			if (hasMin || hasMax) {
+				const min = hasMin ? Number(query.remainingRightsMin) : 0
+				const max = hasMax ? Number(query.remainingRightsMax) : 999999999
+				query.remainingRightsRange = `${min},${max}`
+			}
+
 			request({
 				url: `/api/Extend/LqKhxx/Actions/Export`,
 				method: 'GET',
@@ -860,6 +893,15 @@ export default {
 				}
 			}
+			// 组装剩余权益范围为 "min,max" 格式（支持自定义输入）
+			const hasMinExp = query.remainingRightsMin != null && query.remainingRightsMin !== ''
+			const hasMaxExp = query.remainingRightsMax != null && query.remainingRightsMax !== ''
+			if (hasMinExp || hasMaxExp) {
+				const min = hasMinExp ? Number(query.remainingRightsMin) : 0
+				const max = hasMaxExp ? Number(query.remainingRightsMax) : 999999999
+				query.remainingRightsRange = `${min},${max}`
+			}
+
 			// 处理数组参数
 			let exportQuery = {}
 			for (let key in query) {
@@ -2290,6 +2332,7 @@ export default {
 	.search-row {
 		margin-bottom: 0;
 		transition: margin 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+		row-gap: 16px;
 		.el-col {
 			display: flex;
@@ -2373,6 +2416,7 @@ export default {
 			opacity: 1;
 			transform: translateY(0);
 			margin-bottom: 16px;
+			row-gap: 16px;
 			&:last-child {
 				margin-bottom: 0;
@@ -2575,6 +2619,23 @@ export default {
 		}
 	}
+	.remaining-rights-range {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+		width: 100%;
+
+		.range-sep {
+			color: #909399;
+			font-size: 14px;
+			flex-shrink: 0;
+		}
+
+		::v-deep .el-input__inner {
+			text-align: center;
+		}
+	}
+
 	.search-actions-inline {
 		display: flex;
 		align-items: center;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NCC.Common.Filter;
 namespace NCC.Extend.Entitys.Dto.LqKhxx
@@ -129,6 +129,11 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public string SleepDaysRange { get; set; }
         /// <summary>
+        /// 剩余权益范围(格式: "最小值,最大值"，单位：元)
+        /// </summary>
+        public string RemainingRightsRange { get; set; }
+
+        /// <summary>
         /// 主健康师
         /// </summary>
         public string mainHealthUser { get; set; }
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -140,6 +140,18 @@ namespace NCC.Extend.LqKhxx
                 minSleepDays = min;
                 maxSleepDays = max;
             }
+
+            // 处理剩余权益范围
+            List<string> queryRemainingRightsRange = input.RemainingRightsRange != null ? input.RemainingRightsRange.Split(',').ToObeject<List<string>>() : null;
+            decimal? minRemainingRights = null;
+            decimal? maxRemainingRights = null;
+            if (queryRemainingRightsRange != null && queryRemainingRightsRange.Count >= 2)
+            {
+                decimal.TryParse(queryRemainingRightsRange[0], out decimal min);
+                decimal.TryParse(queryRemainingRightsRange[1], out decimal max);
+                minRemainingRights = min;
+                maxRemainingRights = max;
+            }
             var data = await _db.Queryable<LqKhxxEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.keyWord), p => p.Khmc.Contains(input.keyWord) || p.Sjh.Contains(input.keyWord) || p.Dah.Contains(input.keyWord))
@@ -164,6 +176,8 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(input.ConsumeLevel.HasValue, p => p.ConsumeLevel == input.ConsumeLevel.Value)
                 .WhereIF(minSleepDays.HasValue, p => p.SleepDays >= minSleepDays.Value)
                 .WhereIF(maxSleepDays.HasValue, p => p.SleepDays <= maxSleepDays.Value)
+                .WhereIF(minRemainingRights.HasValue, p => p.RemainingRightsAmount >= minRemainingRights.Value)
+                .WhereIF(maxRemainingRights.HasValue, p => p.RemainingRightsAmount <= maxRemainingRights.Value)
                 .WhereIF(queryZcsj != null, p => p.CreateTime >= new DateTime(startZcsj.ToDate().Year, startZcsj.ToDate().Month, startZcsj.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryZcsj != null, p => p.CreateTime <= new DateTime(endZcsj.ToDate().Year, endZcsj.ToDate().Month, endZcsj.ToDate().Day, 23, 59, 59))
                 .Select(it => new LqKhxxListOutput
@@ -285,6 +299,18 @@ namespace NCC.Extend.LqKhxx
                 minSleepDays = min;
                 maxSleepDays = max;
             }
+
+            // 处理剩余权益范围
+            List<string> queryRemainingRightsRange = input.RemainingRightsRange != null ? input.RemainingRightsRange.Split(',').ToObeject<List<string>>() : null;
+            decimal? minRemainingRights = null;
+            decimal? maxRemainingRights = null;
+            if (queryRemainingRightsRange != null && queryRemainingRightsRange.Count >= 2)
+            {
+                decimal.TryParse(queryRemainingRightsRange[0], out decimal min);
+                decimal.TryParse(queryRemainingRightsRange[1], out decimal max);
+                minRemainingRights = min;
+                maxRemainingRights = max;
+            }
             var data = await _db.Queryable<LqKhxxEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
@@ -308,6 +334,8 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(input.ConsumeLevel.HasValue, p => p.ConsumeLevel == input.ConsumeLevel.Value)
                 .WhereIF(minSleepDays.HasValue, p => p.SleepDays >= minSleepDays.Value)
                 .WhereIF(maxSleepDays.HasValue, p => p.SleepDays <= maxSleepDays.Value)
+                .WhereIF(minRemainingRights.HasValue, p => p.RemainingRightsAmount >= minRemainingRights.Value)
+                .WhereIF(maxRemainingRights.HasValue, p => p.RemainingRightsAmount <= maxRemainingRights.Value)
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
                 .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
@@ -682,6 +710,18 @@ namespace NCC.Extend.LqKhxx
                 maxSleepDays = max;
             }
+            // 处理剩余权益范围
+            List<string> queryRemainingRightsRange = input.RemainingRightsRange != null ? input.RemainingRightsRange.Split(',').ToObeject<List<string>>() : null;
+            decimal? minRemainingRights = null;
+            decimal? maxRemainingRights = null;
+            if (queryRemainingRightsRange != null && queryRemainingRightsRange.Count >= 2)
+            {
+                decimal.TryParse(queryRemainingRightsRange[0], out decimal min);
+                decimal.TryParse(queryRemainingRightsRange[1], out decimal max);
+                minRemainingRights = min;
+                maxRemainingRights = max;
+            }
+
             // 先查询客户基础数据（使用子查询方式，类似GetNoPagingList，但优化为批量查询关联数据）
             var customerList = await _db.Queryable<LqKhxxEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
@@ -704,6 +744,8 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(input.ConsumeLevel.HasValue, p => p.ConsumeLevel == input.ConsumeLevel.Value)
                 .WhereIF(minSleepDays.HasValue, p => p.SleepDays >= minSleepDays.Value)
                 .WhereIF(maxSleepDays.HasValue, p => p.SleepDays <= maxSleepDays.Value)
+                .WhereIF(minRemainingRights.HasValue, p => p.RemainingRightsAmount >= minRemainingRights.Value)
+                .WhereIF(maxRemainingRights.HasValue, p => p.RemainingRightsAmount <= maxRemainingRights.Value)
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))