From b3068671b4eab47d9cec1e7f2a763db247ea0d10 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 11 四月 2025 14:18:36 +0800
Subject: [PATCH] 1
---
cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js | 5 +++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard.html | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard.html
index b4492dd..5f4374b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard.html
@@ -14,8 +14,8 @@
<el-form-item label="惠民卡类型：">
<el-select v-model="query.huiMinType" placeholder="全部">
<el-option label="全部" value=""></el-option>
- <el-option label="年度卡" value="year"></el-option>
- <el-option label="季度卡" value="quarter"></el-option>
+ <el-option label="年度卡" value="1"></el-option>
+ <el-option label="年内卡" value="2"></el-option>
</el-select>
</el-form-item>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js b/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js
index 597ae5b..19e2d9f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js
@@ -40,12 +40,13 @@
Feng.error("搜索失败: " + (data.responseJSON?.message || '服务器异常')); // 错误提示优化
});
+ console.log('请求参数222:', this.query.dateRange)
// 添加请求参数
ajax.set({
current: this.currentPage,
size: this.pageSize,
- startTime: this.query.dateRange.length > 0 ? this.query.dateRange[0] : null,
- endTime: this.query.dateRange.length > 0 ? this.query.dateRange[1] : null,
+ startTime: this.query.dateRange !=null && this.query.dateRange.length > 0 ? this.query.dateRange[0] : null,
+ endTime: this.query.dateRange !=null && this.query.dateRange.length > 0 ? this.query.dateRange[1] : null,
...this.query
});
ajax.start();
--
Gitblit v1.7.1