SwtTt29
/
web-follow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Labels Milestones
New Pull Request

更新首页内容 #14

Merged
xfy merged 1 commits from ly into KH 1 month ago
Conversation 0 Commits 1 Files Changed 1
1 changed files with 44 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      web/src/main/resources/static/index.html

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

@ -626,6 +626,7 @@
<option value="e-commerce">电商平台类</option> <option value="e-commerce">电商平台类</option>
<option value="delivery_retail">配送零售类</option> <option value="delivery_retail">配送零售类</option>
<option value="defective_egg">次品蛋专项类</option> <option value="defective_egg">次品蛋专项类</option>
<option value="supplier">供应商</option>
<option value="other">其他类型</option> <option value="other">其他类型</option>
</select> </select>
<span style="margin-left: 20px; font-size: 14px;">创建时间:</span> <span style="margin-left: 20px; font-size: 14px;">创建时间:</span>
@ -695,6 +696,7 @@
<option value="e-commerce">电商平台类</option> <option value="e-commerce">电商平台类</option>
<option value="delivery_retail">配送零售类</option> <option value="delivery_retail">配送零售类</option>
<option value="defective_egg">次品蛋专项类</option> <option value="defective_egg">次品蛋专项类</option>
<option value="supplier">供应商</option>
<option value="other">其他类型</option> <option value="other">其他类型</option>
</select> </select>
<span style="margin-left: 20px; font-size: 14px;">创建时间:</span> <span style="margin-left: 20px; font-size: 14px;">创建时间:</span>
@ -770,6 +772,24 @@
userInfo = JSON.parse(savedUserInfo); userInfo = JSON.parse(savedUserInfo);
displayUserInfo(); displayUserInfo();
loadManagers(); loadManagers();
// 重置所有筛选状态
currentTypeFilter = null;
currentManagerFilter = null;
currentPhoneSearch = null;
currentStartDate = null;
currentEndDate = null;
// 重置下拉框值
document.getElementById('personalTypeFilter').value = '';
document.getElementById('publicTypeFilter').value = '';
document.getElementById('personalManagerFilter').value = '';
document.getElementById('publicManagerFilter').value = '';
document.getElementById('personalPhoneSearch').value = '';
document.getElementById('publicPhoneSearch').value = '';
document.getElementById('personalStartDate').value = '';
document.getElementById('personalEndDate').value = '';
document.getElementById('publicStartDate').value = '';
document.getElementById('publicEndDate').value = '';
// 加载数据
loadPersonalData(); loadPersonalData();
} }
@ -874,7 +894,7 @@
role: usersManagements.role || '' role: usersManagements.role || ''
}; };
var url = '/KH/api/users?' + objectToQueryString(params); var url = 'http://8.137.125.67:8083/KH/api/users?' + objectToQueryString(params);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); xhr.open('GET', url, true);
@ -976,17 +996,26 @@
if (currentTypeFilter) { if (currentTypeFilter) {
var userType = user.type || ''; var userType = user.type || '';
console.log('筛选类型:', currentTypeFilter, '用户类型:', userType); console.log('筛选类型:', currentTypeFilter, '用户类型:', userType);
// 如果筛选值是英文，需要转换为中文进行比较 // 处理类型映射
var typeMap = { var filterValue = '';
'wholesale': '批发贸易类', if (currentTypeFilter === 'supplier') {
'e-commerce': '电商平台类', // 供应商筛选需要匹配seller类型
'delivery_retail': '配送零售类', if (userType !== 'seller' && userType !== '供应商') {
'defective_egg': '次品蛋专项类', return false;
'other': '其他类型' }
}; } else {
var filterValue = typeMap[currentTypeFilter] || currentTypeFilter; // 其他类型筛选
if (userType !== filterValue) { var typeMap = {
return false; 'wholesale': '批发贸易类',
'e-commerce': '电商平台类',
'delivery_retail': '配送零售类',
'defective_egg': '次品蛋专项类',
'other': '其他类型'
};
filterValue = typeMap[currentTypeFilter] || currentTypeFilter;
if (userType !== filterValue) {
return false;
}
} }
} }
@ -1448,6 +1477,7 @@
case 'e-commerce': typeText = '电商平台类'; break; case 'e-commerce': typeText = '电商平台类'; break;
case 'delivery_retail': typeText = '配送零售类'; break; case 'delivery_retail': typeText = '配送零售类'; break;
case 'defective_egg': typeText = '次品蛋专项类'; break; case 'defective_egg': typeText = '次品蛋专项类'; break;
case 'supplier': typeText = '供应商'; break;
case 'other': typeText = '其他类型'; break; case 'other': typeText = '其他类型'; break;
default: typeText = currentTypeFilter; default: typeText = currentTypeFilter;
} }
@ -1709,7 +1739,7 @@
role: usersManagements.role || '' role: usersManagements.role || ''
}; };
var url = '/KH/api/users/public?' + objectToQueryString(params); var url = 'http://8.137.125.67:8083/KH/api/users/public?' + objectToQueryString(params);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); xhr.open('GET', url, true);
@ -1850,6 +1880,7 @@
<option value="电商平台类">电商平台类</option> <option value="电商平台类">电商平台类</option>
<option value="配送零售类">配送零售类</option> <option value="配送零售类">配送零售类</option>
<option value="次品蛋专项类">次品蛋专项类</option> <option value="次品蛋专项类">次品蛋专项类</option>
<option value="供应商">供应商</option>
<option value="其他类型">其他类型</option> <option value="其他类型">其他类型</option>
</select> </select>
</div> </div>

Write Preview
Loading…
Cancel
Save