添加浏览器自动化测试

@@ -184,3 +184,4 @@ public class DeliveryMainController {
 
 
 
 
 
 
+

@@ -187,3 +187,4 @@ public class InvoiceMainController {
 
 
 
 
 
 
+

@@ -63,3 +63,4 @@ public class DeliveryAddReq {
 
 
 
 
 
 
+

@@ -39,3 +39,4 @@ public class DeliveryItemAddReq {
 
 
 
 
 
 
+

@@ -61,3 +61,4 @@ public class DeliveryItemRes {
 
 
 
 
 
 
+

@@ -42,3 +42,4 @@ public class DeliveryItemUpdateReq {
 
 
 
 
 
 
+

@@ -69,3 +69,4 @@ public class DeliveryRes {
 
 
 
 
 
 
+

@@ -67,3 +67,4 @@ public class DeliveryUpdateReq {
 
 
 
 
 
 
+

@@ -44,3 +44,4 @@ public class InvoiceItemAddReq {
 
 
 
 
 
 
+

@@ -64,3 +64,4 @@ public class InvoiceItemRes {
 
 
 
 
 
 
+

@@ -47,3 +47,4 @@ public class InvoiceItemUpdateReq {
 
 
 
 
 
 
+

@@ -57,3 +57,4 @@ public class InvoiceQueryReq {
 
 
 
 
 
 
+

@@ -68,3 +68,4 @@ public class DeliveryItem {
 
 
 
 
 
 
+

@@ -74,3 +74,4 @@ public class InvoiceItem {
 
 
 
 
 
 
+

@@ -83,3 +83,4 @@ public class InvoiceMain {
 
 
 
 
 
 
+

@@ -16,3 +16,4 @@ public interface DeliveryItemMapper extends BaseMapper<DeliveryItem> {
 
 
 
 
 
 
+

@@ -16,3 +16,4 @@ public interface InvoiceItemMapper extends BaseMapper<InvoiceItem> {
 
 
 
 
 
 
+

@@ -16,3 +16,4 @@ public interface InvoiceMainMapper extends BaseMapper<InvoiceMain> {
 
 
 
 
 
 
+

@@ -85,3 +85,4 @@ public interface DeliveryMainService extends IService<DeliveryMain> {
 
 
 
 
 
 
+

@@ -85,3 +85,4 @@ public interface InvoiceMainService extends IService<InvoiceMain> {
 
 
 
 
 
 
+

+# 浏览器自动化测试
+
+基于 Python 3.7.8 和 Playwright 的 Apple ERP 系统浏览器自动化测试框架。
+
+## 环境要求
+
+- Python 3.7.8+
+- Playwright 浏览器自动化框架
+
+## 安装依赖
+
+```bash
+# 安装 Python 依赖
+pip install -r requirements.txt
+
+# 安装 Playwright 浏览器
+playwright install chromium
+```
+
+## 项目结构
+
+```
+tests/browser/
+├── __init__.py                 # 包初始化
+├── base_test.py               # 基础测试类
+├── test_login.py              # 登录功能测试
+├── test_order_management.py   # 订单管理功能测试
+├── test_runner.py             # 测试运行器
+├── requirements.txt           # 依赖文件
+├── README.md                  # 说明文档
+├── screenshots/               # 测试截图目录
+└── reports/                   # 测试报告目录
+```
+
+## 使用方法
+
+### 1. 单独运行测试
+
+```bash
+# 运行登录测试
+python test_login.py
+
+# 运行订单管理测试
+python test_order_management.py
+```
+
+### 2. 运行所有测试
+
+```bash
+# 运行所有测试并生成报告
+python test_runner.py
+```
+
+### 3. 环境变量配置
+
+```bash
+# 设置前端应用地址（默认: http://localhost:3000）
+export FRONTEND_URL=http://localhost:3000
+
+# 设置浏览器模式（默认: 非无头模式）
+export HEADLESS=false
+```
+
+## 测试功能
+
+### 登录测试 (test_login.py)
+
+- ✅ 成功登录测试
+- ✅ 无效用户名测试
+- ✅ 无效密码测试
+- ✅ 空凭据测试
+- ✅ 记住我功能测试
+
+### 订单管理测试 (test_order_management.py)
+
+- ✅ 订单列表显示测试
+- ✅ 按订单编号搜索测试
+- ✅ 按经销商搜索测试
+- ✅ 订单状态筛选测试
+- ✅ 重置搜索测试
+- ✅ 分页功能测试
+- ✅ 表格操作测试
+- ✅ 操作按钮测试
+
+## 测试报告
+
+测试完成后会自动生成两种格式的报告：
+
+### HTML 报告
+- 美观的可视化界面
+- 测试统计信息
+- 详细的测试结果
+- 截图链接
+
+### JSON 报告
+- 机器可读的格式
+- 完整的测试数据
+- 便于集成到CI/CD
+
+## 截图功能
+
+- 每个测试步骤都会自动截图
+- 失败测试会额外截图错误状态
+- 截图保存在 `screenshots/` 目录
+- 支持全页面截图
+
+## 配置选项
+
+### BaseBrowserTest 配置
+
+```python
+# 创建测试实例
+test = BaseBrowserTest(
+    headless=False,    # 是否无头模式
+    slow_mo=500        # 操作间隔时间（毫秒）
+)
+```
+
+### 元素定位策略
+
+基于前端代码分析，使用以下定位策略：
+
+**登录页面元素：**
+- 用户名输入框: `input[placeholder="请输入用户名"]`
+- 密码输入框: `input[placeholder="请输入密码"]`
+- 登录按钮: `button:has-text("登录")`
+- 记住我复选框: `input[type="checkbox"]`
+
+**订单管理页面元素：**
+- 订单编号搜索: `input[placeholder="请输入订单编号"]`
+- 经销商编码搜索: `input[placeholder="请输入经销商编码"]`
+- 经销商名称搜索: `input[placeholder="请输入经销商名称"]`
+- 搜索按钮: `button:has-text("🔍 搜索")`
+- 重置按钮: `button:has-text("🔄 重置")`
+- 数据表格: `.data-table`
+
+## 扩展测试
+
+### 添加新的测试用例
+
+1. 继承 `BaseBrowserTest` 类
+2. 实现测试方法
+3. 使用提供的辅助方法进行元素操作
+4. 添加截图和断言
+
+```python
+class MyTest(BaseBrowserTest):
+    def test_my_feature(self):
+        # 设置页面
+        self.setup_my_page()
+        
+        # 执行测试操作
+        self.click_element('button:has-text("我的按钮")')
+        
+        # 验证结果
+        assert self.is_element_visible('.success-message')
+        
+        # 截图
+        self.take_screenshot('my_test_result')
+```
+
+### 自定义测试运行器
+
+```python
+def run_my_tests():
+    test = MyTest(headless=False, slow_mo=500)
+    
+    tests = [
+        ('我的测试1', test.test_feature_1),
+        ('我的测试2', test.test_feature_2),
+    ]
+    
+    results = []
+    for test_name, test_func in tests:
+        result = test.run_test(test_name, test_func)
+        results.append(result)
+    
+    return results
+```
+
+## 故障排除
+
+### 常见问题
+
+1. **浏览器启动失败**
+   ```bash
+   # 重新安装浏览器
+   playwright install chromium
+   ```
+
+2. **元素定位失败**
+   - 检查页面是否完全加载
+   - 增加等待时间
+   - 使用更精确的选择器
+
+3. **截图保存失败**
+   - 确保 `screenshots/` 目录存在
+   - 检查文件权限
+
+4. **测试超时**
+   - 增加超时时间
+   - 检查网络连接
+   - 确认前端服务正常运行
+
+### 调试技巧
+
+1. **使用非无头模式**
+   ```python
+   test = BaseBrowserTest(headless=False, slow_mo=1000)
+   ```
+
+2. **增加等待时间**
+   ```python
+   self.page.wait_for_timeout(2000)  # 等待2秒
+   ```
+
+3. **查看页面内容**
+   ```python
+   print(self.page.content())  # 打印页面HTML
+   ```
+
+4. **检查元素状态**
+   ```python
+   print(self.page.is_visible('selector'))  # 检查元素可见性
+   ```
+
+## 最佳实践
+
+1. **测试独立性**: 每个测试都应该独立运行
+2. **数据清理**: 测试后清理测试数据
+3. **错误处理**: 适当的异常处理和重试机制
+4. **截图记录**: 关键步骤都要截图
+5. **断言验证**: 使用明确的断言验证结果
+6. **性能考虑**: 合理设置等待时间和超时
+
+## 持续集成
+
+可以将测试集成到CI/CD流程中：
+
+```yaml
+# GitHub Actions 示例
+- name: Run Browser Tests
+  run: |
+    cd tests/browser
+    pip install -r requirements.txt
+    playwright install chromium
+    python test_runner.py
+```
+
+## 许可证
+
+本项目遵循 MIT 许可证。

+"""Browser automation tests package (Python 3.7.8 compatible)."""

+"""
+基础测试类 - 提供通用的浏览器自动化测试功能
+Python 3.7.8 兼容
+"""
+
+import os
+import time
+from datetime import datetime
+from typing import Optional, Dict, Any
+from playwright.sync_api import sync_playwright, Page, Browser, BrowserContext
+
+
+class BaseBrowserTest:
+    """浏览器自动化测试基类"""
+    
+    def __init__(self, headless: bool = False, slow_mo: int = 100):
+        """
+        初始化浏览器测试
+        
+        Args:
+            headless: 是否无头模式运行
+            slow_mo: 操作间隔时间（毫秒）
+        """
+        self.headless = headless
+        self.slow_mo = slow_mo
+        self.playwright = None
+        self.browser: Optional[Browser] = None
+        self.context: Optional[BrowserContext] = None
+        self.page: Optional[Page] = None
+        
+        # 测试配置
+        self.base_url = os.environ.get('FRONTEND_URL', 'http://localhost:3001')
+        self.screenshots_dir = os.path.join(os.path.dirname(__file__), 'screenshots')
+        self.reports_dir = os.path.join(os.path.dirname(__file__), 'reports')
+        
+        # 创建必要的目录
+        os.makedirs(self.screenshots_dir, exist_ok=True)
+        os.makedirs(self.reports_dir, exist_ok=True)
+    
+    def setup_browser(self) -> None:
+        """启动浏览器"""
+        self.playwright = sync_playwright().start()
+        
+        # 启动浏览器（使用Chromium）
+        self.browser = self.playwright.chromium.launch(
+            headless=self.headless,
+            slow_mo=self.slow_mo,
+            args=['--no-sandbox', '--disable-dev-shm-usage']
+        )
+        
+        # 创建浏览器上下文
+        self.context = self.browser.new_context(
+            viewport={'width': 1920, 'height': 1080},
+            user_agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
+        )
+        
+        # 创建新页面
+        self.page = self.context.new_page()
+        
+        # 设置默认超时时间
+        self.page.set_default_timeout(30000)  # 30秒
+    
+    def teardown_browser(self) -> None:
+        """关闭浏览器"""
+        if self.page:
+            self.page.close()
+        if self.context:
+            self.context.close()
+        if self.browser:
+            self.browser.close()
+        if self.playwright:
+            self.playwright.stop()
+    
+    def take_screenshot(self, name: str = None) -> str:
+        """
+        截图
+        
+        Args:
+            name: 截图文件名（不包含扩展名）
+            
+        Returns:
+            截图文件路径
+        """
+        if not name:
+            timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
+            name = f'screenshot_{timestamp}'
+        
+        screenshot_path = os.path.join(self.screenshots_dir, f'{name}.png')
+        self.page.screenshot(path=screenshot_path, full_page=True)
+        print(f"截图已保存: {screenshot_path}")
+        return screenshot_path
+    
+    def wait_for_element(self, selector: str, timeout: int = 10000) -> None:
+        """
+        等待元素出现
+        
+        Args:
+            selector: CSS选择器
+            timeout: 超时时间（毫秒）
+        """
+        self.page.wait_for_selector(selector, timeout=timeout)
+    
+    def wait_for_text(self, text: str, timeout: int = 10000) -> None:
+        """
+        等待文本出现
+        
+        Args:
+            text: 要等待的文本
+            timeout: 超时时间（毫秒）
+        """
+        self.page.wait_for_selector(f"text={text}", timeout=timeout)
+    
+    def fill_input(self, selector: str, value: str) -> None:
+        """
+        填充输入框
+        
+        Args:
+            selector: CSS选择器
+            value: 要输入的值
+        """
+        self.page.fill(selector, value)
+    
+    def click_element(self, selector: str) -> None:
+        """
+        点击元素
+        
+        Args:
+            selector: CSS选择器
+        """
+        self.page.click(selector)
+    
+    def select_option(self, selector: str, value: str) -> None:
+        """
+        选择下拉框选项
+        
+        Args:
+            selector: CSS选择器
+            value: 选项值
+        """
+        self.page.select_option(selector, value)
+    
+    def get_text(self, selector: str) -> str:
+        """
+        获取元素文本
+        
+        Args:
+            selector: CSS选择器
+            
+        Returns:
+            元素文本内容
+        """
+        return self.page.text_content(selector)
+    
+    def get_element_count(self, selector: str) -> int:
+        """
+        获取元素数量
+        
+        Args:
+            selector: CSS选择器
+            
+        Returns:
+            元素数量
+        """
+        return self.page.locator(selector).count()
+    
+    def is_element_visible(self, selector: str) -> bool:
+        """
+        检查元素是否可见
+        
+        Args:
+            selector: CSS选择器
+            
+        Returns:
+            元素是否可见
+        """
+        return self.page.is_visible(selector)
+    
+    def navigate_to(self, url: str) -> None:
+        """
+        导航到指定URL
+        
+        Args:
+            url: 目标URL
+        """
+        self.page.goto(url)
+        self.page.wait_for_load_state('networkidle')
+    
+    def login(self, username: str = 'admin', password: str = 'password') -> bool:
+        """
+        登录系统
+        
+        Args:
+            username: 用户名
+            password: 密码
+            
+        Returns:
+            登录是否成功
+        """
+        try:
+            # 导航到登录页面
+            self.navigate_to(self.base_url)
+            
+            # 等待登录表单加载
+            self.wait_for_element('input[placeholder="请输入用户名"]')
+            
+            # 填写用户名
+            self.fill_input('input[placeholder="请输入用户名"]', username)
+            
+            # 填写密码
+            self.fill_input('input[placeholder="请输入密码"]', password)
+            
+            # 点击登录按钮
+            self.click_element('button:has-text("登录")')
+            
+            # 等待登录完成（检查是否跳转到首页或出现错误）
+            try:
+                # 等待页面跳转或出现成功/失败提示
+                self.page.wait_for_load_state('networkidle', timeout=10000)
+                
+                # 检查是否成功登录（通过URL或页面元素判断）
+                current_url = self.page.url
+                
+                # 等待页面完全加载
+                self.page.wait_for_timeout(2000)
+                
+                # 检查是否有错误提示
+                error_indicators = [
+                    'text=用户名或密码错误',
+                    'text=登录失败',
+                    'text=Invalid',
+                    'text=Error',
+                    '.error',
+                    '.alert-danger'
+                ]
+                
+                has_error = False
+                for indicator in error_indicators:
+                    if self.is_element_visible(indicator):
+                        has_error = True
+                        print(f"发现错误提示: {indicator}")
+                        break
+                
+                # 检查是否跳转到其他页面（表示登录成功）
+                if has_error:
+                    print(f"登录失败，发现错误提示，当前URL: {current_url}")
+                    return False
+                elif 'dashboard' in current_url or 'main' in current_url:
+                    print(f"登录成功，当前URL: {current_url}")
+                    return True
+                elif current_url == self.base_url or current_url == f'{self.base_url}/':
+                    print(f"登录失败，仍在登录页面，当前URL: {current_url}")
+                    return False
+                else:
+                    print(f"登录状态不明确，当前URL: {current_url}")
+                    return False
+                    
+            except Exception as e:
+                print(f"登录等待超时: {e}")
+                return False
+                
+        except Exception as e:
+            print(f"登录过程出错: {e}")
+            self.take_screenshot('login_error')
+            return False
+    
+    def run_test(self, test_name: str, test_func) -> Dict[str, Any]:
+        """
+        运行测试并生成报告
+        
+        Args:
+            test_name: 测试名称
+            test_func: 测试函数
+            
+        Returns:
+            测试结果字典
+        """
+        start_time = datetime.now()
+        result = {
+            'test_name': test_name,
+            'start_time': start_time.isoformat(),
+            'success': False,
+            'error': None,
+            'screenshots': [],
+            'duration': 0
+        }
+        
+        try:
+            print(f"\n{'='*50}")
+            print(f"开始测试: {test_name}")
+            print(f"{'='*50}")
+            
+            # 设置浏览器
+            self.setup_browser()
+            
+            # 执行测试
+            test_func()
+            
+            result['success'] = True
+            print(f"✅ 测试通过: {test_name}")
+            
+        except Exception as e:
+            result['error'] = str(e)
+            print(f"❌ 测试失败: {test_name}")
+            print(f"错误信息: {e}")
+            
+            # 失败时截图
+            screenshot_path = self.take_screenshot(f'{test_name}_error')
+            result['screenshots'].append(screenshot_path)
+            
+        finally:
+            # 清理资源
+            self.teardown_browser()
+            
+            # 计算耗时
+            end_time = datetime.now()
+            result['end_time'] = end_time.isoformat()
+            result['duration'] = (end_time - start_time).total_seconds()
+            
+            print(f"测试耗时: {result['duration']:.2f}秒")
+        
+        return result

+# 浏览器自动化测试依赖
+# Python 3.7.8 兼容
+
+# Playwright 浏览器自动化框架
+playwright==1.35.0
+
+# 其他依赖
+requests>=2.25.0

+"""
+登录功能自动化测试
+Python 3.7.8 兼容
+"""
+
+from base_test import BaseBrowserTest
+
+
+class LoginTest(BaseBrowserTest):
+    """登录测试类"""
+    
+    def test_successful_login(self):
+        """测试成功登录"""
+        # 测试正常登录
+        success = self.login('admin', 'password')
+        assert success, "登录应该成功"
+        
+        # 截图验证登录状态
+        self.take_screenshot('login_success')
+        
+        # 验证登录后的页面元素
+        # 这里可以根据实际登录后的页面结构添加验证
+        print("登录成功测试通过")
+    
+    def test_invalid_username(self):
+        """测试无效用户名"""
+        # 测试错误用户名
+        success = self.login('invalid_user', 'password')
+        assert not success, "使用无效用户名登录应该失败"
+        
+        # 截图验证错误状态
+        self.take_screenshot('login_invalid_username')
+        
+        print("无效用户名测试通过")
+    
+    def test_invalid_password(self):
+        """测试无效密码"""
+        # 测试错误密码
+        success = self.login('admin', 'wrong_password')
+        assert not success, "使用无效密码登录应该失败"
+        
+        # 截图验证错误状态
+        self.take_screenshot('login_invalid_password')
+        
+        print("无效密码测试通过")
+    
+    def test_empty_credentials(self):
+        """测试空凭据"""
+        # 导航到登录页面
+        self.navigate_to(self.base_url)
+        
+        # 等待登录表单
+        self.wait_for_element('input[placeholder="请输入用户名"]')
+        
+        # 不填写任何信息，直接点击登录
+        self.click_element('button:has-text("登录")')
+        
+        # 截图验证错误提示
+        self.take_screenshot('login_empty_credentials')
+        
+        print("空凭据测试通过")
+    
+    def test_remember_me(self):
+        """测试记住我功能"""
+        # 导航到登录页面
+        self.navigate_to(self.base_url)
+        
+        # 等待登录表单
+        self.wait_for_element('input[placeholder="请输入用户名"]')
+        
+        # 填写用户名和密码
+        self.fill_input('input[placeholder="请输入用户名"]', 'admin')
+        self.fill_input('input[placeholder="请输入密码"]', 'password')
+        
+        # 勾选记住我
+        self.click_element('input[type="checkbox"]')
+        
+        # 点击登录
+        self.click_element('button:has-text("登录")')
+        
+        # 截图验证
+        self.take_screenshot('login_remember_me')
+        
+        print("记住我功能测试通过")
+
+
+def run_login_tests():
+    """运行所有登录测试"""
+    test = LoginTest(headless=False, slow_mo=500)  # 非无头模式，慢速执行便于观察
+    
+    tests = [
+        ('成功登录测试', test.test_successful_login),
+        ('无效用户名测试', test.test_invalid_username),
+        ('无效密码测试', test.test_invalid_password),
+        ('空凭据测试', test.test_empty_credentials),
+        ('记住我功能测试', test.test_remember_me),
+    ]
+    
+    results = []
+    for test_name, test_func in tests:
+        result = test.run_test(test_name, test_func)
+        results.append(result)
+    
+    # 打印测试总结
+    print(f"\n{'='*60}")
+    print("登录测试总结")
+    print(f"{'='*60}")
+    
+    passed = sum(1 for r in results if r['success'])
+    total = len(results)
+    
+    for result in results:
+        status = "✅ 通过" if result['success'] else "❌ 失败"
+        print(f"{result['test_name']}: {status} ({result['duration']:.2f}s)")
+        if result['error']:
+            print(f"  错误: {result['error']}")
+    
+    print(f"\n总计: {passed}/{total} 个测试通过")
+    
+    return results
+
+
+if __name__ == '__main__':
+    run_login_tests()

+"""
+订单管理功能自动化测试
+Python 3.7.8 兼容
+"""
+
+from datetime import datetime
+from base_test import BaseBrowserTest
+
+
+class OrderManagementTest(BaseBrowserTest):
+    """订单管理测试类"""
+    
+    def setup_order_page(self):
+        """设置订单管理页面"""
+        # 先登录
+        login_success = self.login('admin', 'password')
+        if not login_success:
+            raise Exception("登录失败，无法继续订单管理测试")
+        
+        # 导航到订单管理页面
+        self.navigate_to(f'{self.base_url}/main/order')
+        
+        # 等待页面加载
+        self.wait_for_element('.order-container')
+        self.wait_for_element('.search-section')
+        
+        print("订单管理页面加载完成")
+    
+    def test_order_list_display(self):
+        """测试订单列表显示"""
+        
+        # 等待数据表格加载
+        self.wait_for_element('.data-table')
+        
+        # 检查表格标题
+        table_headers = [
+            '订单ID', '订单编号', '经销商编码', '经销商名称', 
+            '订单日期', '订单金额', '返利金额', '出库状态', 
+            '开票状态', '返利计算', '验证状态', '创建时间', '操作'
+        ]
+        
+        for header in table_headers:
+            assert self.is_element_visible(f'th:has-text("{header}")'), f"表格标题 '{header}' 应该可见"
+        
+        # 截图验证
+        self.take_screenshot('order_list_display')
+        
+        print("订单列表显示测试通过")
+    
+    def test_order_search_by_order_no(self):
+        """测试按订单编号搜索"""
+        
+        # 等待搜索表单加载
+        self.wait_for_element('input[placeholder="请输入订单编号"]')
+        
+        # 输入订单编号进行搜索
+        test_order_no = "ORD-2024-001"
+        self.fill_input('input[placeholder="请输入订单编号"]', test_order_no)
+        
+        # 点击搜索按钮
+        self.click_element('button:has-text("🔍 搜索")')
+        
+        # 等待搜索结果
+        self.page.wait_for_load_state('networkidle')
+        
+        # 截图验证搜索结果
+        self.take_screenshot('order_search_by_order_no')
+        
+        print("按订单编号搜索测试通过")
+    
+    def test_order_search_by_dealer(self):
+        """测试按经销商搜索"""
+        
+        # 等待搜索表单加载
+        self.wait_for_element('input[placeholder="请输入经销商编码"]')
+        
+        # 输入经销商编码
+        self.fill_input('input[placeholder="请输入经销商编码"]', 'APL-DLR-001')
+        
+        # 输入经销商名称
+        self.fill_input('input[placeholder="请输入经销商名称"]', '北京经销商')
+        
+        # 点击搜索按钮
+        self.click_element('button:has-text("🔍 搜索")')
+        
+        # 等待搜索结果
+        self.page.wait_for_load_state('networkidle')
+        
+        # 截图验证搜索结果
+        self.take_screenshot('order_search_by_dealer')
+        
+        print("按经销商搜索测试通过")
+    
+    def test_order_status_filter(self):
+        """测试订单状态筛选"""
+        
+        # 测试出库状态筛选
+        self.select_option('select:has(option[value="0"])', '0')  # 未出库
+        
+        # 测试开票状态筛选
+        self.select_option('select:has(option[value="1"])', '1')  # 已开票
+        
+        # 测试返利计算状态筛选
+        self.select_option('select:has(option[value="1"])', '1')  # 已计算
+        
+        # 点击搜索按钮
+        self.click_element('button:has-text("🔍 搜索")')
+        
+        # 等待筛选结果
+        self.page.wait_for_load_state('networkidle')
+        
+        # 截图验证筛选结果
+        self.take_screenshot('order_status_filter')
+        
+        print("订单状态筛选测试通过")
+    
+    def test_reset_search(self):
+        """测试重置搜索"""
+        
+        # 先填写一些搜索条件
+        self.fill_input('input[placeholder="请输入订单编号"]', 'test')
+        self.fill_input('input[placeholder="请输入经销商编码"]', 'test')
+        self.select_option('select:has(option[value="0"])', '0')
+        
+        # 点击重置按钮
+        self.click_element('button:has-text("🔄 重置")')
+        
+        # 验证搜索条件是否被清空
+        order_no_value = self.page.input_value('input[placeholder="请输入订单编号"]')
+        dealer_code_value = self.page.input_value('input[placeholder="请输入经销商编码"]')
+        
+        assert order_no_value == '', "订单编号应该被清空"
+        assert dealer_code_value == '', "经销商编码应该被清空"
+        
+        # 截图验证重置结果
+        self.take_screenshot('reset_search')
+        
+        print("重置搜索测试通过")
+    
+    def test_pagination(self):
+        """测试分页功能"""
+        
+        # 等待分页控件加载
+        self.wait_for_element('.pagination-container', timeout=15000)
+        
+        # 检查分页控件是否存在
+        if self.is_element_visible('.pagination-container'):
+            # 尝试点击下一页（如果存在）
+            next_button = self.page.locator('button:has-text("下一页")')
+            if next_button.count() > 0 and next_button.is_enabled():
+                next_button.click()
+                self.page.wait_for_load_state('networkidle')
+                
+                # 截图验证分页结果
+                self.take_screenshot('pagination_next')
+                print("分页功能测试通过")
+            else:
+                print("分页控件存在但下一页按钮不可用，可能只有一页数据")
+                self.take_screenshot('pagination_single_page')
+        else:
+            print("未找到分页控件，可能数据较少")
+            self.take_screenshot('no_pagination')
+    
+    def test_table_operations(self):
+        """测试表格操作"""
+        
+        # 等待表格加载
+        self.wait_for_element('.data-table')
+        
+        # 测试全选功能
+        select_all_checkbox = self.page.locator('input.select-all')
+        if select_all_checkbox.count() > 0:
+            select_all_checkbox.click()
+            self.take_screenshot('table_select_all')
+        
+        # 表格控制按钮暂时不测试
+        
+        # 截图验证表格操作
+        self.take_screenshot('table_operations')
+        
+        print("表格操作测试通过")
+    
+    def test_add_order(self):
+        """测试新增订单功能"""
+        
+        # 等待操作按钮区域加载
+        self.wait_for_element('.action-section')
+        
+        # 点击新增按钮
+        if self.is_element_visible('button:has-text("✨ 新增")'):
+            print("找到新增按钮，开始点击...")
+            # 确保页面稳定后再点击
+            self.page.wait_for_load_state('networkidle')
+            self.click_element('button:has-text("✨ 新增")')
+            self.page.wait_for_timeout(3000)  # 等待弹窗打开
+            
+            # 检查是否打开了新增订单的弹窗
+            if self.is_element_visible('.dialog-overlay'):
+                print("✅ 新增订单弹窗已打开")
+                # 等待弹窗完全加载
+                self.page.wait_for_timeout(1000)
+                self.take_screenshot('add_order_dialog_opened')
+                
+                # 1. 填写订单编号 - 使用最精确的选择器，只在弹窗内操作
+                order_no = 'TEST-ORDER-0001'
+                order_no_selectors = [
+                    '.dialog-content input.form-input[placeholder="请输入订单编号"]',  # 最精确：弹窗内的表单输入框
+                    '.dialog-overlay input.form-input[placeholder="请输入订单编号"]',  # 弹窗覆盖层内的表单输入框
+                    '.form-section input.form-input[placeholder="请输入订单编号"]',  # 表单区域内的输入框
+                    'input.form-input[placeholder="请输入订单编号"]:not(.search-input)'  # 排除搜索框的表单输入框
+                ]
+                
+                order_no_filled = False
+                for selector in order_no_selectors:
+                    if self.is_element_visible(selector):
+                        print(f"找到订单编号输入框: {selector}")
+                        try:
+                            # 先清空输入框
+                            self.page.fill(selector, '')
+                            self.page.wait_for_timeout(200)
+                            
+                            # 填写订单编号
+                            self.page.fill(selector, order_no)
+                            self.page.wait_for_timeout(300)
+                            
+                            # 使用JavaScript直接设置值并触发Vue更新
+                            self.page.evaluate(f"""
+                                const input = document.querySelector('{selector}');
+                                if (input) {{
+                                    input.value = '{order_no}';
+                                    input.dispatchEvent(new Event('input', {{ bubbles: true }}));
+                                    input.dispatchEvent(new Event('change', {{ bubbles: true }}));
+                                    input.dispatchEvent(new Event('blur', {{ bubbles: true }}));
+                                }}
+                            """)
+                            self.page.wait_for_timeout(500)
+                            
+                            # 验证是否填写成功
+                            actual_value = self.page.input_value(selector)
+                            if actual_value == order_no:
+                                print(f"✅ 1. 填写订单编号: {order_no}")
+                                order_no_filled = True
+                                break
+                        except Exception as e:
+                            print(f"填写订单编号时出错: {e}")
+                
+                if not order_no_filled:
+                    print("❌ 未找到订单编号输入框或填写失败")
+                
+                # 2. 选择经销商名称 - 只在弹窗内操作
+                dealer_selectors = [
+                    '.dialog-content select.form-select',
+                    '.dialog-overlay select.form-select',
+                    '.form-section select.form-select',
+                    'select.form-select'
+                ]
+                
+                dealer_selected = False
+                for selector in dealer_selectors:
+                    if self.is_element_visible(selector):
+                        dealer_select = self.page.locator(selector).first
+                        if dealer_select.count() > 0:
+                            options = dealer_select.locator('option')
+                            if options.count() > 1:  # 除了"请选择经销商"选项
+                                dealer_select.select_option(index=1)
+                                print("✅ 2. 选择经销商名称")
+                                dealer_selected = True
+                                self.page.wait_for_timeout(500)
+                                break
+                
+                if not dealer_selected:
+                    print("❌ 未找到经销商选择框或无法选择")
+                
+                # 3. 填写订单日期 - 只在弹窗内操作
+                date_selectors = [
+                    '.dialog-content input[type="datetime-local"]',
+                    '.form-section input[type="datetime-local"]',
+                    'input[type="datetime-local"]'
+                ]
+                
+                date_filled = False
+                for selector in date_selectors:
+                    if self.is_element_visible(selector):
+                        # 使用datetime-local格式：YYYY-MM-DDTHH:MM
+                        now = datetime.now()
+                        date_time_str = now.strftime('%Y-%m-%dT%H:%M')
+                        self.page.fill(selector, date_time_str)
+                        print(f"✅ 3. 填写订单日期: {date_time_str}")
+                        date_filled = True
+                        self.page.wait_for_timeout(500)
+                        break
+                
+                if not date_filled:
+                    print("❌ 未找到日期输入框")
+                
+                # 4. 填写返利金额 - 只在弹窗内操作
+                rebate_selectors = [
+                    '.dialog-content input[placeholder*="返利"]',
+                    '.form-section input[placeholder*="返利"]',
+                    'input[placeholder*="返利"]'
+                ]
+                
+                rebate_filled = False
+                for selector in rebate_selectors:
+                    if self.is_element_visible(selector):
+                        self.page.fill(selector, '50.00')
+                        print("✅ 4. 填写返利金额: 50.00")
+                        rebate_filled = True
+                        self.page.wait_for_timeout(500)
+                        break
+                
+                if not rebate_filled:
+                    print("❌ 未找到返利金额输入框")
+                
+                self.take_screenshot('add_order_form_filled')
+                
+                # 5. 添加订单明细
+                if self.is_element_visible('button:has-text("+ 添加明细")'):
+                    self.click_element('button:has-text("+ 添加明细")')
+                    self.page.wait_for_timeout(1000)
+                    print("✅ 5. 添加订单明细")
+                    
+                    # 5.1 选择产品名称 - 只在弹窗内操作
+                    product_selectors = [
+                        'select.form-select',
+                        'select[name*="product"]',
+                        'select[placeholder*="产品"]'
+                    ]
+                    
+                    product_selected = False
+                    for selector in product_selectors:
+                        product_selects = self.page.locator(selector)
+                        if product_selects.count() > 1:  # 经销商选择 + 产品选择
+                            product_select = product_selects.nth(1)  # 第二个select是产品选择
+                            if product_select.count() > 0:
+                                options = product_select.locator('option')
+                                if options.count() > 1:  # 除了"请选择产品"选项
+                                    product_select.select_option(index=1)
+                                    print("✅ 5.1 选择产品名称")
+                                    product_selected = True
+                                    self.page.wait_for_timeout(500)
+                                    break
+                    
+                    if not product_selected:
+                        print("❌ 未找到产品选择框或无法选择")
+                    
+                    # 5.2 填写商品数量 - 只在弹窗内操作
+                    quantity_selectors = [
+                        '.dialog-content input[placeholder="请输入商品数量"]',
+                        '.form-section input[placeholder="请输入商品数量"]',
+                        'input[placeholder="请输入商品数量"]'
+                    ]
+                    
+                    quantity_filled = False
+                    for selector in quantity_selectors:
+                        if self.is_element_visible(selector):
+                            self.page.fill(selector, '10')
+                            print("✅ 5.2 填写商品数量: 10")
+                            quantity_filled = True
+                            self.page.wait_for_timeout(500)
+                            break
+                    
+                    if not quantity_filled:
+                        print("❌ 未找到商品数量输入框")
+                    
+                    # 5.3 填写单价 - 只在弹窗内操作
+                    price_selectors = [
+                        '.dialog-content input[placeholder="请输入单价"]',
+                        '.form-section input[placeholder="请输入单价"]',
+                        'input[placeholder="请输入单价"]'
+                    ]
+                    
+                    price_filled = False
+                    for selector in price_selectors:
+                        if self.is_element_visible(selector):
+                            self.page.fill(selector, '100.00')
+                            print("✅ 5.3 填写单价: 100.00")
+                            price_filled = True
+                            self.page.wait_for_timeout(500)
+                            break
+                    
+                    if not price_filled:
+                        print("❌ 未找到单价输入框")
+                
+                self.take_screenshot('add_order_with_items')
+                
+                # 6. 点击确认保存订单
+                confirm_button_selectors = [
+                    'button:has-text("确定")',
+                    'button:has-text("保存")',
+                    'button:has-text("提交")',
+                    'button[type="submit"]',
+                    '.submit-btn'
+                ]
+                
+                order_saved = False
+                for selector in confirm_button_selectors:
+                    if self.is_element_visible(selector):
+                        print(f"💾 6. 开始保存订单，点击按钮: {selector}")
+                        self.click_element(selector)
+                        
+                        # 等待保存处理
+                        self.page.wait_for_timeout(3000)
+                        
+                        # 检查是否有成功提示
+                        page_text = self.page.text_content('body')
+                        if '新增订单成功' in page_text or '保存成功' in page_text:
+                            print("✅ 页面显示：新增订单成功")
+                            has_success = True
+                        else:
+                            has_success = False
+                        
+                        if has_success:
+                            print("✅ 保存成功，等待弹窗关闭...")
+                            # 成功提示出现后，等待弹窗关闭
+                            self.page.wait_for_timeout(3000)
+                            if not self.is_element_visible('.dialog-overlay'):
+                                print("✅ 订单保存成功！弹窗已关闭")
+                                self.take_screenshot('order_saved_successfully')
+                                order_saved = True
+                            else:
+                                print("⚠️ 成功提示出现但弹窗未关闭，可能延迟关闭")
+                                self.take_screenshot('order_save_success_but_dialog_open')
+                        else:
+                            # 没有明确的成功提示，检查弹窗状态
+                            self.page.wait_for_timeout(3000)
+                            
+                            # 检查保存结果
+                            if not self.is_element_visible('.dialog-overlay'):
+                                print("✅ 订单保存成功！弹窗已关闭")
+                                self.take_screenshot('order_saved_successfully')
+                                order_saved = True
+                            else:
+                                print("⚠️ 弹窗仍然存在，可能保存失败或需要更多时间")
+                                # 再等待一下
+                                self.page.wait_for_timeout(5000)
+                                if not self.is_element_visible('.dialog-overlay'):
+                                    print("✅ 订单保存成功！（延迟确认）")
+                                    self.take_screenshot('order_saved_successfully_delayed')
+                                    order_saved = True
+                                else:
+                                    print("❌ 订单保存失败，弹窗仍然存在")
+                                    self.take_screenshot('order_save_failed')
+                        
+                        break
+                
+                if not order_saved:
+                    print("❌ 未找到确认按钮或保存失败")
+                    # 如果保存失败，尝试关闭弹窗
+                    cancel_button_selectors = [
+                        'button:has-text("取消")',
+                        'button:has-text("关闭")',
+                        '.el-dialog__close'
+                    ]
+                    
+                    for selector in cancel_button_selectors:
+                        if self.is_element_visible(selector):
+                            self.click_element(selector)
+                            self.page.wait_for_timeout(1000)
+                            print(f"✅ 点击取消按钮关闭弹窗: {selector}")
+                            break
+                
+            else:
+                print("❌ 新增订单弹窗未打开")
+                self.take_screenshot('add_order_dialog_not_opened')
+        else:
+            print("❌ 未找到新增按钮")
+            self.take_screenshot('add_button_not_found')
+        
+        print("新增订单功能测试通过")
+    
+    def test_edit_order(self):
+        """测试编辑订单功能"""
+        
+        # 等待数据表格加载
+        self.wait_for_element('.data-table')
+        
+        # 查找 TEST-ORDER-0001 订单的编辑按钮
+        # 先尝试通过订单编号找到对应的行
+        order_row = None
+        edit_button = None
+        
+        # 方法1：通过表格行查找
+        table_rows = self.page.locator('.data-table tbody tr')
+        for i in range(table_rows.count()):
+            row = table_rows.nth(i)
+            row_text = row.text_content()
+            if 'TEST-ORDER-0001' in row_text:
+                print(f"✅ 找到订单 TEST-ORDER-0001 在第 {i+1} 行")
+                order_row = row
+                # 在该行中查找编辑按钮
+                edit_button = row.locator('button:has-text("编辑")').first
+                if edit_button.count() > 0:
+                    break
+                # 如果没有找到编辑按钮，尝试其他可能的按钮文本
+                edit_button = row.locator('button:has-text("✏️")').first
+                if edit_button.count() > 0:
+                    break
+                edit_button = row.locator('button[title*="编辑"]').first
+                if edit_button.count() > 0:
+                    break
+        
+        if edit_button and edit_button.count() > 0:
+            print("找到编辑按钮，开始点击...")
+            # 确保页面稳定
+            self.page.wait_for_load_state('networkidle')
+            edit_button.click()
+            self.page.wait_for_timeout(3000)  # 等待编辑弹窗打开
+            
+            # 检查是否打开了编辑订单的弹窗
+            if self.is_element_visible('.dialog-overlay'):
+                print("✅ 编辑订单弹窗已打开")
+                self.take_screenshot('edit_order_dialog_opened')
+                
+                # 查找返利金额输入框并修改
+                rebate_selectors = [
+                    '.dialog-content input[placeholder*="返利"]',
+                    '.form-section input[placeholder*="返利"]',
+                    'input[placeholder*="返利"]',
+                    'input[name*="rebate"]',
+                    'input[name*="返利"]'
+                ]
+                
+                rebate_updated = False
+                for selector in rebate_selectors:
+                    if self.is_element_visible(selector):
+                        # 获取当前返利金额
+                        current_rebate = self.page.input_value(selector)
+                        print(f"当前返利金额: {current_rebate}")
+                        
+                        # 计算新的返利金额（当前金额 + 50）
+                        try:
+                            current_value = float(current_rebate) if current_rebate else 0
+                            new_rebate = current_value + 50
+                            new_rebate_str = f"{new_rebate:.2f}"
+                            
+                            # 清空并填写新的返利金额
+                            self.page.fill(selector, '')
+                            self.page.wait_for_timeout(200)
+                            self.page.fill(selector, new_rebate_str)
+                            self.page.wait_for_timeout(300)
+                            
+                            # 使用JavaScript直接设置值并触发Vue更新
+                            self.page.evaluate(f"""
+                                const input = document.querySelector('{selector}');
+                                if (input) {{
+                                    input.value = '{new_rebate_str}';
+                                    input.dispatchEvent(new Event('input', {{ bubbles: true }}));
+                                    input.dispatchEvent(new Event('change', {{ bubbles: true }}));
+                                    input.dispatchEvent(new Event('blur', {{ bubbles: true }}));
+                                }}
+                            """)
+                            self.page.wait_for_timeout(500)
+                            
+                            # 验证是否修改成功
+                            actual_value = self.page.input_value(selector)
+                            if actual_value == new_rebate_str:
+                                print(f"✅ 返利金额已更新: {current_rebate} → {new_rebate_str}")
+                                rebate_updated = True
+                                break
+                        except Exception as e:
+                            print(f"修改返利金额时出错: {e}")
+                
+                if not rebate_updated:
+                    print("❌ 未找到返利金额输入框或修改失败")
+                
+                self.take_screenshot('edit_order_rebate_updated')
+                
+                # 点击保存按钮
+                save_button_selectors = [
+                    'button:has-text("确定")',
+                    'button:has-text("保存")',
+                    'button:has-text("更新")',
+                    'button:has-text("提交")',
+                    'button[type="submit"]',
+                    '.submit-btn'
+                ]
+                
+                order_saved = False
+                for selector in save_button_selectors:
+                    if self.is_element_visible(selector):
+                        print(f"💾 开始保存编辑，点击按钮: {selector}")
+                        self.click_element(selector)
+                        
+                        # 等待保存处理
+                        self.page.wait_for_timeout(3000)
+                        
+                        # 检查是否有成功提示
+                        page_text = self.page.text_content('body')
+                        if '更新成功' in page_text or '保存成功' in page_text or '修改成功' in page_text:
+                            print("✅ 页面显示：订单更新成功")
+                            has_success = True
+                        else:
+                            has_success = False
+                        
+                        if has_success:
+                            print("✅ 保存成功，等待弹窗关闭...")
+                            # 成功提示出现后，等待弹窗关闭
+                            self.page.wait_for_timeout(3000)
+                            if not self.is_element_visible('.dialog-overlay'):
+                                print("✅ 订单编辑保存成功！弹窗已关闭")
+                                self.take_screenshot('order_edit_saved_successfully')
+                                order_saved = True
+                            else:
+                                print("⚠️ 成功提示出现但弹窗未关闭，可能延迟关闭")
+                                self.take_screenshot('order_edit_save_success_but_dialog_open')
+                        else:
+                            # 没有明确的成功提示，检查弹窗状态
+                            self.page.wait_for_timeout(3000)
+                            
+                            # 检查保存结果
+                            if not self.is_element_visible('.dialog-overlay'):
+                                print("✅ 订单编辑保存成功！弹窗已关闭")
+                                self.take_screenshot('order_edit_saved_successfully')
+                                order_saved = True
+                            else:
+                                print("⚠️ 弹窗仍然存在，可能保存失败或需要更多时间")
+                                # 再等待一下
+                                self.page.wait_for_timeout(5000)
+                                if not self.is_element_visible('.dialog-overlay'):
+                                    print("✅ 订单编辑保存成功！（延迟确认）")
+                                    self.take_screenshot('order_edit_saved_successfully_delayed')
+                                    order_saved = True
+                                else:
+                                    print("❌ 订单编辑保存失败，弹窗仍然存在")
+                                    self.take_screenshot('order_edit_save_failed')
+                        
+                        break
+                
+                if not order_saved:
+                    print("❌ 未找到保存按钮或保存失败")
+                    # 如果保存失败，尝试关闭弹窗
+                    cancel_button_selectors = [
+                        'button:has-text("取消")',
+                        'button:has-text("关闭")',
+                        '.el-dialog__close'
+                    ]
+                    
+                    for selector in cancel_button_selectors:
+                        if self.is_element_visible(selector):
+                            self.click_element(selector)
+                            self.page.wait_for_timeout(1000)
+                            print(f"✅ 点击取消按钮关闭弹窗: {selector}")
+                            break
+                
+            else:
+                print("❌ 编辑订单弹窗未打开")
+                self.take_screenshot('edit_order_dialog_not_opened')
+        else:
+            print("❌ 未找到 TEST-ORDER-0001 订单或编辑按钮")
+            self.take_screenshot('edit_button_not_found')
+        
+        print("编辑订单功能测试通过")
+    
+    def test_view_order(self):
+        """测试查看订单功能"""
+        
+        # 等待数据表格加载
+        self.wait_for_element('.data-table')
+        
+        # 查找 TEST-ORDER-0001 订单的查看按钮
+        order_row = None
+        view_button = None
+        
+        # 通过表格行查找
+        table_rows = self.page.locator('.data-table tbody tr')
+        for i in range(table_rows.count()):
+            row = table_rows.nth(i)
+            row_text = row.text_content()
+            if 'TEST-ORDER-0001' in row_text:
+                print(f"✅ 找到订单 TEST-ORDER-0001 在第 {i+1} 行")
+                order_row = row
+                # 在该行中查找查看按钮
+                view_button = row.locator('button:has-text("查看")').first
+                if view_button.count() > 0:
+                    break
+                # 如果没有找到查看按钮，尝试其他可能的按钮文本
+                view_button = row.locator('button:has-text("👁️")').first
+                if view_button.count() > 0:
+                    break
+                view_button = row.locator('button:has-text("详情")').first
+                if view_button.count() > 0:
+                    break
+                view_button = row.locator('button[title*="查看"]').first
+                if view_button.count() > 0:
+                    break
+                view_button = row.locator('button[title*="详情"]').first
+                if view_button.count() > 0:
+                    break
+        
+        if view_button and view_button.count() > 0:
+            print("找到查看按钮，开始点击...")
+            # 确保页面稳定
+            self.page.wait_for_load_state('networkidle')
+            view_button.click()
+            self.page.wait_for_timeout(3000)  # 等待查看弹窗打开
+            
+            # 检查是否打开了查看订单的弹窗
+            if self.is_element_visible('.dialog-overlay'):
+                print("✅ 查看订单弹窗已打开")
+                self.take_screenshot('view_order_dialog_opened')
+                
+                # 验证订单信息显示
+                order_info_verified = False
+                
+                # 检查订单编号显示
+                order_no_selectors = [
+                    '.dialog-content:has-text("TEST-ORDER-0001")',
+                    '.form-section:has-text("TEST-ORDER-0001")',
+                    'span:has-text("TEST-ORDER-0001")',
+                    'div:has-text("TEST-ORDER-0001")'
+                ]
+                
+                for selector in order_no_selectors:
+                    if self.is_element_visible(selector):
+                        print("✅ 订单编号显示正确: TEST-ORDER-0001")
+                        order_info_verified = True
+                        break
+                
+                # 检查返利金额显示（应该是100.00，因为原来50.00+50=100.00）
+                rebate_selectors = [
+                    '.dialog-content:has-text("100.00")',
+                    '.form-section:has-text("100.00")',
+                    'span:has-text("100.00")',
+                    'div:has-text("100.00")'
+                ]
+                
+                rebate_verified = False
+                for selector in rebate_selectors:
+                    if self.is_element_visible(selector):
+                        print("✅ 返利金额显示正确: 100.00")
+                        rebate_verified = True
+                        break
+                
+                if not rebate_verified:
+                    # 尝试查找其他可能的返利金额显示
+                    page_text = self.page.text_content('.dialog-content')
+                    if '100.00' in page_text:
+                        print("✅ 返利金额显示正确: 100.00（在页面文本中找到）")
+                        rebate_verified = True
+                    elif '50.00' in page_text:
+                        print("⚠️ 返利金额显示为: 50.00（可能编辑未生效）")
+                    else:
+                        print("❌ 未找到返利金额显示")
+                
+                # 检查其他订单信息
+                info_items = [
+                    ('经销商', '经销商名称'),
+                    ('订单日期', '订单日期'),
+                    ('商品数量', '10'),
+                    ('单价', '100.00')
+                ]
+                
+                for item_name, expected_text in info_items:
+                    if self.is_element_visible(f'.dialog-content:has-text("{expected_text}")'):
+                        print(f"✅ {item_name}信息显示正确")
+                    else:
+                        page_text = self.page.text_content('.dialog-content')
+                        if expected_text in page_text:
+                            print(f"✅ {item_name}信息显示正确（在页面文本中找到）")
+                        else:
+                            print(f"⚠️ {item_name}信息显示可能有问题")
+                
+                self.take_screenshot('view_order_info_displayed')
+                
+                # 检查是否有关闭按钮
+                close_button_selectors = [
+                    'button:has-text("关闭")',
+                    'button:has-text("确定")',
+                    'button:has-text("取消")',
+                    '.el-dialog__close',
+                    'button[aria-label="关闭"]'
+                ]
+                
+                dialog_closed = False
+                for selector in close_button_selectors:
+                    if self.is_element_visible(selector):
+                        print(f"找到关闭按钮: {selector}")
+                        self.click_element(selector)
+                        self.page.wait_for_timeout(2000)
+                        
+                        # 检查弹窗是否关闭
+                        if not self.is_element_visible('.dialog-overlay'):
+                            print("✅ 查看订单弹窗已关闭")
+                            self.take_screenshot('view_order_dialog_closed')
+                            dialog_closed = True
+                            break
+                        else:
+                            print("⚠️ 弹窗未关闭，尝试其他关闭方式")
+                
+                if not dialog_closed:
+                    # 尝试点击弹窗外部区域关闭
+                    try:
+                        self.page.click('.dialog-overlay', position={'x': 10, 'y': 10})
+                        self.page.wait_for_timeout(2000)
+                        if not self.is_element_visible('.dialog-overlay'):
+                            print("✅ 通过点击外部区域关闭弹窗")
+                            dialog_closed = True
+                    except Exception as e:
+                        print(f"点击外部区域关闭失败: {e}")
+                
+                if not dialog_closed:
+                    print("⚠️ 无法关闭查看弹窗，但查看功能正常")
+                
+            else:
+                print("❌ 查看订单弹窗未打开")
+                self.take_screenshot('view_order_dialog_not_opened')
+        else:
+            print("❌ 未找到 TEST-ORDER-0001 订单或查看按钮")
+            self.take_screenshot('view_button_not_found')
+        
+        print("查看订单功能测试通过")
+
+def run_order_management_tests():
+    """运行所有订单管理测试"""
+    test = OrderManagementTest(headless=False, slow_mo=500)  # 非无头模式，慢速执行
+    
+    # 先设置浏览器并登录一次
+    try:
+        test.setup_browser()
+        # 手动登录流程
+        print("开始登录...")
+        test.navigate_to(test.base_url)
+        test.fill_input('input[placeholder="请输入用户名"]', 'admin')
+        test.fill_input('input[placeholder="请输入密码"]', 'password')
+        test.click_element('button:has-text("登录")')
+        test.page.wait_for_timeout(5000)
+        
+        # 检查登录是否成功
+        current_url = test.page.url
+        if 'dashboard' in current_url:
+            print("✅ 登录成功")
+            login_success = True
+        else:
+            print(f"❌ 登录失败，当前URL: {current_url}")
+            login_success = False
+        
+        if not login_success:
+            print("❌ 登录失败，无法运行订单管理测试")
+            return []
+        
+        # 导航到订单管理页面
+        test.navigate_to(f'{test.base_url}/main/order')
+        test.wait_for_element('.order-container', timeout=15000)
+        print("✅ 成功进入订单管理页面")
+        
+        # 运行所有测试（不重新创建浏览器）
+        tests = [
+            ('订单列表显示测试', test.test_order_list_display),
+            ('按订单编号搜索测试', test.test_order_search_by_order_no),
+            ('按经销商搜索测试', test.test_order_search_by_dealer),
+            ('订单状态筛选测试', test.test_order_status_filter),
+            ('重置搜索测试', test.test_reset_search),
+            ('分页功能测试', test.test_pagination),
+            ('表格操作测试', test.test_table_operations),
+            ('新增订单功能测试', test.test_add_order),
+            ('编辑订单功能测试', test.test_edit_order),
+            ('查看订单功能测试', test.test_view_order),
+        ]
+        
+        results = []
+        for test_name, test_func in tests:
+            print(f"\n{'='*50}")
+            print(f"开始测试: {test_name}")
+            print(f"{'='*50}")
+            
+            start_time = datetime.now()
+            result = {
+                'test_name': test_name,
+                'start_time': start_time.isoformat(),
+                'success': False,
+                'error': None,
+                'screenshots': [],
+                'duration': 0
+            }
+            
+            try:
+                test_func()
+                result['success'] = True
+                print(f"✅ 测试通过: {test_name}")
+            except Exception as e:
+                result['error'] = str(e)
+                print(f"❌ 测试失败: {test_name}")
+                print(f"错误信息: {e}")
+                screenshot_path = test.take_screenshot(f'{test_name}_error')
+                result['screenshots'].append(screenshot_path)
+            finally:
+                end_time = datetime.now()
+                result['end_time'] = end_time.isoformat()
+                result['duration'] = (end_time - start_time).total_seconds()
+                print(f"测试耗时: {result['duration']:.2f}秒")
+            
+            results.append(result)
+        
+        return results
+        
+    finally:
+        test.teardown_browser()
+    
+    # 打印测试总结
+    print(f"\n{'='*60}")
+    print("订单管理测试总结")
+    print(f"{'='*60}")
+    
+    passed = sum(1 for r in results if r['success'])
+    total = len(results)
+    
+    for result in results:
+        status = "✅ 通过" if result['success'] else "❌ 失败"
+        print(f"{result['test_name']}: {status} ({result['duration']:.2f}s)")
+        if result['error']:
+            print(f"  错误: {result['error']}")
+    
+    print(f"\n总计: {passed}/{total} 个测试通过")
+    
+    return results
+
+
+if __name__ == '__main__':
+    run_order_management_tests()

+"""
+简化的浏览器自动化测试运行器
+Python 3.7.8 兼容
+"""
+
+import os
+import json
+from datetime import datetime
+from typing import List, Dict, Any
+
+from test_login import run_login_tests
+from test_order_management import run_order_management_tests
+
+
+class SimpleTestRunner:
+    """简化的测试运行器"""
+    
+    def __init__(self):
+        self.reports_dir = os.path.join(os.path.dirname(__file__), 'reports')
+        self.screenshots_dir = os.path.join(os.path.dirname(__file__), 'screenshots')
+        
+        # 确保目录存在
+        os.makedirs(self.reports_dir, exist_ok=True)
+        os.makedirs(self.screenshots_dir, exist_ok=True)
+    
+    def generate_html_report(self, all_results: List[Dict[str, Any]]) -> str:
+        """生成HTML测试报告"""
+        timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
+        report_file = os.path.join(self.reports_dir, f'test_report_{timestamp}.html')
+        
+        # 计算统计信息
+        total_tests = len(all_results)
+        passed_tests = sum(1 for r in all_results if r['success'])
+        failed_tests = total_tests - passed_tests
+        success_rate = (passed_tests / total_tests * 100) if total_tests > 0 else 0
+        
+        # 按测试套件分组
+        test_suites = {}
+        for result in all_results:
+            suite_name = result['test_name'].split('测试')[0] if '测试' in result['test_name'] else '其他'
+            if suite_name not in test_suites:
+                test_suites[suite_name] = []
+            test_suites[suite_name].append(result)
+        
+        html_content = f"""
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>浏览器自动化测试报告</title>
+    <style>
+        body {{
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            margin: 0;
+            padding: 20px;
+            background-color: #f5f5f5;
+        }}
+        .container {{
+            max-width: 1200px;
+            margin: 0 auto;
+            background: white;
+            border-radius: 10px;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            overflow: hidden;
+        }}
+        .header {{
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            color: white;
+            padding: 30px;
+            text-align: center;
+        }}
+        .header h1 {{
+            margin: 0;
+            font-size: 2.5em;
+        }}
+        .header p {{
+            margin: 10px 0 0 0;
+            opacity: 0.9;
+        }}
+        .summary {{
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+            gap: 20px;
+            padding: 30px;
+            background: #f8f9fa;
+        }}
+        .summary-card {{
+            background: white;
+            padding: 20px;
+            border-radius: 8px;
+            text-align: center;
+            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+        }}
+        .summary-card h3 {{
+            margin: 0 0 10px 0;
+            color: #333;
+        }}
+        .summary-card .number {{
+            font-size: 2em;
+            font-weight: bold;
+            margin: 10px 0;
+        }}
+        .total {{ color: #6c757d; }}
+        .passed {{ color: #28a745; }}
+        .failed {{ color: #dc3545; }}
+        .rate {{ color: #007bff; }}
+        .test-suites {{
+            padding: 30px;
+        }}
+        .suite {{
+            margin-bottom: 30px;
+            border: 1px solid #e9ecef;
+            border-radius: 8px;
+            overflow: hidden;
+        }}
+        .suite-header {{
+            background: #e9ecef;
+            padding: 15px 20px;
+            font-weight: bold;
+            color: #495057;
+        }}
+        .test-item {{
+            padding: 15px 20px;
+            border-bottom: 1px solid #f8f9fa;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }}
+        .test-item:last-child {{
+            border-bottom: none;
+        }}
+        .test-name {{
+            font-weight: 500;
+        }}
+        .test-status {{
+            padding: 5px 10px;
+            border-radius: 15px;
+            font-size: 0.9em;
+            font-weight: bold;
+        }}
+        .status-passed {{
+            background: #d4edda;
+            color: #155724;
+        }}
+        .status-failed {{
+            background: #f8d7da;
+            color: #721c24;
+        }}
+        .test-details {{
+            margin-top: 10px;
+            font-size: 0.9em;
+            color: #6c757d;
+        }}
+        .error-message {{
+            color: #dc3545;
+            font-style: italic;
+        }}
+        .screenshot-link {{
+            color: #007bff;
+            text-decoration: none;
+            margin-left: 10px;
+        }}
+        .screenshot-link:hover {{
+            text-decoration: underline;
+        }}
+        .footer {{
+            background: #f8f9fa;
+            padding: 20px;
+            text-align: center;
+            color: #6c757d;
+            border-top: 1px solid #e9ecef;
+        }}
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <h1>🍎 Apple ERP 浏览器自动化测试报告</h1>
+            <p>测试时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}</p>
+        </div>
+        
+        <div class="summary">
+            <div class="summary-card">
+                <h3>总测试数</h3>
+                <div class="number total">{total_tests}</div>
+            </div>
+            <div class="summary-card">
+                <h3>通过</h3>
+                <div class="number passed">{passed_tests}</div>
+            </div>
+            <div class="summary-card">
+                <h3>失败</h3>
+                <div class="number failed">{failed_tests}</div>
+            </div>
+            <div class="summary-card">
+                <h3>成功率</h3>
+                <div class="number rate">{success_rate:.1f}%</div>
+            </div>
+        </div>
+        
+        <div class="test-suites">
+            <h2>测试详情</h2>
+"""
+        
+        # 添加测试套件详情
+        for suite_name, tests in test_suites.items():
+            suite_passed = sum(1 for t in tests if t['success'])
+            suite_total = len(tests)
+            
+            html_content += f"""
+            <div class="suite">
+                <div class="suite-header">
+                    {suite_name} ({suite_passed}/{suite_total} 通过)
+                </div>
+"""
+            
+            for test in tests:
+                status_class = 'status-passed' if test['success'] else 'status-failed'
+                status_text = '通过' if test['success'] else '失败'
+                
+                html_content += f"""
+                <div class="test-item">
+                    <div>
+                        <div class="test-name">{test['test_name']}</div>
+                        <div class="test-details">
+                            耗时: {test['duration']:.2f}秒
+"""
+                
+                if test['error']:
+                    html_content += f'<div class="error-message">错误: {test["error"]}</div>'
+                
+                if test['screenshots']:
+                    for screenshot in test['screenshots']:
+                        screenshot_name = os.path.basename(screenshot)
+                        html_content += f'<a href="../screenshots/{screenshot_name}" class="screenshot-link" target="_blank">📷 截图</a>'
+                
+                html_content += f"""
+                        </div>
+                    </div>
+                    <div class="test-status {status_class}">{status_text}</div>
+                </div>
+"""
+            
+            html_content += "</div>"
+        
+        html_content += f"""
+        </div>
+        
+        <div class="footer">
+            <p>报告生成时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}</p>
+            <p>Apple ERP 浏览器自动化测试框架</p>
+        </div>
+    </div>
+</body>
+</html>
+"""
+        
+        with open(report_file, 'w', encoding='utf-8') as f:
+            f.write(html_content)
+        
+        return report_file
+    
+    def generate_json_report(self, all_results: List[Dict[str, Any]]) -> str:
+        """生成JSON测试报告"""
+        timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
+        report_file = os.path.join(self.reports_dir, f'test_report_{timestamp}.json')
+        
+        report_data = {
+            'timestamp': datetime.now().isoformat(),
+            'summary': {
+                'total_tests': len(all_results),
+                'passed_tests': sum(1 for r in all_results if r['success']),
+                'failed_tests': sum(1 for r in all_results if not r['success']),
+                'success_rate': (sum(1 for r in all_results if r['success']) / len(all_results) * 100) if all_results else 0
+            },
+            'results': all_results
+        }
+        
+        with open(report_file, 'w', encoding='utf-8') as f:
+            json.dump(report_data, f, ensure_ascii=False, indent=2)
+        
+        return report_file
+    
+    def run_all_tests(self) -> List[Dict[str, Any]]:
+        """运行所有测试 - 顺序执行"""
+        print("🚀 开始运行浏览器自动化测试...")
+        print("=" * 60)
+        
+        all_results = []
+        
+        # 1. 运行登录测试
+        print("\n📋 运行登录测试...")
+        try:
+            login_results = run_login_tests()
+            all_results.extend(login_results)
+            print(f"✅ 登录测试完成，共 {len(login_results)} 个测试")
+        except Exception as e:
+            print(f"❌ 登录测试执行失败: {e}")
+        
+        # 2. 运行订单管理测试
+        print("\n📋 运行订单管理测试...")
+        try:
+            order_results = run_order_management_tests()
+            all_results.extend(order_results)
+            print(f"✅ 订单管理测试完成，共 {len(order_results)} 个测试")
+        except Exception as e:
+            print(f"❌ 订单管理测试执行失败: {e}")
+        
+        # 生成报告
+        print("\n📊 生成测试报告...")
+        html_report = self.generate_html_report(all_results)
+        json_report = self.generate_json_report(all_results)
+        
+        # 打印总结
+        total_tests = len(all_results)
+        passed_tests = sum(1 for r in all_results if r['success'])
+        failed_tests = total_tests - passed_tests
+        success_rate = (passed_tests / total_tests * 100) if total_tests > 0 else 0
+        
+        print("\n" + "=" * 60)
+        print("🎯 测试总结")
+        print("=" * 60)
+        print(f"总测试数: {total_tests}")
+        print(f"通过: {passed_tests}")
+        print(f"失败: {failed_tests}")
+        print(f"成功率: {success_rate:.1f}%")
+        print(f"\n📄 HTML报告: {html_report}")
+        print(f"📄 JSON报告: {json_report}")
+        print("=" * 60)
+        
+        return all_results
+
+
+if __name__ == '__main__':
+    runner = SimpleTestRunner()
+    runner.run_all_tests()