diff --git a/web/src/main/java/com/example/web/entity/Users.java b/web/src/main/java/com/example/web/entity/Users.java
index a13ec6c..bce3f15 100644
--- a/web/src/main/java/com/example/web/entity/Users.java
+++ b/web/src/main/java/com/example/web/entity/Users.java
@@ -29,6 +29,7 @@ public class Users {
     private LocalDateTime updated_at;//更新时间
     private String company;//客户公司
     private String region;//客户地区
+    private String detailedaddress;//详细地址
     private String level;//客户等级
     private String demand;//客户需求
     private String spec;//规格
@@ -176,6 +177,14 @@ public class Users {
         this.region = region;
     }
 
+    public String getDetailedaddress() {
+        return detailedaddress;
+    }
+
+    public void setDetailedaddress(String detailedaddress) {
+        this.detailedaddress = detailedaddress;
+    }
+
     public String getLevel() {
         return level;
     }
diff --git a/web/src/main/resources/mapper/UsersMapper.xml b/web/src/main/resources/mapper/UsersMapper.xml
index 8c84ac3..e28706e 100644
--- a/web/src/main/resources/mapper/UsersMapper.xml
+++ b/web/src/main/resources/mapper/UsersMapper.xml
@@ -14,6 +14,9 @@
             <if test="userName != null and userName != ''">
                 AND um.userName = #{userName}
             </if>
+            <if test="managerName != null and managerName != ''">
+                AND um.userName = #{managerName}
+            </if>
             <if test="managercompany != null and managercompany != ''">
                 AND um.managercompany = #{managercompany}
             </if>
@@ -45,6 +48,9 @@
             <if test="userName != null and userName != ''">
                 AND um.userName = #{userName}
             </if>
+            <if test="managerName != null and managerName != ''">
+                AND um.userName = #{managerName}
+            </if>
             <if test="managercompany != null and managercompany != ''">
                 AND um.managercompany = #{managercompany}
             </if>
@@ -74,12 +80,15 @@
             AND role = #{role}
         )
         AND u.type != 'Colleague'
+        <if test="managerName != null and managerName != ''">
+            AND EXISTS (SELECT 1 FROM usermanagements um WHERE um.userId = u.userId AND um.userName = #{managerName})
+        </if>
         ORDER BY u.created_at DESC
         LIMIT #{offset}, #{limit}
     </select>
     <select id="countByUserIds" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM users 
-        WHERE userId IN 
+        SELECT COUNT(*) FROM users u
+        WHERE u.userId IN 
         (
             SELECT userId FROM usermanagements 
             WHERE userName = #{userName}
@@ -88,7 +97,10 @@
             AND organization = #{organization}
             AND role = #{role}
         )
-            AND type != 'Colleague'
+        AND u.type != 'Colleague'
+        <if test="managerName != null and managerName != ''">
+            AND EXISTS (SELECT 1 FROM usermanagements um WHERE um.userId = u.userId AND um.userName = #{managerName})
+        </if>
     </select>
     
     <select id="findPublicWithPagination" resultType="com.example.web.entity.Users">
@@ -123,6 +135,9 @@
         OR (um.organization IS NOT NULL AND um.organization != '')
         OR (um.role IS NOT NULL AND um.role != '')
         OR (um.userName IS NOT NULL AND um.userName != ''))
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
         ORDER BY u.created_at DESC
         LIMIT #{offset}, #{limit}
     </select>
@@ -136,21 +151,32 @@
         OR (um.organization IS NOT NULL AND um.organization != '')
         OR (um.role IS NOT NULL AND um.role != '')
         OR (um.userName IS NOT NULL AND um.userName != ''))
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
     </select>
     
     <select id="findPersonalWithPagination" resultType="com.example.web.entity.Users">
-        SELECT * FROM users
+        SELECT u.*, um.userName as managerName FROM users u
+        JOIN usermanagements um ON u.userId = um.userId
         WHERE followup IS NOT NULL AND followup != ''
-        AND (sync_statuss IS NULL OR sync_statuss NOT IN (0, 1))
-        AND type != 'Colleague'
-        AND type != 'Colleague'
+        AND (u.sync_statuss IS NULL OR u.sync_statuss NOT IN (0, 1))
+        AND u.type != 'Colleague'
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
+        ORDER BY u.created_at DESC
         LIMIT #{offset}, #{limit}
     </select>
     
     <select id="countPersonal" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM users
-        WHERE followup IS NOT NULL AND followup != ''
-        AND (sync_statuss IS NULL OR sync_statuss NOT IN (0, 1))
+        SELECT COUNT(*) FROM users u
+        JOIN usermanagements um ON u.userId = um.userId
+        WHERE u.followup IS NOT NULL AND u.followup != ''
+        AND (u.sync_statuss IS NULL OR u.sync_statuss NOT IN (0, 1))
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
     </select>
     
     <select id="findPublicAllWithPagination" resultType="com.example.web.entity.Users">
@@ -180,7 +206,13 @@
     <update id="updateFollowup" parameterType="java.util.Map">
         UPDATE users
         SET followup = #{followup},
-            followup_at = NOW()
+            followup_at = NOW(),
+            type = #{type},
+            level = #{level},
+            detailedaddress = #{detailedaddress},
+            company = #{company},
+            demand = #{demand},
+            region = #{region}
         WHERE userId = #{userId}
     </update>
     
diff --git a/web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html
index 6c2df13..056aad2 100644
--- a/web/src/main/resources/static/index.html
+++ b/web/src/main/resources/static/index.html
@@ -409,6 +409,19 @@
         #returnModal button:active {
             transform: translateY(0);
         }
+        
+        /* 搜索选择组件样式 */
+        .search-select-option:hover {
+            background-color: #f0f7ff;
+            color: #1890ff;
+        }
+        
+        /* 搜索输入框焦点样式 */
+        #followupRegionSearch:focus {
+            outline: none;
+            border-color: #1890ff;
+            box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+        }
     </style>
 </head>
 <body>
@@ -469,6 +482,16 @@
                         <button onclick="filterPersonalData('followed')" style="background-color: #faad14;">已跟进</button>
                         <button onclick="filterPersonalData('unfollowed')" style="background-color: #ff4d4f;">未跟进</button>
                         <button id="assignButton" onclick="openAssignModal()" style="background-color: #722ed1;">分配</button>
+                        <input type="text" id="personalPhoneSearch" placeholder="搜索手机号" style="margin-left: 20px; padding: 4px 8px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px;">
+                        <button onclick="searchPersonalByPhone()" style="margin-left: 8px; padding: 4px 12px; background-color: #1890ff; color: white; border: none; border-radius: 4px; font-size: 14px;">搜索</button>
+                        <button onclick="resetPersonalPhoneSearch()" style="margin-left: 8px; padding: 4px 12px; background-color: #666; color: white; border: none; border-radius: 4px; font-size: 14px;">重置</button>
+                        <span style="margin-left: 20px; font-size: 14px;">创建时间:</span>
+                        <input type="date" id="personalStartDate" style="padding: 4px 8px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px;">
+                        <span style="margin: 0 8px; font-size: 14px;">至</span>
+                        <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>
@@ -486,7 +509,7 @@
                                 <th>创建时间</th>
                                 <th>跟进内容</th>
                                 <th>响应时间</th>
-                                <th id="managerHeader">负责人</th>
+                                <th id="managerHeader" onclick="toggleManagerFilter()" style="cursor: pointer;">负责人</th>
                                 <th>操作</th>
                             </tr>
                         </thead>
@@ -503,7 +526,17 @@
                     <div class="filter-bar">
                         <button onclick="loadPublicData()">刷新数据</button>
                         <button id="publicAssignButton" onclick="openAssignModal()" style="background-color: #722ed1;">分配</button>
-                        <select id="publicPageSize" onchange="changePublicPageSize()">
+                        <input type="text" id="publicPhoneSearch" placeholder="搜索手机号" style="margin-left: 20px; padding: 4px 8px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px;">
+                        <button onclick="searchPublicByPhone()" style="margin-left: 8px; padding: 4px 12px; background-color: #1890ff; color: white; border: none; border-radius: 4px; font-size: 14px;">搜索</button>
+                        <button onclick="resetPublicPhoneSearch()" style="margin-left: 8px; padding: 4px 12px; background-color: #666; color: white; border: none; border-radius: 4px; font-size: 14px;">重置</button>
+                        <span style="margin-left: 20px; font-size: 14px;">创建时间:</span>
+                        <input type="date" id="publicStartDate" style="padding: 4px 8px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px;">
+                        <span style="margin: 0 8px; font-size: 14px;">至</span>
+                        <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>
@@ -519,7 +552,7 @@
                                 <th>创建时间</th>
                                 <th>跟进内容</th>
                                 <th>响应时间</th>
-                                <th id="publicManagerHeader">负责人</th>
+                                <th id="publicManagerHeader" onclick="toggleManagerFilter('public')" style="cursor: pointer;">负责人</th>
                                 <th>操作</th>
                             </tr>
                         </thead>
@@ -545,6 +578,11 @@
         var managersList = [];
         var allPersonalData = [];
         var isLoadingAllData = false;
+        var currentManagerFilter = null;
+        var currentFilterTable = 'personal';
+        var currentPhoneSearch = null;
+        var currentStartDate = null;
+        var currentEndDate = null;
         
         function init() {
             var savedUserInfo = localStorage.getItem('userInfo');
@@ -657,7 +695,25 @@
                 role: usersManagements.role || ''
             };
             
-            var url = 'http://8.137.125.67:8083/KH/api/users?' + objectToQueryString(params);
+            // 添加负责人筛选参数
+            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);
@@ -695,7 +751,12 @@
                 role: usersManagements.role || ''
             };
             
-            var url = 'http://8.137.125.67:8083/KH/api/users?' + objectToQueryString(params);
+            // 添加负责人筛选参数
+            if (currentManagerFilter) {
+                params.managerName = currentManagerFilter;
+            }
+            
+            var url = '/KH/api/users?' + objectToQueryString(params);
             
             var xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);
@@ -748,11 +809,51 @@
                 
                 // 根据筛选条件过滤
                 if (personalFilter === 'followed') {
-                    return user.followup && user.followup !== '';
+                    if (!(user.followup && user.followup !== '')) {
+                        return false;
+                    }
                 } else if (personalFilter === 'unfollowed') {
-                    return !user.followup || user.followup === '';
+                    if (!(!user.followup || user.followup === '')) {
+                        return false;
+                    }
+                }
+                
+                // 按负责人筛选
+                if (currentManagerFilter) {
+                    if (user.managerName !== currentManagerFilter) {
+                        return false;
+                    }
+                }
+                
+                // 按手机号搜索
+                if (currentPhoneSearch) {
+                    if (!user.phoneNumber || !user.phoneNumber.includes(currentPhoneSearch)) {
+                        return false;
+                    }
+                }
+                
+                // 按创建时间范围筛选
+                if (currentStartDate || currentEndDate) {
+                    var userCreatedAt = new Date(user.created_at);
+                    
+                    if (currentStartDate) {
+                        var startDate = new Date(currentStartDate);
+                        if (userCreatedAt < startDate) {
+                            return false;
+                        }
+                    }
+                    
+                    if (currentEndDate) {
+                        var endDate = new Date(currentEndDate);
+                        // 设置结束日期为当天的23:59:59
+                        endDate.setHours(23, 59, 59, 999);
+                        if (userCreatedAt > endDate) {
+                            return false;
+                        }
+                    }
                 }
-                // 'all' 或其他情况，不过滤
+                
+                // 其他情况，不过滤
                 return true;
             });
             
@@ -779,7 +880,7 @@
                     
                     // 只对管理员显示负责人信息
                     if (userRole === '管理员') {
-                        managerCell = '<td>' + (user.managerName || '-') + '</td>';
+                        managerCell = '<td style="cursor: pointer;">' + (user.managerName || '-') + '</td>';
                     } else {
                         managerCell = '<td style="display: none;"></td>';
                     }
@@ -836,6 +937,416 @@
             }
         }
         
+        function toggleManagerFilter(tableType) {
+            currentFilterTable = tableType || 'personal';
+            
+            // 收集当前表格中的所有负责人名称
+            var managers = new Set();
+            var bodyElement = currentFilterTable === 'personal' ? 
+                document.getElementById('personalBody') : 
+                document.getElementById('publicBody');
+            
+            var rows = bodyElement.getElementsByTagName('tr');
+            for (var i = 0; i < rows.length; i++) {
+                var cells = rows[i].getElementsByTagName('td');
+                // 找到负责人列（索引为7，因为从0开始计数）
+                if (cells.length > 7) {
+                    var managerName = cells[7].textContent.trim();
+                    if (managerName && managerName !== '-') {
+                        managers.add(managerName);
+                    }
+                }
+            }
+            
+            // 如果没有负责人数据，显示提示
+            if (managers.size === 0) {
+                showAlert('当前表格中没有负责人数据');
+                return;
+            }
+            
+            // 创建筛选菜单
+            createManagerFilterMenu(Array.from(managers));
+        }
+        
+        function createManagerFilterMenu(managers) {
+            // 移除已存在的筛选菜单
+            var existingMenu = document.getElementById('managerFilterMenu');
+            if (existingMenu) {
+                existingMenu.remove();
+            }
+            
+            // 创建筛选菜单
+            var menu = document.createElement('div');
+            menu.id = 'managerFilterMenu';
+            menu.style.cssText = `
+                position: absolute;
+                background-color: white;
+                border: 1px solid #d9d9d9;
+                border-radius: 4px;
+                box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+                z-index: 1001;
+                padding: 8px 0;
+                min-width: 150px;
+            `;
+            
+            // 添加清除筛选选项
+            var clearOption = document.createElement('div');
+            clearOption.textContent = '清除筛选';
+            clearOption.style.cssText = `
+                padding: 8px 16px;
+                cursor: pointer;
+                font-size: 14px;
+            `;
+            clearOption.onmouseover = function() {
+                this.style.backgroundColor = '#f5f5f5';
+            };
+            clearOption.onmouseout = function() {
+                this.style.backgroundColor = 'white';
+            };
+            clearOption.onclick = function() {
+                currentManagerFilter = null;
+                applyManagerFilter();
+                menu.remove();
+            };
+            menu.appendChild(clearOption);
+            
+            // 添加分隔线
+            var divider = document.createElement('div');
+            divider.style.cssText = `
+                height: 1px;
+                background-color: #f0f0f0;
+                margin: 4px 0;
+            `;
+            menu.appendChild(divider);
+            
+            // 添加负责人选项
+            managers.forEach(function(manager) {
+                var option = document.createElement('div');
+                option.textContent = manager;
+                option.style.cssText = `
+                    padding: 8px 16px;
+                    cursor: pointer;
+                    font-size: 14px;
+                `;
+                option.onmouseover = function() {
+                    this.style.backgroundColor = '#f5f5f5';
+                };
+                option.onmouseout = function() {
+                    this.style.backgroundColor = 'white';
+                };
+                option.onclick = function() {
+                    currentManagerFilter = manager;
+                    applyManagerFilter();
+                    menu.remove();
+                };
+                menu.appendChild(option);
+            });
+            
+            // 获取表头位置并显示菜单
+            var headerElement = currentFilterTable === 'personal' ? 
+                document.getElementById('managerHeader') : 
+                document.getElementById('publicManagerHeader');
+            
+            var rect = headerElement.getBoundingClientRect();
+            menu.style.left = rect.left + 'px';
+            menu.style.top = (rect.top + rect.height) + 'px';
+            
+            // 添加到页面
+            document.body.appendChild(menu);
+            
+            // 点击页面其他地方关闭菜单
+            document.addEventListener('click', function closeMenu(event) {
+                if (!menu.contains(event.target) && event.target !== headerElement) {
+                    menu.remove();
+                    document.removeEventListener('click', closeMenu);
+                }
+            });
+        }
+        
+        function applyManagerFilter() {
+            if (currentFilterTable === 'personal') {
+                // 个人表格筛选
+                personalPage = 1;
+                if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
+                    displayFilteredPersonalData();
+                } else {
+                    loadAllPersonalData(); // 加载所有数据以便筛选
+                }
+                
+                // 更新个人表格筛选标签
+                updateFilterTags('personal');
+            } else {
+                // 公海池表格筛选
+                // 公海池数据需要重新加载，因为它可能有分页
+                loadPublicData();
+                
+                // 更新公海池表格筛选标签
+                updateFilterTags('public');
+            }
+            
+            // 更新表头样式
+            updateManagerHeaderStyle();
+        }
+        
+        // 更新筛选标签
+        function updateFilterTags(tableType) {
+            var tagsContainer = document.getElementById(tableType + 'FilterTags');
+            tagsContainer.innerHTML = '';
+            
+            // 显示负责人筛选标签
+            if (currentManagerFilter) {
+                var tag = document.createElement('span');
+                tag.style.cssText = `
+                    display: inline-block;
+                    padding: 4px 12px;
+                    background-color: #e6f7ff;
+                    color: #1890ff;
+                    border: 1px solid #91d5ff;
+                    border-radius: 10px;
+                    font-size: 12px;
+                    margin-right: 8px;
+                    position: relative;
+                `;
+                
+                var tagText = document.createTextNode('负责人: ' + currentManagerFilter);
+                tag.appendChild(tagText);
+                
+                var closeButton = document.createElement('span');
+                closeButton.textContent = ' ×';
+                closeButton.style.cssText = `
+                    margin-left: 8px;
+                    cursor: pointer;
+                    font-weight: bold;
+                `;
+                closeButton.onclick = function() {
+                    currentManagerFilter = null;
+                    applyManagerFilter();
+                };
+                
+                tag.appendChild(closeButton);
+                tagsContainer.appendChild(tag);
+            }
+            
+            // 显示手机号搜索标签
+            if (currentPhoneSearch) {
+                var tag = document.createElement('span');
+                tag.style.cssText = `
+                    display: inline-block;
+                    padding: 4px 12px;
+                    background-color: #f6ffed;
+                    color: #52c41a;
+                    border: 1px solid #b7eb8f;
+                    border-radius: 10px;
+                    font-size: 12px;
+                    margin-right: 8px;
+                    position: relative;
+                `;
+                
+                var tagText = document.createTextNode('手机号: ' + currentPhoneSearch);
+                tag.appendChild(tagText);
+                
+                var closeButton = document.createElement('span');
+                closeButton.textContent = ' ×';
+                closeButton.style.cssText = `
+                    margin-left: 8px;
+                    cursor: pointer;
+                    font-weight: bold;
+                `;
+                closeButton.onclick = function() {
+                    currentPhoneSearch = null;
+                    document.getElementById(tableType + 'PhoneSearch').value = '';
+                    if (tableType === 'personal') {
+                        personalPage = 1;
+                        if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
+                            displayFilteredPersonalData();
+                        } else {
+                            loadAllPersonalData();
+                        }
+                    } else {
+                        publicPage = 1;
+                        loadPublicData();
+                    }
+                    updateFilterTags(tableType);
+                };
+                
+                tag.appendChild(closeButton);
+                tagsContainer.appendChild(tag);
+            }
+            
+            // 显示日期范围筛选标签
+            if (currentStartDate || currentEndDate) {
+                var tag = document.createElement('span');
+                tag.style.cssText = `
+                    display: inline-block;
+                    padding: 4px 12px;
+                    background-color: #fff7e6;
+                    color: #fa8c16;
+                    border: 1px solid #ffd591;
+                    border-radius: 10px;
+                    font-size: 12px;
+                    margin-right: 8px;
+                    position: relative;
+                `;
+                
+                var dateText = '';
+                if (currentStartDate && currentEndDate) {
+                    dateText = '创建时间: ' + currentStartDate + ' 至 ' + currentEndDate;
+                } else if (currentStartDate) {
+                    dateText = '创建时间: 从 ' + currentStartDate;
+                } else {
+                    dateText = '创建时间: 至 ' + currentEndDate;
+                }
+                
+                var tagText = document.createTextNode(dateText);
+                tag.appendChild(tagText);
+                
+                var closeButton = document.createElement('span');
+                closeButton.textContent = ' ×';
+                closeButton.style.cssText = `
+                    margin-left: 8px;
+                    cursor: pointer;
+                    font-weight: bold;
+                `;
+                closeButton.onclick = function() {
+                    currentStartDate = null;
+                    currentEndDate = null;
+                    document.getElementById(tableType + 'StartDate').value = '';
+                    document.getElementById(tableType + 'EndDate').value = '';
+                    if (tableType === 'personal') {
+                        personalPage = 1;
+                        if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
+                            displayFilteredPersonalData();
+                        } else {
+                            loadAllPersonalData();
+                        }
+                    } else {
+                        publicPage = 1;
+                        loadPublicData();
+                    }
+                    updateFilterTags(tableType);
+                };
+                
+                tag.appendChild(closeButton);
+                tagsContainer.appendChild(tag);
+            }
+        }
+        
+        // 搜索个人数据手机号
+        function searchPersonalByPhone() {
+            var searchValue = document.getElementById('personalPhoneSearch').value.trim();
+            currentPhoneSearch = searchValue || null;
+            personalPage = 1; // 重置为第一页
+            
+            if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
+                displayFilteredPersonalData();
+            } else {
+                loadAllPersonalData(); // 加载所有数据以便筛选
+            }
+            
+            // 更新筛选标签
+            updateFilterTags('personal');
+        }
+        
+        // 搜索公海池数据手机号
+        function searchPublicByPhone() {
+            var searchValue = document.getElementById('publicPhoneSearch').value.trim();
+            currentPhoneSearch = searchValue || null;
+            publicPage = 1; // 重置为第一页
+            loadPublicData(); // 重新加载公海池数据
+            
+            // 更新筛选标签
+            updateFilterTags('public');
+        }
+        
+        // 重置个人数据手机号搜索
+        function resetPersonalPhoneSearch() {
+            document.getElementById('personalPhoneSearch').value = '';
+            currentPhoneSearch = null;
+            personalPage = 1; // 重置为第一页
+            
+            if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
+                displayFilteredPersonalData();
+            } else {
+                loadAllPersonalData(); // 加载所有数据以便筛选
+            }
+            
+            // 更新筛选标签
+            updateFilterTags('personal');
+        }
+        
+        // 重置公海池数据手机号搜索
+        function resetPublicPhoneSearch() {
+            document.getElementById('publicPhoneSearch').value = '';
+            currentPhoneSearch = null;
+            publicPage = 1; // 重置为第一页
+            loadPublicData(); // 重新加载公海池数据
+            
+            // 更新筛选标签
+            updateFilterTags('public');
+        }
+        
+        // 筛选个人数据创建时间
+        function filterPersonalByDate() {
+            var startDate = document.getElementById('personalStartDate').value;
+            var endDate = document.getElementById('personalEndDate').value;
+            currentStartDate = startDate || null;
+            currentEndDate = endDate || null;
+            personalPage = 1; // 重置为第一页
+            
+            if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
+                displayFilteredPersonalData();
+            } else {
+                loadAllPersonalData(); // 加载所有数据以便筛选
+            }
+            
+            // 更新筛选标签
+            updateFilterTags('personal');
+        }
+        
+        // 重置个人数据创建时间筛选
+        function resetPersonalDateFilter() {
+            document.getElementById('personalStartDate').value = '';
+            document.getElementById('personalEndDate').value = '';
+            currentStartDate = null;
+            currentEndDate = null;
+            personalPage = 1; // 重置为第一页
+            
+            if (personalFilter === 'followed' || personalFilter === 'unfollowed') {
+                displayFilteredPersonalData();
+            } else {
+                loadAllPersonalData(); // 加载所有数据以便筛选
+            }
+            
+            // 更新筛选标签
+            updateFilterTags('personal');
+        }
+        
+        // 筛选公海池数据创建时间
+        function filterPublicByDate() {
+            var startDate = document.getElementById('publicStartDate').value;
+            var endDate = document.getElementById('publicEndDate').value;
+            currentStartDate = startDate || null;
+            currentEndDate = endDate || null;
+            publicPage = 1; // 重置为第一页
+            loadPublicData(); // 重新加载公海池数据
+            
+            // 更新筛选标签
+            updateFilterTags('public');
+        }
+        
+        // 重置公海池数据创建时间筛选
+        function resetPublicDateFilter() {
+            document.getElementById('publicStartDate').value = '';
+            document.getElementById('publicEndDate').value = '';
+            currentStartDate = null;
+            currentEndDate = null;
+            publicPage = 1; // 重置为第一页
+            loadPublicData(); // 重新加载公海池数据
+            
+            // 更新筛选标签
+            updateFilterTags('public');
+        }
+        
         function loadPublicData() {
             var userRole = userInfo.loginInfo.projectName;
             var usersManagements = userInfo.usersManagements;
@@ -852,7 +1363,25 @@
                 role: usersManagements.role || ''
             };
             
-            var url = 'http://8.137.125.67:8083/KH/api/users/public?' + objectToQueryString(params);
+            // 添加负责人筛选参数
+            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/public?' + objectToQueryString(params);
             
             var xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);
@@ -874,8 +1403,8 @@
         
         // 跟进弹窗HTML
         var followupModalHTML = `
-            <div id="followupModal" style="position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0,0,0,0.5); display: none; z-index: 1000; animation: fadeIn 0.3s ease;">
-                <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); background-color: white; padding: 24px; border-radius: 8px; width: 450px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); animation: slideIn 0.3s ease;">
+            <div id="followupModal" style="position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; background-color: rgba(0,0,0,0.5); display: none; z-index: 9999; animation: fadeIn 0.3s ease; overflow: hidden; pointer-events: auto;">
+                <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); background-color: white; padding: 24px; border-radius: 8px; width: 450px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); animation: slideIn 0.3s ease; max-height: 90vh; overflow-y: auto;">
                     <h3 style="margin: 0 0 20px 0; font-size: 18px; font-weight: 600; color: #333; text-align: center;">跟进客户</h3>
                     <input type="hidden" id="followupUserId">
                     <div style="margin-bottom: 20px;">
@@ -886,9 +1415,319 @@
                         <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;">电话号码</label>
                         <input type="text" id="followupPhone" disabled style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; background-color: #f5f5f5;">
                     </div>
+                    <div style="margin-bottom: 20px;">
+                        <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 8px;">
+                            <label style="font-size: 14px; font-weight: 500; color: #666;"><span style="color: #ff4d4f;">*</span> 客户类型</label>
+                            <button onclick="showTypeHelp()" style="width: 20px; height: 20px; border-radius: 50%; border: 1px solid #1890ff; background-color: white; color: #1890ff; cursor: pointer; font-size: 12px; display: flex; align-items: center; justify-content: center; padding: 0; transition: all 0.3s ease;">?</button>
+                        </div>
+                        <select id="followupType" style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; cursor: pointer; transition: all 0.3s ease;">
+                            <option value="">请选择客户类型</option>
+                            <option value="wholesale">批发贸易类</option>
+                            <option value="e-commerce">电商平台类</option>
+                            <option value="delivery_retail">配送零售类</option>
+                            <option value="defective_egg">次品蛋专项类</option>
+                            <option value="other">其他类型</option>
+                        </select>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;"><span style="color: #ff4d4f;">*</span> 客户等级</label>
+                        <select id="followupLevel" style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; cursor: pointer; transition: all 0.3s ease;">
+                            <option value="">请选择客户等级</option>
+                            <option value="important">A-重要客户</option>
+                            <option value="ordinary">B-普通客户</option>
+                            <option value="low_value">C-低价值客户</option>
+                            <option value="logistics">D-物流自提客户</option>
+                        </select>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;"><span style="color: #ff4d4f;">*</span> 客户需求</label>
+                        <select id="followupDemand" style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; cursor: pointer; transition: all 0.3s ease;">
+                            <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>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;"><span style="color: #ff4d4f;">*</span> 客户地区</label>
+                        <!-- 带搜索功能的地区选择组件 -->
+                        <div class="search-select" style="position: relative; width: 100%;">
+                            <div class="search-select-input" onclick="toggleSearchSelect('followupRegion')" style="
+                                width: 100%;
+                                padding: 10px;
+                                border: 1px solid #d9d9d9;
+                                border-radius: 4px;
+                                font-size: 14px;
+                                cursor: pointer;
+                                transition: all 0.3s ease;
+                                display: flex;
+                                justify-content: space-between;
+                                align-items: center;
+                                background-color: white;
+                            ">
+                                <span id="followupRegionDisplay">请选择客户地区</span>
+                                <span style="color: #999;">▼</span>
+                            </div>
+                            <input 
+                                type="text" 
+                                id="followupRegionSearch" 
+                                oninput="filterRegions()" 
+                                placeholder="搜索地区..." 
+                                style="
+                                    width: 100%;
+                                    padding: 10px;
+                                    border: 1px solid #d9d9d9;
+                                    border-top: none;
+                                    border-radius: 0 0 4px 4px;
+                                    font-size: 14px;
+                                    display: none;
+                                    box-sizing: border-box;
+                                "
+                            />
+                            <div class="search-select-dropdown" id="followupRegionDropdown" style="
+                                position: absolute;
+                                top: 100%;
+                                left: 0;
+                                right: 0;
+                                max-height: 200px;
+                                overflow-y: auto;
+                                border: 1px solid #d9d9d9;
+                                border-top: none;
+                                border-radius: 0 0 4px 4px;
+                                background-color: white;
+                                box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+                                z-index: 1000;
+                                display: none;
+                            ">
+                                <div class="search-select-option" onclick="selectRegion('')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">请选择客户地区</div>
+                                <div class="search-select-option" onclick="selectRegion('四川地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">四川地区</div>
+                                <div class="search-select-option" onclick="selectRegion('成都地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">成都地区</div>
+                                <div class="search-select-option" onclick="selectRegion('乐山地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">乐山地区</div>
+                                <div class="search-select-option" onclick="selectRegion('贵州地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">贵州地区</div>
+                                <div class="search-select-option" onclick="selectRegion('重庆地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">重庆地区</div>
+                                <div class="search-select-option" onclick="selectRegion('云南地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">云南地区</div>
+                                <div class="search-select-option" onclick="selectRegion('河南地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">河南地区</div>
+                                <div class="search-select-option" onclick="selectRegion('河北地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">河北地区</div>
+                                <div class="search-select-option" onclick="selectRegion('广西地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">广西地区</div>
+                                <div class="search-select-option" onclick="selectRegion('广东地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">广东地区</div>
+                                <div class="search-select-option" onclick="selectRegion('湖南地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">湖南地区</div>
+                                <div class="search-select-option" onclick="selectRegion('湖北地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">湖北地区</div>
+                                <div class="search-select-option" onclick="selectRegion('上海地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">上海地区</div>
+                                <div class="search-select-option" onclick="selectRegion('山西地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">山西地区</div>
+                                <div class="search-select-option" onclick="selectRegion('山东地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">山东地区</div>
+                                <div class="search-select-option" onclick="selectRegion('陕西地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">陕西地区</div>
+                                <div class="search-select-option" onclick="selectRegion('甘肃地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">甘肃地区</div>
+                                <div class="search-select-option" onclick="selectRegion('黑龙江地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">黑龙江地区</div>
+                                <div class="search-select-option" onclick="selectRegion('吉林地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">吉林地区</div>
+                                <div class="search-select-option" onclick="selectRegion('辽宁地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">辽宁地区</div>
+                                <div class="search-select-option" onclick="selectRegion('江苏地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">江苏地区</div>
+                                <div class="search-select-option" onclick="selectRegion('浙江地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">浙江地区</div>
+                                <div class="search-select-option" onclick="selectRegion('安徽地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">安徽地区</div>
+                                <div class="search-select-option" onclick="selectRegion('福建地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">福建地区</div>
+                                <div class="search-select-option" onclick="selectRegion('江西地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">江西地区</div>
+                                <div class="search-select-option" onclick="selectRegion('北京地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">北京地区</div>
+                                <div class="search-select-option" onclick="selectRegion('天津地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">天津地区</div>
+                                <div class="search-select-option" onclick="selectRegion('内蒙古地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">内蒙古地区</div>
+                                <div class="search-select-option" onclick="selectRegion('宁夏地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">宁夏地区</div>
+                                <div class="search-select-option" onclick="selectRegion('青海地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">青海地区</div>
+                                <div class="search-select-option" onclick="selectRegion('新疆地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">新疆地区</div>
+                                <div class="search-select-option" onclick="selectRegion('西藏地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">西藏地区</div>
+                                <div class="search-select-option" onclick="selectRegion('香港地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">香港地区</div>
+                                <div class="search-select-option" onclick="selectRegion('澳门地区')" style="
+                                    padding: 10px;
+                                    cursor: pointer;
+                                    transition: all 0.3s ease;
+                                    font-size: 14px;
+                                ">澳门地区</div>
+                            </div>
+                            <input type="hidden" id="followupRegion" name="followupRegion" />
+                        </div>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;">详细地址</label>
+                        <input type="text" id="followupDetailedAddress" style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; transition: all 0.3s ease;">
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;"><span style="color: #ff4d4f;">*</span> 客户公司</label>
+                        <input type="text" id="followupCompany" style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; transition: all 0.3s ease;">
+                    </div>
                     <div style="margin-bottom: 24px;">
-                        <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;">跟进内容</label>
-                        <textarea id="followupContent" rows="4" style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; resize: vertical; transition: all 0.3s ease;"></textarea>
+                        <label style="display: block; margin-bottom: 8px; font-size: 14px; font-weight: 500; color: #666;"><span style="color: #ff4d4f;">*</span> 跟进内容</label>
+                        <textarea id="followupContent" rows="3" style="width: 100%; padding: 10px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; resize: vertical; transition: all 0.3s ease;"></textarea>
                     </div>
                     <div style="text-align: right; margin-top: 24px;">
                         <button onclick="closeFollowupModal()" style="padding: 10px 16px; margin-right: 12px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; color: #666; background-color: white; cursor: pointer; transition: all 0.3s ease;">取消</button>
@@ -971,7 +1810,7 @@
         
         // 提示弹窗HTML
         var alertModalHTML = `
-            <div id="alertModal" style="position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0,0,0,0.5); display: none; z-index: 1000; animation: fadeIn 0.3s ease;">
+            <div id="alertModal" style="position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0,0,0,0.5); display: none; z-index: 10000; animation: fadeIn 0.3s ease;">
                 <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); background-color: white; padding: 24px; border-radius: 8px; width: 350px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); animation: slideIn 0.3s ease;">
                     <h3 style="margin: 0 0 20px 0; font-size: 16px; font-weight: 600; color: #333; text-align: center;">提示</h3>
                     <div style="margin-bottom: 24px; text-align: center;">
@@ -984,12 +1823,180 @@
             </div>
         `;
         
+        // 客户类型说明弹窗HTML
+        var typeHelpModalHTML = `
+            <div id="typeHelpModal" style="position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0,0,0,0.5); display: none; z-index: 10000; animation: fadeIn 0.3s ease;">
+                <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); background-color: white; padding: 24px; border-radius: 8px; width: 500px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); animation: slideIn 0.3s ease; max-height: 80vh; overflow-y: auto;">
+                    <h3 style="margin: 0 0 20px 0; font-size: 18px; font-weight: 600; color: #333; text-align: center;">客户类型说明</h3>
+                    <div style="margin-bottom: 20px;">
+                        <h4 style="font-size: 16px; font-weight: 600; color: #1890ff; margin-bottom: 10px;">批发贸易类</h4>
+                        <p style="font-size: 14px; color: #666; margin-bottom: 8px;"><strong style="color: #333;">核心判断标准：</strong>1.单次采购为整车量级；2.车型规格涵盖 4.2 米、6.8 米、9.6米；3.采购量达对应车型满载/准满载标准</p>
+                        <p style="font-size: 14px; color: #666;"><strong style="color: #333;">需求特点：</strong>1.采购量大，合作频次稳定；2.对供货时效、产品一致性要求高；3.重视批量采购价格优势与长期供货稳定</p>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <h4 style="font-size: 16px; font-weight: 600; color: #1890ff; margin-bottom: 10px;">电商平台类</h4>
+                        <p style="font-size: 14px; color: #666; margin-bottom: 8px;"><strong style="color: #333;">核心判断标准：</strong>1.单次采购为整车小码规格货品；2.货品需符合电商分装、物流、销售标准；3.订单具备持续性与稳定性</p>
+                        <p style="font-size: 14px; color: #666;"><strong style="color: #333;">需求特点：</strong>1.对包装标准化、溯源信息完整性要求高；2.需匹配电商仓储入库、分拣发货流程；3.关注库存周转率与供货节奏同步</p>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <h4 style="font-size: 16px; font-weight: 600; color: #1890ff; margin-bottom: 10px;">配送零售类</h4>
+                        <p style="font-size: 14px; color: #666; margin-bottom: 8px;"><strong style="color: #333;">核心判断标准：</strong>1.采购辐射范围为周边鸡场；2.单次采购量 10-200 件；3.采购模式为小批量、多频次补货</p>
+                        <p style="font-size: 14px; color: #666;"><strong style="color: #333;">需求特点：</strong>1.采购半径小，对配送时效要求极高；2.极度关注货品新鲜度与品质稳定性；3.需求存在应急补货场景</p>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <h4 style="font-size: 16px; font-weight: 600; color: #1890ff; margin-bottom: 10px;">次品蛋专项类</h4>
+                        <p style="font-size: 14px; color: #666; margin-bottom: 8px;"><strong style="color: #333;">核心判断标准：</strong>1.采购品类仅限次品蛋(下架蛋、裂纹蛋)；2.不涉及任何合格商品蛋；3.采购用途为食品深加工/饲料原料等</p>
+                        <p style="font-size: 14px; color: #666;"><strong style="color: #333;">需求特点：</strong>1.对价格敏感度极高；2.不关注货品外观品相；3.要求货源稳定、批次可控</p>
+                    </div>
+                    <div style="margin-bottom: 20px;">
+                        <h4 style="font-size: 16px; font-weight: 600; color: #1890ff; margin-bottom: 10px;">其他类型</h4>
+                        <p style="font-size: 14px; color: #666; margin-bottom: 8px;"><strong style="color: #333;">核心判断标准：</strong>其他核心判断标准</p>
+                        <p style="font-size: 14px; color: #666;"><strong style="color: #333;">需求特点：</strong>其他需求特点</p>
+                    </div>
+                    <div style="text-align: center; margin-top: 24px;">
+                        <button onclick="closeTypeHelpModal()" style="padding: 10px 24px; border: none; border-radius: 4px; font-size: 14px; color: white; background-color: #1890ff; cursor: pointer; transition: all 0.3s ease;">知道了</button>
+                    </div>
+                </div>
+            </div>
+        `;
+        
         // 添加弹窗到页面
         document.body.insertAdjacentHTML('beforeend', followupModalHTML);
         document.body.insertAdjacentHTML('beforeend', returnModalHTML);
         document.body.insertAdjacentHTML('beforeend', jianDaoYunModalHTML);
         document.body.insertAdjacentHTML('beforeend', assignModalHTML);
         document.body.insertAdjacentHTML('beforeend', alertModalHTML);
+        document.body.insertAdjacentHTML('beforeend', typeHelpModalHTML);
+        
+        // 为模态框添加点击外部关闭功能
+        function addModalOutsideClose(modalId) {
+            const modal = document.getElementById(modalId);
+            if (modal) {
+                modal.addEventListener('click', function(e) {
+                    // 点击的是模态框背景本身而不是内容
+                    if (e.target === modal) {
+                        // 根据不同模态框调用对应的关闭函数
+                        if (modalId === 'followupModal') {
+                            closeFollowupModal();
+                        } else if (modalId === 'returnModal') {
+                            closeReturnModal();
+                        } else if (modalId === 'jianDaoYunModal') {
+                            closeJianDaoYunModal();
+                        } else if (modalId === 'alertModal') {
+                            closeAlertModal();
+                        } else if (modalId === 'assignModal') {
+                            closeAssignModal();
+                        } else if (modalId === 'typeHelpModal') {
+                            closeTypeHelpModal();
+                        }
+                    }
+                });
+            }
+        }
+        
+        // 为所有模态框添加点击外部关闭功能
+        addModalOutsideClose('followupModal');
+        addModalOutsideClose('returnModal');
+        addModalOutsideClose('jianDaoYunModal');
+        addModalOutsideClose('alertModal');
+        addModalOutsideClose('assignModal');
+        addModalOutsideClose('typeHelpModal');
+        
+        function showTypeHelp() {
+            document.getElementById('typeHelpModal').style.display = 'block';
+            // 防止背景滚动
+            document.body.style.overflow = 'hidden';
+        }
+        
+        function closeTypeHelpModal() {
+            document.getElementById('typeHelpModal').style.display = 'none';
+            // 恢复背景滚动
+            document.body.style.overflow = 'auto';
+        }
+        
+        // 搜索选择组件相关函数
+        let currentOpenSelect = null;
+        
+        // 切换搜索选择下拉框
+        function toggleSearchSelect(selectId) {
+            const dropdown = document.getElementById(selectId + 'Dropdown');
+            const searchInput = document.getElementById(selectId + 'Search');
+            
+            // 关闭其他已打开的选择框
+            if (currentOpenSelect && currentOpenSelect !== selectId) {
+                closeSearchSelect(currentOpenSelect);
+            }
+            
+            // 切换当前选择框
+            if (dropdown.style.display === 'block') {
+                closeSearchSelect(selectId);
+                currentOpenSelect = null;
+            } else {
+                dropdown.style.display = 'block';
+                searchInput.style.display = 'block';
+                searchInput.focus();
+                currentOpenSelect = selectId;
+            }
+        }
+        
+        // 关闭搜索选择下拉框
+        function closeSearchSelect(selectId) {
+            const dropdown = document.getElementById(selectId + 'Dropdown');
+            const searchInput = document.getElementById(selectId + 'Search');
+            dropdown.style.display = 'none';
+            searchInput.style.display = 'none';
+            searchInput.value = '';
+            // 显示所有选项
+            const options = dropdown.querySelectorAll('.search-select-option');
+            options.forEach(option => {
+                option.style.display = 'block';
+            });
+        }
+        
+        // 过滤地区选项
+        function filterRegions() {
+            const searchInput = document.getElementById('followupRegionSearch');
+            const filter = searchInput.value.toLowerCase();
+            const dropdown = document.getElementById('followupRegionDropdown');
+            const options = dropdown.querySelectorAll('.search-select-option');
+            
+            options.forEach(option => {
+                const text = option.textContent.toLowerCase();
+                if (text.includes(filter)) {
+                    option.style.display = 'block';
+                } else {
+                    option.style.display = 'none';
+                }
+            });
+        }
+        
+        // 选择地区
+        function selectRegion(region) {
+            const display = document.getElementById('followupRegionDisplay');
+            const hiddenInput = document.getElementById('followupRegion');
+            
+            if (region) {
+                display.textContent = region;
+                display.style.color = '#333';
+            } else {
+                display.textContent = '请选择客户地区';
+                display.style.color = '#999';
+            }
+            
+            hiddenInput.value = region;
+            closeSearchSelect('followupRegion');
+            currentOpenSelect = null;
+        }
+        
+        // 点击外部关闭下拉框
+        document.addEventListener('click', function(event) {
+            if (!event.target.closest('.search-select')) {
+                if (currentOpenSelect) {
+                    closeSearchSelect(currentOpenSelect);
+                    currentOpenSelect = null;
+                }
+            }
+        });
         
         function formatDateTime(dateTimeString) {
             if (!dateTimeString) return '-';
@@ -1008,7 +2015,12 @@
                 'buyer': '大贸易客户',
                 'seller': '供应商',
                 'both': '两者都是',
-                'smalls': '小品种客户'
+                'smalls': '小品种客户',
+                'wholesale': '批发贸易类',
+                'e-commerce': '电商平台类',
+                'delivery_retail': '配送零售类',
+                'defective_egg': '次品蛋专项类',
+                'other': '其他类型'
             };
             return typeMap[type] || type;
         }
@@ -1079,11 +2091,21 @@
                     
                     // 根据筛选条件过滤
                     if (personalFilter === 'followed') {
-                        return user.followup && user.followup !== '';
+                        if (!(user.followup && user.followup !== '')) {
+                            return false;
+                        }
                     } else if (personalFilter === 'unfollowed') {
-                        return !user.followup || user.followup === '';
+                        if (!(!user.followup || user.followup === '')) {
+                            return false;
+                        }
                     }
-                    // 'all' 或其他情况，不过滤
+                    
+                    // 按负责人筛选
+                    if (currentManagerFilter) {
+                        return user.managerName === currentManagerFilter;
+                    }
+                    
+                    // 其他情况，不过滤
                     return true;
                 });
                 
@@ -1114,7 +2136,7 @@
                         
                         // 只对管理员显示负责人信息
                         if (userRole === '管理员') {
-                            managerCell = '<td>' + (user.managerName || '-') + '</td>';
+                            managerCell = '<td style="cursor: pointer;">' + (user.managerName || '-') + '</td>';
                         } else {
                             managerCell = '<td style="display: none;"></td>';
                         }
@@ -1190,7 +2212,16 @@
             if (data.users && data.users.length > 0) {
                 publicEmpty.style.display = 'none';
                 var filteredUsers = data.users.filter(function(user) {
-                    return user.type !== 'Colleague';
+                    if (user.type === 'Colleague') {
+                        return false;
+                    }
+                    
+                    // 按负责人筛选
+                    if (currentManagerFilter) {
+                        return user.managerName === currentManagerFilter;
+                    }
+                    
+                    return true;
                 });
                 
                 if (filteredUsers.length > 0) {
@@ -1246,7 +2277,7 @@
                 role: usersManagements.role || ''
             };
             
-            var url = 'http://8.137.125.67:8083/KH/api/users/claim';
+            var url = '/KH/api/users/claim';
             
             var xhr = new XMLHttpRequest();
             xhr.open('POST', url, true);
@@ -1273,17 +2304,48 @@
             document.getElementById('followupPhone').value = phone;
             document.getElementById('followupContent').value = '';
             document.getElementById('followupModal').style.display = 'block';
+            // 防止背景滚动
+            document.body.style.overflow = 'hidden';
         }
         
         function closeFollowupModal() {
             document.getElementById('followupModal').style.display = 'none';
+            // 恢复背景滚动
+            document.body.style.overflow = 'auto';
         }
         
         function saveFollowup() {
             var userId = document.getElementById('followupUserId').value;
             var content = document.getElementById('followupContent').value;
+            var type = document.getElementById('followupType').value;
+            var level = document.getElementById('followupLevel').value;
+            var detailedAddress = document.getElementById('followupDetailedAddress').value;
+            var company = document.getElementById('followupCompany').value;
+            var demand = document.getElementById('followupDemand').value;
+            var region = document.getElementById('followupRegion').value;
             var usersManagements = userInfo.usersManagements;
             
+            // 验证必填字段
+            if (!type) {
+                showAlert('请选择客户类型');
+                return;
+            }
+            if (!level) {
+                showAlert('请选择客户等级');
+                return;
+            }
+            if (!demand) {
+                showAlert('请选择客户需求');
+                return;
+            }
+            if (!region) {
+                showAlert('请选择客户地区');
+                return;
+            }
+            if (!company) {
+                showAlert('请填写客户公司');
+                return;
+            }
             if (!content) {
                 showAlert('请填写跟进内容');
                 return;
@@ -1292,6 +2354,12 @@
             var params = {
                 userId: userId,
                 followup: content,
+                type: type,
+                level: level,
+                detailedaddress: detailedAddress,
+                company: company,
+                demand: demand,
+                region: region,
                 userName: usersManagements.userName || '',
                 managercompany: usersManagements.managercompany || '',
                 managerdepartment: usersManagements.managerdepartment || '',
@@ -1299,7 +2367,7 @@
                 role: usersManagements.role || ''
             };
             
-            var url = 'http://8.137.125.67:8083/KH/api/users/followup';
+            var url = '/KH/api/users/followup';
             
             var xhr = new XMLHttpRequest();
             xhr.open('POST', url, true);
@@ -1330,10 +2398,14 @@
             document.getElementById('returnPhone').value = phone;
             document.getElementById('returnType').value = type || '采购员';
             document.getElementById('returnModal').style.display = 'block';
+            // 防止背景滚动
+            document.body.style.overflow = 'hidden';
         }
         
         function closeReturnModal() {
             document.getElementById('returnModal').style.display = 'none';
+            // 恢复背景滚动
+            document.body.style.overflow = 'auto';
         }
         
         function openJianDaoYunModal(userId, userName, followup) {
@@ -1344,19 +2416,31 @@
             }
             document.getElementById('jianDaoYunUserId').value = userId;
             document.getElementById('jianDaoYunModal').style.display = 'block';
+            // 防止背景滚动
+            document.body.style.overflow = 'hidden';
         }
         
         function closeJianDaoYunModal() {
             document.getElementById('jianDaoYunModal').style.display = 'none';
+            // 恢复背景滚动
+            document.body.style.overflow = 'auto';
         }
         
         function showAlert(message) {
             document.getElementById('alertMessage').textContent = message;
             document.getElementById('alertModal').style.display = 'block';
+            // 防止背景滚动
+            document.body.style.overflow = 'hidden';
+        }
+        
+        function updateManagerHeaderStyle() {
+            // 移除表头样式更新，保持默认样式
         }
         
         function closeAlertModal() {
             document.getElementById('alertModal').style.display = 'none';
+            // 恢复背景滚动
+            document.body.style.overflow = 'auto';
         }
         
         function saveJianDaoYun() {
@@ -1372,7 +2456,7 @@
                 role: usersManagements.role || ''
             };
             
-            var url = 'http://8.137.125.67:8083/KH/api/users/jianDaoYun';
+            var url = '/KH/api/users/jianDaoYun';
             
             var xhr = new XMLHttpRequest();
             xhr.open('POST', url, true);
@@ -1408,7 +2492,7 @@
                 role: usersManagements.role || ''
             };
             
-            var url = 'http://8.137.125.67:8083/KH/api/users/return';
+            var url = '/KH/api/users/return';
             
             var xhr = new XMLHttpRequest();
             xhr.open('POST', url, true);
diff --git a/web/src/test/java/com/example/WebApplicationTests.java b/web/src/test/java/com/example/WebApplicationTests.java
index 6a70368..fec2b0b 100644
--- a/web/src/test/java/com/example/WebApplicationTests.java
+++ b/web/src/test/java/com/example/WebApplicationTests.java
@@ -3,7 +3,7 @@ package com.example;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
+@SpringBootTest(classes = com.example.web.WebApplication.class)
 class WebApplicationTests {
 
     @Test