SwtTt29
/
web-follow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request 'fix: 分离固定按钮和动态筛选标签，避免按钮位置变化' (#3) from ly into KH 

Reviewed-on: http://8.137.125.67:4000/SwtTt29/web-follow/pulls/3
hzj
xfy 2 months ago
parent
67dafebb03 865379bdd3
commit
9d15791712
1 changed files with 18 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 99
      web/src/main/resources/static/index.html

99
web/src/main/resources/static/index.html
View File

@ -491,7 +491,6 @@
<input type="date" id="personalEndDate" style="padding: 4px 8px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px;">
<button onclick="filterPersonalByDate()" style="margin-left: 8px; padding: 4px 12px; background-color: #1890ff; color: white; border: none; border-radius: 4px; font-size: 14px;">筛选</button>
<button onclick="resetPersonalDateFilter()" style="margin-left: 8px; padding: 4px 12px; background-color: #666; color: white; border: none; border-radius: 4px; font-size: 14px;">重置</button>
<div id="personalFilterTags" style="margin-left: 20px; display: inline-block;"></div>
<span style="margin-left: 20px; font-size: 14px; color: #666;">总数: <span id="personalTotalCount">0</span> 条</span>
<select id="personalPageSize" onchange="changePersonalPageSize()" style="margin-left: auto;">
<option value="10">10条/页</option>
@ -499,6 +498,9 @@
<option value="100">100条/页</option>
</select>
</div>
<div id="personalFilterTags" style="margin-top: 10px; margin-bottom: 10px;"></div>
<table id="personalTable">
<thead>
<tr>
@ -535,13 +537,15 @@
<input type="date" id="publicEndDate" style="padding: 4px 8px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px;">
<button onclick="filterPublicByDate()" style="margin-left: 8px; padding: 4px 12px; background-color: #1890ff; color: white; border: none; border-radius: 4px; font-size: 14px;">筛选</button>
<button onclick="resetPublicDateFilter()" style="margin-left: 8px; padding: 4px 12px; background-color: #666; color: white; border: none; border-radius: 4px; font-size: 14px;">重置</button>
<div id="publicFilterTags" style="margin-left: 20px; display: inline-block;"></div>
<select id="publicPageSize" onchange="changePublicPageSize()" style="margin-left: auto;">
<option value="10">10条/页</option>
<option value="50">50条/页</option>
<option value="100">100条/页</option>
</select>
</div>
<div id="publicFilterTags" style="margin-top: 10px; margin-bottom: 10px;"></div>
<table id="publicTable">
<thead>
<tr>
@ -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();
}
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');

Write Preview
Loading…
Cancel
Save