diff --git a/web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html
index 056aad2..b040083 100644
--- a/web/src/main/resources/static/index.html
+++ b/web/src/main/resources/static/index.html
@@ -491,7 +491,6 @@
-
总数: 0 条
+
+
+
@@ -535,13 +537,15 @@
-
+
+
+
@@ -672,62 +676,8 @@
}
function loadPersonalData() {
- var userRole = userInfo.loginInfo.projectName;
- var userName = userInfo.loginInfo.userName;
- var usersManagements = userInfo.usersManagements;
-
- // 如果当前是已跟进或未跟进筛选，重新加载所有数据后在前端筛选
- if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
- loadAllPersonalData();
- return;
- }
-
- // 构建查询参数
- var params = {
- page: personalPage,
- size: personalPageSize,
- userRole: userRole,
- followup: userName,
- userName: userName,
- managercompany: usersManagements.managercompany || '',
- managerdepartment: usersManagements.managerdepartment || '',
- organization: usersManagements.organization || '',
- role: usersManagements.role || ''
- };
-
- // 添加负责人筛选参数
- if (currentManagerFilter) {
- params.managerName = currentManagerFilter;
- }
-
- // 添加手机号搜索参数
- if (currentPhoneSearch) {
- params.phoneNumber = currentPhoneSearch;
- }
-
- // 添加日期范围搜索参数
- if (currentStartDate) {
- params.startDate = currentStartDate;
- }
- if (currentEndDate) {
- params.endDate = currentEndDate;
- }
-
- var url = '/KH/api/users?' + objectToQueryString(params);
-
- var xhr = new XMLHttpRequest();
- xhr.open('GET', url, true);
- xhr.onreadystatechange = function() {
- if (xhr.readyState == 4 && xhr.status == 200) {
- var data = JSON.parse(xhr.responseText);
- displayPersonalData(data);
- // 对于第一页的全部数据，更新缓存
- if (personalPage === 1 && personalFilter === 'all') {
- allPersonalData = data.users || [];
- }
- }
- };
- xhr.send();
+ // 总是加载所有数据，然后在前端进行筛选和分页
+ loadAllPersonalData();
}
function loadAllPersonalData() {
@@ -1067,11 +1017,8 @@
if (currentFilterTable === 'personal') {
// 个人表格筛选
personalPage = 1;
- if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
- displayFilteredPersonalData();
- } else {
- loadAllPersonalData(); // 加载所有数据以便筛选
- }
+ // 总是加载所有数据以便筛选
+ loadAllPersonalData();
// 更新个人表格筛选标签
updateFilterTags('personal');
@@ -1237,11 +1184,8 @@
currentPhoneSearch = searchValue || null;
personalPage = 1; // 重置为第一页
- if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
- displayFilteredPersonalData();
- } else {
- loadAllPersonalData(); // 加载所有数据以便筛选
- }
+ // 总是加载所有数据以便筛选
+ loadAllPersonalData();
// 更新筛选标签
updateFilterTags('personal');
@@ -1264,11 +1208,8 @@
currentPhoneSearch = null;
personalPage = 1; // 重置为第一页
- if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
- displayFilteredPersonalData();
- } else {
- loadAllPersonalData(); // 加载所有数据以便筛选
- }
+ // 总是加载所有数据以便筛选
+ loadAllPersonalData();
// 更新筛选标签
updateFilterTags('personal');
@@ -1293,11 +1234,8 @@
currentEndDate = endDate || null;
personalPage = 1; // 重置为第一页
- if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
- displayFilteredPersonalData();
- } else {
- loadAllPersonalData(); // 加载所有数据以便筛选
- }
+ // 总是加载所有数据以便筛选
+ loadAllPersonalData();
// 更新筛选标签
updateFilterTags('personal');
@@ -1311,11 +1249,8 @@
currentEndDate = null;
personalPage = 1; // 重置为第一页
- if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
- displayFilteredPersonalData();
- } else {
- loadAllPersonalData(); // 加载所有数据以便筛选
- }
+ // 总是加载所有数据以便筛选
+ loadAllPersonalData();
// 更新筛选标签
updateFilterTags('personal');