From 474e701f61beb0904b023a302176d4e279c31fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?=
<15778543+xufeiyang6017@user.noreply.gitee.com>
Date: Mon, 26 Jan 2026 13:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A6=96=E9=A1=B5=E5=86=85?=
=?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/main/resources/static/index.html | 57 ++++++++++++++++++------
1 file changed, 44 insertions(+), 13 deletions(-)
diff --git a/web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html
index e75b0e6..1129272 100644
--- a/web/src/main/resources/static/index.html
+++ b/web/src/main/resources/static/index.html
@@ -626,6 +626,7 @@
+
创建时间:
@@ -695,6 +696,7 @@
+
创建时间:
@@ -770,6 +772,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();
}
@@ -874,7 +894,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);
@@ -976,17 +996,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;
+ }
}
}
@@ -1448,6 +1477,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;
}
@@ -1709,7 +1739,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);
@@ -1850,6 +1880,7 @@
+