新增供应商分组用例，修改供应商管理用例

李玉霞
1 parent bbe2eb88
Showing 9 changed files with 546 additions and 278 deletions
fixtures/testFixture.ts
pages/supplierGroupingPage.ts
pages/supplierPage.ts
tests/supplier.spec.ts
tests/supplier_add.spec.ts
tests/supplier_bill.spec.ts
tests/supplier_delete.spec.ts
tests/supplier_grouping.spec.ts
tests/supplier_update.spec.ts
@@ -5,6 +5,7 @@ import { SalePage } from &#39;../pages/salePage&#39;;
 import { ConsignmentPage } from '../pages/consignmentPage';
 import { CustomerPage } from '../pages/customerPage';
 import { SupplierPage } from '../pages/supplierPage';
+import { SupplierGroupingPage } from '../pages/supplierGroupingPage';
  
 /**
  * 页面对象夹具类型定义
@@ -39,6 +40,11 @@ export type PageFixtures = {
    * 供应商管理页面
    */
   supplierPage: SupplierPage;
+
+  /**
+   * 供应商分组页面
+   */
+  supplierGroupingPage: SupplierGroupingPage;
 };
  
 /**
@@ -74,6 +80,11 @@ export const test = base.extend&lt;PageFixtures&gt;({
   supplierPage: async ({ page }, use) => {
     await use(new SupplierPage(page));
   },
+
+  // 供应商分组页面
+  supplierGroupingPage: async ({ page }, use) => {
+    await use(new SupplierGroupingPage(page));
+  },
 });
  
 /**
@@ -114,5 +125,9 @@ export const fullTest = authTest.extend&lt;PageFixtures&gt;({
   supplierPage: async ({authenticatedPage }, use) => {
     await use(new SupplierPage(authenticatedPage));
   },
-  
+
+  supplierGroupingPage: async ({authenticatedPage }, use) => {
+    await use(new SupplierGroupingPage(authenticatedPage));
+  },
+
   });
 \ No newline at end of file
+import { Page, Locator } from '@playwright/test';
+import { BasePage } from './basePage';
+
+/**
+ * 供应商分组选择器
+ */
+const selectors = {
+  // 导航
+  moreMenu: 'text=更多 >',
+  supplierGroupingMenu: 'text=供应商分组',
+  addButton: 'text=新建',
+
+  // 表单字段
+  groupNameInput: 'uni-input:filter([placeholder*="分组名称"]) input',
+  remarkInput: 'uni-input:filter([placeholder*="备注"]) input',
+
+  // 操作按钮
+  confirmButton: 'text=确定',
+  saveButton: 'text=确定',
+
+  // 供应商分组列表
+  supplierGroupingList: '.supplier-grouping-list',
+  supplierGroupingItem: '.supplier-grouping-list .item',
+};
+
+/**
+ * 供应商分组页面类
+ * 处理供应商分组相关操作
+ */
+export class SupplierGroupingPage extends BasePage {
+  // 导航定位器
+  readonly moreMenu!: Locator;
+  readonly supplierGroupingMenu: Locator;
+  readonly addButton: Locator;
+
+  // 表单字段
+  readonly groupNameInput: Locator;
+  readonly remarkInput: Locator;
+
+  // 操作按钮
+  readonly confirmButton: Locator;
+  readonly saveButton: Locator;
+
+  constructor(page: Page) {
+    super(page);
+
+    // 导航
+    this.moreMenu = page.getByText('更多 >');
+    this.supplierGroupingMenu = page.getByText('供应商分组').first();
+    this.addButton = page.getByText('新建');
+
+    // 表单字段
+    this.groupNameInput = page.locator('uni-input').filter({ hasText: '请输入分组名称' }).getByRole('textbox');
+    this.remarkInput = page.locator('uni-input').filter({ hasText: '请输入备注' }).getByRole('textbox');
+
+    // 操作按钮
+    this.confirmButton = page.getByText('确定');
+    this.saveButton = page.getByText('确定');
+  }
+
+  /**
+   * 打开更多菜单
+   */
+  async openMoreMenu(): Promise<void> {
+    await this.moreMenu.click();
+    await this.wait(500);
+  }
+
+  /**
+   * 打开供应商分组页面
+   */
+  async openSupplierGrouping(): Promise<void> {
+    await this.supplierGroupingMenu.click({ force: true });
+    await this.waitForPageLoad();
+    await this.wait(500);
+  }
+
+  /**
+   * 点击新建分组按钮
+   */
+  async clickAddButton(): Promise<void> {
+    await this.addButton.click();
+    await this.waitForPageLoad();
+  }
+
+  /**
+   * 填写分组名称
+   * @param name 分组名称
+   */
+  async fillGroupName(name: string): Promise<void> {
+    await this.groupNameInput.click();
+    await this.groupNameInput.fill(name);
+  }
+
+  /**
+   * 填写备注
+   * @param remark 备注内容
+   */
+  async fillRemark(remark: string): Promise<void> {
+    await this.remarkInput.click();
+    await this.remarkInput.fill(remark);
+  }
+
+  /**
+   * 保存分组
+   */
+  async saveGrouping(): Promise<void> {
+    await this.saveButton.click();
+    await this.waitForPageLoad();
+    await this.wait(500);
+  }
+
+  /**
+   * 搜索分组
+   * @param groupName 分组名称
+   */
+  async searchGrouping(groupName: string): Promise<void> {
+    await this.page.getByRole('textbox').click();
+    await this.wait(300);
+    await this.page.getByRole('textbox').fill(groupName);
+    await this.wait(1500);
+    await this.page.getByRole('textbox').press('Enter');
+    await this.wait(1000);
+  }
+
+  /**
+   * 验证分组是否创建成功
+   * @param groupName 分组名称
+   */
+  async verifyGroupingCreated(groupName: string): Promise<boolean> {
+    try {
+      await this.navigateToSupplierGrouping();
+      await this.searchGrouping(groupName);
+      await this.page.waitForSelector(`uni-view:has-text("${groupName}")`, { timeout: 10000 });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * 进入供应商分组页面（完整流程）
+   */
+  async navigateToSupplierGrouping(): Promise<void> {
+    await this.navigate('/');
+    await this.openMoreMenu();
+    await this.openSupplierGrouping();
+  }
+
+  /**
+   * 点击编辑分组按钮
+   */
+  async clickEditButton(): Promise<void> {
+    await this.page.getByText('编辑').click();
+    await this.waitForPageLoad();
+  }
+
+  /**
+   * 修改分组
+   * @param groupName 新的分组名称
+   * @param remark 新的备注
+   */
+  async updateGrouping(groupName: string, remark: string): Promise<void> {
+    await this.fillGroupName(groupName);
+    await this.fillRemark(remark);
+    await this.saveGrouping();
+  }
+
+  /**
+   * 验证分组是否修改成功
+   * @param groupName 分组名称
+   */
+  async verifyGroupingUpdated(groupName: string): Promise<boolean> {
+    try {
+      await this.navigateToSupplierGrouping();
+      await this.searchGrouping(groupName);
+      await this.page.waitForSelector(`uni-view:has-text("${groupName}")`, { timeout: 10000 });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * 点击删除分组按钮
+   */
+  async clickDeleteButton(): Promise<void> {
+    await this.page.getByText('删除', { exact: true }).click();
+  }
+
+  /**
+   * 点击分组项
+   * @param groupName 分组名称
+   */
+  async clickGroupingItem(groupName: string): Promise<void> {
+    await this.page.locator('uni-view').filter({ hasText: new RegExp(`^${groupName}$`) }).first().click();
+    await this.waitForPageLoad();
+  }
+
+  /**
+   * 确认删除分组
+   */
+  async confirmDelete(): Promise<void> {
+    await this.page.getByText('确定', { exact: true }).click();
+    await this.waitForPageLoad();
+    await this.wait(500);
+  }
+
+  /**
+   * 验证分组是否删除成功
+   * @param groupName 分组名称
+   */
+  async verifyGroupingDeleted(groupName: string): Promise<boolean> {
+    try {
+      await this.navigateToSupplierGrouping();
+      await this.searchGrouping(groupName);
+      // 删除成功后，列表会显示"没有数据哦~"
+      await this.page.waitForSelector(`uni-view:has-text("No data")`, { timeout: 10000 });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
@@ -276,7 +276,7 @@ export class SupplierPage extends BasePage {
    */
   async searchSupplier(supplierName: string): Promise<void> {
     await this.page.getByRole('textbox').click();
-    const input = this.page.locator('uni-input').filter({ hasText: '供应商名称' }).getByRole('textbox');
+    const input = this.page.locator('uni-input').filter({ hasText: '供应商名称/联系电话' }).getByRole('textbox');
     await input.fill(supplierName);
     await this.page.waitForTimeout(1500);
     await input.press('Enter');
@@ -372,8 +372,8 @@ export class SupplierPage extends BasePage {
     await this.wait(300);
  
     await this.page.getByText('1', { exact: true }).click();
-    await this.page.getByText('0', { exact: true }).nth(1).click();
-    await this.page.getByText('0', { exact: true }).nth(1).click();
+    await this.page.getByText('0', { exact: true }).nth(0).click();
+    await this.page.getByText('0', { exact: true }).nth(0).click();
     await this.page.getByText('完成').click();
   }
  
@@ -495,7 +495,7 @@ export class SupplierPage extends BasePage {
       // 检查所有金额是否都是'¥ 0'
       const allZero = yuanTexts.every(text => {
         const trimmed = text.trim();
-        return trimmed === '¥ 0' || trimmed === '¥0';
+        return trimmed === '¥ 0.00' || trimmed === '¥0.00';
       });
  
       // 如果全为0，返回true（保持在当前页面继续删除流程）
+import { test, expect } from '../fixtures';
+import * as allure from 'allure-js-commons';
+
+/**
+ * 供应商管理测试
+ */
+test.describe('供应商管理', () => {
+  // 使用已保存的认证状态
+  test.use({ storageState: 'auth.json' });
+
+  // 强制测试串行执行，避免并行测试之间的干扰
+  test.describe.configure({ mode: 'serial' });
+
+  test('新建供应商并绑定园区卡', async ({ supplierPage }, testInfo) => {
+    await allure.epic('供应商管理');
+    await allure.feature('供应商信息');
+    await allure.story('新建供应商');
+
+    // 步骤1：生成随机供应商信息
+    const supplierInfo = await allure.step('生成随机供应商信息', async () => {
+      const info = await supplierPage.generateRandomSupplierInfo();
+
+      console.log('供应商名称:', info.name);
+      console.log('负责人:', info.managerName);
+      console.log('手机号:', info.phone);
+      console.log('备注:', info.remark);
+
+      return info;
+    });
+
+    // 步骤2：填写并提交供应商表单
+    await allure.step('填写并提交供应商表单', async () => {
+      await supplierPage.navigateToSupplierManagement();
+      await supplierPage.clickAddSupplier();
+      await supplierPage.fillFormField(supplierPage.supplierNameInput, supplierInfo.name);
+      await supplierPage.selectGroup();
+      await supplierPage.fillFormField(supplierPage.managerNameInput, supplierInfo.managerName);
+      await supplierPage.fillFormField(supplierPage.phoneInput, supplierInfo.phone);
+      await supplierPage.selectParkCard('888810046477', '地利');
+      await supplierPage.fillFormField(supplierPage.remarkInput, supplierInfo.remark || '');
+      await supplierPage.saveButton.click();
+      await supplierPage.attachScreenshot(testInfo, '新建供应商成功截图');
+    });
+
+    // 步骤3：验证供应商创建成功
+    await allure.step('验证供应商创建成功', async () => {
+      const isCreated = await supplierPage.verifySupplierCreated(supplierInfo.name);
+      expect(isCreated).toBeTruthy();
+    });
+  });
+
+  test('编辑供应商并绑定园区卡', async ({ supplierPage }, testInfo) => {
+    await allure.epic('供应商管理');
+    await allure.feature('供应商信息');
+    await allure.story('编辑供应商');
+
+    // 步骤1：生成新的供应商信息
+    const supplierInfo = await allure.step('生成新的供应商信息', async () => {
+      const namePrefixes = ['修改', '更新', '调整', '变更'];
+      const namePrefix = namePrefixes[Math.floor(Math.random() * namePrefixes.length)];
+      const info = await supplierPage.generateRandomSupplierInfo({
+        namePrefix: namePrefix,
+      });
+
+      console.log('新供应商名称:', info.name);
+      console.log('新负责人:', info.managerName);
+      console.log('新手机号:', info.phone);
+      console.log('新备注:', info.remark);
+
+      return info;
+    });
+
+    // 步骤2：填写并提交供应商表单
+    await allure.step('填写并提交供应商表单', async () => {
+      await supplierPage.navigateToSupplierManagement();
+      await supplierPage.clickSupplierItemByIndex(0);
+      await supplierPage.clickEditButton();
+      await supplierPage.clearAndFillFormField(supplierPage.supplierNameInput, supplierInfo.name);
+      await supplierPage.clearAndFillFormField(supplierPage.managerNameInput, supplierInfo.managerName);
+      await supplierPage.clearAndFillFormField(supplierPage.phoneInput, supplierInfo.phone);
+      await supplierPage.selectSupplierType();
+      await supplierPage.selectParkCard('888800010617');
+      await supplierPage.clearAndFillFormField(supplierPage.remarkInput, supplierInfo.remark || '');
+      await supplierPage.clickConfirmButton();
+      await supplierPage.attachScreenshot(testInfo, '编辑供应商成功截图');
+    });
+
+    // 步骤3：验证供应商修改成功
+    await allure.step('验证供应商修改成功', async () => {
+      const isUpdated = await supplierPage.verifySupplierCreated(supplierInfo.name);
+      expect(isUpdated).toBeTruthy();
+    });
+  });
+
+  test('删除供应商（金额都为0）', async ({ supplierPage }, testInfo) => {
+    await allure.epic('供应商管理');
+    await allure.feature('供应商信息');
+    await allure.story('删除供应商');
+
+    // 步骤1：进入供应商管理页面
+    await allure.step('进入供应商管理页面', async () => {
+      await supplierPage.navigateToSupplierManagement();
+    });
+
+    // 步骤2：查找并点击金额都为0的供应商
+    await allure.step('查找并点击金额都为0的供应商', async () => {
+      const found = await supplierPage.clickSupplierWithZeroAmounts();
+      expect(found).toBeTruthy();
+    });
+
+    // 步骤3：点击删除按钮
+    await allure.step('点击删除按钮', async () => {
+      await supplierPage.clickDeleteButton();
+    });
+
+    // 步骤4：确认删除
+    await allure.step('确认删除', async () => {
+      await supplierPage.confirmDelete();
+      await supplierPage.attachScreenshot(testInfo, '删除供应商成功截图');
+    });
+  });
+
+  test('录入欠款并验证应付金额增加', async ({ supplierPage }, testInfo) => {
+    await allure.epic('供应商管理');
+    await allure.feature('供应商信息');
+    await allure.story('录入欠款');
+
+    // 录入的欠款金额
+    const debtAmount = '100';
+    const remark = '测试录入欠款';
+
+    // 步骤1：进入供应商管理页面并选择第2个供应商，记录原始应付金额和供应商名称
+    let supplierName = '';
+    const originalAmount = await allure.step('记录原始应付金额', async () => {
+      await supplierPage.navigateToSupplierManagement();
+      await supplierPage.clickSupplierItemByIndex(1);
+      await supplierPage.waitForPageLoad();
+      await supplierPage.wait(300);
+      supplierName = await supplierPage.getSupplierName();
+      return await supplierPage.parsePayableAmount();
+    });
+    console.log('录入前应付金额:', originalAmount);
+
+    // 步骤2：点击录入欠款
+    await allure.step('点击录入欠款', async () => {
+      await supplierPage.clickRecordDebt();
+    });
+
+    // 步骤3：选择欠款方向（我方欠供应商）
+    await allure.step('选择欠款方向', async () => {
+      await supplierPage.selectDebtDirection('oweSupplier');
+    });
+
+    // 步骤4：选择赊欠日期（今日）
+    await allure.step('选择赊欠日期', async () => {
+      await supplierPage.selectDebtDate();
+    });
+
+    // 步骤5：填写赊欠金额
+    await allure.step('填写赊欠金额', async () => {
+      await supplierPage.fillDebtAmount(debtAmount);
+    });
+
+    // 步骤6：填写备注
+    await allure.step('填写备注', async () => {
+      await supplierPage.fillRemark(remark);
+    });
+
+    // 步骤7：保存欠款记录
+    await allure.step('保存欠款记录', async () => {
+      await supplierPage.saveDebt();
+    });
+
+    // 步骤8：验证欠款录入成功 - 搜索同一供应商查看应付金额
+    const currentAmount = await allure.step('验证欠款录入成功', async () => {
+      await supplierPage.navigateToSupplierManagement();
+      await supplierPage.clickSupplierItemByIndex(1);
+      await supplierPage.page.waitForLoadState('networkidle');
+      await supplierPage.page.waitForTimeout(300);
+      const amount = await supplierPage.parsePayableAmount();
+      console.log('录入后应付金额:', amount);
+      return amount;
+    });
+
+    // 验证应付金额增加了录入的金额
+    expect(currentAmount).toBeCloseTo(originalAmount + parseFloat(debtAmount), 1);
+
+    await supplierPage.attachScreenshot(testInfo, '录入欠款成功截图');
+  });
+});
-import { test, expect } from '../fixtures';
-import * as allure from 'allure-js-commons';
-
-/**
- * 供应商管理测试
- */
-// 新增供应商
-test.describe('供应商管理', () => {
-  // 使用已保存的认证状态
-  test.use({ storageState: 'auth.json' });
-  
-  // 强制测试串行执行，避免并行测试之间的干扰
-  test.describe.configure({ mode: 'serial' });
-
-  test('新建供应商并绑定园区卡', async ({ supplierPage }, testInfo) => {
-    // 添加allure元素
-    await allure.epic('供应商管理');
-    await allure.feature('供应商信息');
-    await allure.story('新建供应商');
-
-    // 步骤1：生成随机供应商信息
-    const supplierInfo = await allure.step('生成随机供应商信息', async () => {
-      const info = await supplierPage.generateRandomSupplierInfo();
-      
-      console.log('供应商名称:', info.name);
-      console.log('负责人:', info.managerName);
-      console.log('手机号:', info.phone);
-      console.log('备注:', info.remark);
-      
-      return info;
-    });
-
-    // 步骤2：填写并提交供应商表单
-    await allure.step('填写并提交供应商表单', async () => {
-      // 进入供应商管理页面
-      await supplierPage.navigateToSupplierManagement();
-      
-      // 点击新建供应商
-      await supplierPage.clickAddSupplier();
-      
-      // 填写供应商名称
-      await supplierPage.fillFormField(supplierPage.supplierNameInput, supplierInfo.name);
-      
-      // 选择供应商分组
-      await supplierPage.selectGroup();
-      
-      // 填写负责人名称
-      await supplierPage.fillFormField(supplierPage.managerNameInput, supplierInfo.managerName);
-      
-      // 填写手机号
-      await supplierPage.fillFormField(supplierPage.phoneInput, supplierInfo.phone);
-      
-      // 绑定园区卡
-      await supplierPage.selectParkCard('888810046477', '地利');
-      
-      // 填写备注
-      await supplierPage.fillFormField(supplierPage.remarkInput, supplierInfo.remark || '');
-      
-      // 保存
-      await supplierPage.saveButton.click();
-      
-      await supplierPage.attachScreenshot(testInfo, '新建供应商成功截图');
-    });
-
-    // 步骤3：验证供应商创建成功
-    await allure.step('验证供应商创建成功', async () => {
-      const isCreated = await supplierPage.verifySupplierCreated(supplierInfo.name);
-      expect(isCreated).toBeTruthy();
-    });
-  });
-});
-import { test, expect } from '../fixtures';
-import * as allure from 'allure-js-commons';
-
-/**
- * 供应商管理测试 - 录入欠款
- */
-test.describe('供应商管理-录入欠款', () => {
-  // 使用已保存的认证状态
-  test.use({ storageState: 'auth.json' });
-  
-  // 强制测试串行执行
-  test.describe.configure({ mode: 'serial' });
-
-  test('录入欠款并验证应付金额增加', async ({ supplierPage }, testInfo) => {
-    // 添加allure元素
-    await allure.epic('供应商管理');
-    await allure.feature('供应商信息');
-    await allure.story('录入欠款');
-
-    // 录入的欠款金额
-    const debtAmount = '100';
-    const remark = '测试录入欠款';
-
-    // 步骤1：进入供应商管理页面并选择第2个供应商，记录原始应付金额和供应商名称
-    let supplierName = '';
-    const originalAmount = await allure.step('记录原始应付金额', async () => {
-      await supplierPage.navigateToSupplierManagement();
-      await supplierPage.clickSupplierItemByIndex(1);
-      await supplierPage.page.waitForLoadState('networkidle');
-      await supplierPage.page.waitForTimeout(300);
-      return await supplierPage.parsePayableAmount();
-    });
-    console.log('录入前应付金额:', originalAmount);
-
-    // 步骤2：点击录入欠款
-    await allure.step('点击录入欠款', async () => {
-      await supplierPage.clickRecordDebt();
-    });
-
-    // 步骤3：选择欠款方向（我方欠供应商）
-    await allure.step('选择欠款方向', async () => {
-      await supplierPage.selectDebtDirection('oweSupplier');
-    });
-
-    // 步骤4：选择赊欠日期（今日）
-    await allure.step('选择赊欠日期', async () => {
-      await supplierPage.selectDebtDate();
-    });
-
-    // 步骤5：填写赊欠金额
-    await allure.step('填写赊欠金额', async () => {
-      await supplierPage.fillDebtAmount(debtAmount);
-    });
-
-    // 步骤6：填写备注
-    await allure.step('填写备注', async () => {
-      await supplierPage.fillRemark(remark);
-    });
-
-    // 步骤7：保存欠款记录
-    await allure.step('保存欠款记录', async () => {
-      await supplierPage.saveDebt();
-    });
-
-    // 步骤8：验证欠款录入成功 - 搜索同一供应商查看应付金额
-    const currentAmount = await allure.step('验证欠款录入成功', async () => {
-      await supplierPage.navigateToSupplierManagement();
-      await supplierPage.clickSupplierItemByIndex(1);
-      await supplierPage.page.waitForLoadState('networkidle');
-      await supplierPage.page.waitForTimeout(300);
-      const amount = await supplierPage.parsePayableAmount();
-      console.log('录入后应付金额:', amount);
-      return amount;
-    });
-    
-    // 验证应付金额增加了录入的金额
-    expect(currentAmount).toBeCloseTo(originalAmount + parseFloat(debtAmount), 1);
-    
-    await supplierPage.attachScreenshot(testInfo, '录入欠款成功截图');
-  });
-});
 \ No newline at end of file
-import { test, expect } from '../fixtures';
-import * as allure from 'allure-js-commons';
-
-/**
- * 供应商管理测试 - 删除供应商
- */
-test.describe('供应商管理-删除', () => {
-  // 使用已保存的认证状态
-  test.use({ storageState: 'auth.json' });
-  
-  // 强制测试串行执行
-  test.describe.configure({ mode: 'serial' });
-
-  test('删除供应商（金额都为0）', async ({ supplierPage }, testInfo) => {
-    // 添加allure元素
-    await allure.epic('供应商管理');
-    await allure.feature('供应商信息');
-    await allure.story('删除供应商');
-
-    // 步骤1：进入供应商管理页面
-    await allure.step('进入供应商管理页面', async () => {
-      await supplierPage.navigateToSupplierManagement();
-    });
-
-    // 步骤2：查找并点击金额都为0的供应商
-    await allure.step('查找并点击金额都为0的供应商', async () => {
-      const found = await supplierPage.clickSupplierWithZeroAmounts();
-      expect(found).toBeTruthy();
-    });
-
-    // 步骤3：点击删除按钮
-    await allure.step('点击删除按钮', async () => {
-      await supplierPage.clickDeleteButton();
-    });
-
-    // 步骤4：确认删除
-    await allure.step('确认删除', async () => {
-      await supplierPage.confirmDelete();
-      await supplierPage.attachScreenshot(testInfo, '删除供应商成功截图');
-    });
-  });
-});
 \ No newline at end of file
+import { test, expect } from '../fixtures';
+import * as allure from 'allure-js-commons';
+
+/**
+ * 供应商分组管理测试
+ */
+test.describe('供应商分组管理', () => {
+  // 使用已保存的认证状态
+  test.use({ storageState: 'auth.json' });
+
+  // 强制测试串行执行，避免并行测试之间的干扰
+  test.describe.configure({ mode: 'serial' });
+
+  test('新增供应商分组', async ({ supplierGroupingPage }, testInfo) => {
+    await allure.epic('供应商管理');
+    await allure.feature('供应商分组');
+    await allure.story('新增供应商分组');
+
+    // 步骤1：生成随机分组信息
+    const groupName = `自动${Date.now().toString().slice(-3)}`;
+    const remark = '自动化测试';
+
+    // 步骤2：进入供应商分组页面并点击新建
+    await allure.step('进入供应商分组页面', async () => {
+      await supplierGroupingPage.navigateToSupplierGrouping();
+      await supplierGroupingPage.clickAddButton();
+    });
+
+    // 步骤3：填写分组信息
+    await allure.step('填写分组信息', async () => {
+      await supplierGroupingPage.fillGroupName(groupName);
+      await supplierGroupingPage.fillRemark(remark);
+    });
+
+    // 步骤4：保存分组
+    await allure.step('保存分组', async () => {
+      await supplierGroupingPage.saveGrouping();
+      await supplierGroupingPage.attachScreenshot(testInfo, '新增供应商分组成功截图');
+    });
+
+    // 步骤5：验证分组创建成功
+    await allure.step('验证分组创建成功', async () => {
+      const isCreated = await supplierGroupingPage.verifyGroupingCreated(groupName);
+      expect(isCreated).toBeTruthy();
+    });
+  });
+
+  test('修改供应商分组', async ({ supplierGroupingPage }, testInfo) => {
+    await allure.epic('供应商管理');
+    await allure.feature('供应商分组');
+    await allure.story('修改供应商分组');
+
+    // 步骤1：生成新的分组信息
+    const newGroupName = `修改${Date.now().toString().slice(-2)}`;
+    const newRemark = '自动化测试修改';
+
+    // 步骤2：进入供应商分组页面
+    await allure.step('进入供应商分组页面', async () => {
+      await supplierGroupingPage.navigateToSupplierGrouping();
+    });
+
+    // 步骤3：点击编辑分组
+    await allure.step('点击编辑分组', async () => {
+      await supplierGroupingPage.clickEditButton();
+    });
+
+    // 步骤4：修改分组信息
+    await allure.step('修改分组信息', async () => {
+      await supplierGroupingPage.updateGrouping(newGroupName, newRemark);
+      await supplierGroupingPage.attachScreenshot(testInfo, '修改供应商分组成功截图');
+    });
+
+    // 步骤5：验证分组修改成功
+    await allure.step('验证分组修改成功', async () => {
+      const isUpdated = await supplierGroupingPage.verifyGroupingUpdated(newGroupName);
+      expect(isUpdated).toBeTruthy();
+    });
+  });
+
+  test('删除供应商分组', async ({ supplierGroupingPage }, testInfo) => {
+    await allure.epic('供应商管理');
+    await allure.feature('供应商分组');
+    await allure.story('删除供应商分组');
+
+    // 步骤1：生成待删除的分组名称
+    const groupName = `删除${Date.now().toString().slice(-2)}`;
+
+    // 步骤2：先创建一个分组用于删除
+    await allure.step('创建待删除的分组', async () => {
+      await supplierGroupingPage.navigateToSupplierGrouping();
+      await supplierGroupingPage.clickAddButton();
+      await supplierGroupingPage.fillGroupName(groupName);
+      await supplierGroupingPage.fillRemark('自动化测试');
+      await supplierGroupingPage.saveGrouping();
+    });
+
+    // 步骤3：删除分组
+    await allure.step('删除分组', async () => {
+      await supplierGroupingPage.navigateToSupplierGrouping();
+      await supplierGroupingPage.clickGroupingItem(groupName);
+      await supplierGroupingPage.clickDeleteButton();
+      await supplierGroupingPage.confirmDelete();
+      await supplierGroupingPage.attachScreenshot(testInfo, '删除供应商分组成功截图');
+    });
+
+    // 步骤4：验证分组删除成功
+    await allure.step('验证分组删除成功', async () => {
+      const isDeleted = await supplierGroupingPage.verifyGroupingDeleted(groupName);
+      expect(isDeleted).toBeTruthy();
+    });
+  });
+});
-import { test, expect } from '../fixtures';
-import * as allure from 'allure-js-commons';
-
-/**
- * 供应商管理测试 - 编辑供应商
- */
-test.describe('供应商管理-编辑', () => {
-  // 使用已保存的认证状态
-  test.use({ storageState: 'auth.json' });
-  
-  // 强制测试串行执行
-  test.describe.configure({ mode: 'serial' });
-
-  test('编辑供应商并绑定园区卡', async ({ supplierPage }, testInfo) => {
-    // 添加allure元素
-    await allure.epic('供应商管理');
-    await allure.feature('供应商信息');
-    await allure.story('编辑供应商');
-
-    // 步骤1：生成新的供应商信息
-    const supplierInfo = await allure.step('生成新的供应商信息', async () => {
-      // 随机生成供应商名称前缀
-      const namePrefixes = ['修改', '更新', '调整', '变更'];
-      const namePrefix = namePrefixes[Math.floor(Math.random() * namePrefixes.length)];
-      
-      const info = await supplierPage.generateRandomSupplierInfo({
-        namePrefix: namePrefix,
-      });
-      
-      console.log('新供应商名称:', info.name);
-      console.log('新负责人:', info.managerName);
-      console.log('新手机号:', info.phone);
-      console.log('新备注:', info.remark);
-      
-      return info;
-    });
-
-    // 步骤2：填写并提交供应商表单
-    await allure.step('填写并提交供应商表单', async () => {
-      // 进入供应商管理页面
-      await supplierPage.navigateToSupplierManagement();
-      
-      // 选择供应商列表项（点击第一个）
-      await supplierPage.clickSupplierItemByIndex(0);
-      
-      // 点击编辑按钮
-      await supplierPage.clickEditButton();
-      
-      // 修改供应商名称
-      await supplierPage.clearAndFillFormField(supplierPage.supplierNameInput, supplierInfo.name);
-      
-      // 修改负责人名称
-      await supplierPage.clearAndFillFormField(supplierPage.managerNameInput, supplierInfo.managerName);
-      
-      // 修改手机号
-      await supplierPage.clearAndFillFormField(supplierPage.phoneInput, supplierInfo.phone);
-      
-      // 选择供应商类型（必选字段）
-      await supplierPage.selectSupplierType();
-      
-      // 绑定园区卡
-      await supplierPage.selectParkCard('888800010617');
-      
-      // 修改备注
-      await supplierPage.clearAndFillFormField(supplierPage.remarkInput, supplierInfo.remark || '');
-      
-      // 保存
-      await supplierPage.clickConfirmButton();
-      
-      await supplierPage.attachScreenshot(testInfo, '编辑供应商成功截图');
-    });
-
-    // 步骤3：验证供应商修改成功
-    await allure.step('验证供应商修改成功', async () => {
-      const isUpdated = await supplierPage.verifySupplierCreated(supplierInfo.name);
-      expect(isUpdated).toBeTruthy();
-    });
-  });
-});
 \ No newline at end of file