diff --git a/web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html
index 6fc0c43..236e98f 100644
--- a/web/src/main/resources/static/index.html
+++ b/web/src/main/resources/static/index.html
@@ -651,6 +651,7 @@
+
创建时间:
@@ -714,6 +715,7 @@
+
创建时间:
@@ -797,6 +799,24 @@
userInfo = JSON.parse(savedUserInfo);
displayUserInfo();
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();
}
@@ -905,7 +925,7 @@
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();
xhr.open('GET', url, true);
@@ -1007,17 +1027,26 @@
if (currentTypeFilter) {
var userType = user.type || '';
console.log('筛选类型:', currentTypeFilter, '用户类型:', userType);
- // 如果筛选值是英文,需要转换为中文进行比较
- var typeMap = {
- 'wholesale': '批发贸易类',
- 'e-commerce': '电商平台类',
- 'delivery_retail': '配送零售类',
- 'defective_egg': '次品蛋专项类',
- 'other': '其他类型'
- };
- var filterValue = typeMap[currentTypeFilter] || currentTypeFilter;
- if (userType !== filterValue) {
- return false;
+ // 处理类型映射
+ var filterValue = '';
+ if (currentTypeFilter === 'supplier') {
+ // 供应商筛选需要匹配seller类型
+ if (userType !== 'seller' && userType !== '供应商') {
+ return false;
+ }
+ } else {
+ // 其他类型筛选
+ var typeMap = {
+ 'wholesale': '批发贸易类',
+ 'e-commerce': '电商平台类',
+ 'delivery_retail': '配送零售类',
+ 'defective_egg': '次品蛋专项类',
+ 'other': '其他类型'
+ };
+ filterValue = typeMap[currentTypeFilter] || currentTypeFilter;
+ if (userType !== filterValue) {
+ return false;
+ }
}
}
@@ -1481,6 +1510,7 @@
case 'e-commerce': typeText = '电商平台类'; break;
case 'delivery_retail': typeText = '配送零售类'; break;
case 'defective_egg': typeText = '次品蛋专项类'; break;
+ case 'supplier': typeText = '供应商'; break;
case 'other': typeText = '其他类型'; break;
default: typeText = currentTypeFilter;
}
@@ -1742,7 +1772,7 @@
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();
xhr.open('GET', url, true);
@@ -1883,6 +1913,7 @@
+