Commit 79a08ff4 authored by liguangyu06's avatar liguangyu06
Browse files

修复报表表头 strict mode、列设置关面板超时及汇总/排序定位,避免夜间全量被脚本误杀。

parent 35fe36af
...@@ -18,8 +18,10 @@ test.describe('科室出库汇总查询 · 快捷筛选', () => { ...@@ -18,8 +18,10 @@ test.describe('科室出库汇总查询 · 快捷筛选', () => {
test('STAT-DOS-001 快捷区重置恢复默认', { tag: '@smoke' }, async ({ deptReportOutPage }) => { test('STAT-DOS-001 快捷区重置恢复默认', { tag: '@smoke' }, async ({ deptReportOutPage }) => {
const sample = await deptReportOutPage.searchAndExtractSample(); const sample = await deptReportOutPage.searchAndExtractSample();
const product = sample.productName ?? deptReportOutPage.getSampleValue(sample, 'productCode'); const product = sample.productName?.trim() || sample.productCode?.trim();
await deptReportOutPage.fillProductName(product); if (product) {
await deptReportOutPage.fillProductName(product);
}
await deptReportOutPage.checkDimension('区分包装'); await deptReportOutPage.checkDimension('区分包装');
await deptReportOutPage.resetQuickFilter(); await deptReportOutPage.resetQuickFilter();
await deptReportOutPage.expectProductNameEmpty(); await deptReportOutPage.expectProductNameEmpty();
...@@ -100,14 +102,7 @@ test.describe('科室出库汇总查询 · 列设置', () => { ...@@ -100,14 +102,7 @@ test.describe('科室出库汇总查询 · 列设置', () => {
}); });
test('STAT-DOS-012 列设置取消勾选后再勾选列表列恢复', async ({ deptReportOutPage }) => { test('STAT-DOS-012 列设置取消勾选后再勾选列表列恢复', async ({ deptReportOutPage }) => {
const columnName = await deptReportOutPage.pickToggleColumnName(); await deptReportOutPage.executeColumnSettingsToggleRestoreTest();
await deptReportOutPage.openColumnSettings();
await deptReportOutPage.setColumnVisibleInSettings(columnName, false);
await deptReportOutPage.closeColumnSettingsPanel();
await deptReportOutPage.expectTableHeaderVisible(columnName, false);
await deptReportOutPage.openColumnSettings();
await deptReportOutPage.expectSettingsCheckboxChecked(columnName, false);
await deptReportOutPage.closeColumnSettingsPanel();
}); });
}); });
......
...@@ -89,14 +89,7 @@ test.describe('科室出入库明细查询 · 列设置', () => { ...@@ -89,14 +89,7 @@ test.describe('科室出入库明细查询 · 列设置', () => {
}); });
test('STAT-DOD-010 列设置取消勾选后再勾选列表列恢复', async ({ deptReportSheetPage }) => { test('STAT-DOD-010 列设置取消勾选后再勾选列表列恢复', async ({ deptReportSheetPage }) => {
const columnName = await deptReportSheetPage.pickToggleColumnName(); await deptReportSheetPage.executeColumnSettingsToggleRestoreTest();
await deptReportSheetPage.openColumnSettings();
await deptReportSheetPage.setColumnVisibleInSettings(columnName, false);
await deptReportSheetPage.closeColumnSettingsPanel();
await deptReportSheetPage.expectTableHeaderVisible(columnName, false);
await deptReportSheetPage.openColumnSettings();
await deptReportSheetPage.expectSettingsCheckboxChecked(columnName, false);
await deptReportSheetPage.closeColumnSettingsPanel();
}); });
}); });
......
...@@ -120,18 +120,6 @@ test.describe('科室产品周转率报表 · 列设置', () => { ...@@ -120,18 +120,6 @@ test.describe('科室产品周转率报表 · 列设置', () => {
}); });
test('STAT-DTR-019 列设置取消勾选后再勾选列表列恢复', async ({ deptReportTurnoverPage }) => { test('STAT-DTR-019 列设置取消勾选后再勾选列表列恢复', async ({ deptReportTurnoverPage }) => {
const columnName = await deptReportTurnoverPage.pickToggleColumnName(); await deptReportTurnoverPage.executeColumnSettingsToggleRestoreTest();
await deptReportTurnoverPage.openColumnSettings();
await deptReportTurnoverPage.setColumnVisibleInSettings(columnName, false);
await deptReportTurnoverPage.closeColumnSettingsPanel();
await deptReportTurnoverPage.expectTableHeaderVisible(columnName, false);
await deptReportTurnoverPage.openColumnSettings();
await deptReportTurnoverPage.expectSettingsCheckboxChecked(columnName, false);
await deptReportTurnoverPage.setColumnVisibleInSettings(columnName, true);
await deptReportTurnoverPage.closeColumnSettingsPanel();
await deptReportTurnoverPage.expectTableHeaderVisible(columnName, true);
await deptReportTurnoverPage.openColumnSettings();
await deptReportTurnoverPage.expectSettingsCheckboxChecked(columnName, true);
await deptReportTurnoverPage.closeColumnSettingsPanel();
}); });
}); });
...@@ -95,16 +95,7 @@ describeWithReuseOpen( ...@@ -95,16 +95,7 @@ describeWithReuseOpen(
}); });
test('STAT-EXL-009 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-EXL-009 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
...@@ -86,16 +86,7 @@ describeWithReuseOpen( ...@@ -86,16 +86,7 @@ describeWithReuseOpen(
}); });
test('STAT-EXN-009 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-EXN-009 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
...@@ -114,28 +114,7 @@ describeWithReuseOpen( ...@@ -114,28 +114,7 @@ describeWithReuseOpen(
}); });
test("STAT-IBL-008 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-IBL-008 列设置取消勾选后再勾选列表列恢复", async () => {
const invoiceBalanceStatusPage = getReport(); const invoiceBalanceStatusPage = getReport();
const columnName = await invoiceBalanceStatusPage.pickToggleColumnName(); await invoiceBalanceStatusPage.executeColumnSettingsToggleRestoreTest();
await invoiceBalanceStatusPage.openColumnSettings();
await invoiceBalanceStatusPage.setColumnVisibleInSettings(
columnName,
false,
);
await invoiceBalanceStatusPage.closeColumnSettingsPanel();
await invoiceBalanceStatusPage.expectTableHeaderVisible(
columnName,
false,
);
await invoiceBalanceStatusPage.openColumnSettings();
await invoiceBalanceStatusPage.expectSettingsCheckboxChecked(
columnName,
false,
);
await invoiceBalanceStatusPage.setColumnVisibleInSettings(
columnName,
true,
);
await invoiceBalanceStatusPage.closeColumnSettingsPanel();
await invoiceBalanceStatusPage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -90,13 +90,13 @@ describeWithReuseOpen( ...@@ -90,13 +90,13 @@ describeWithReuseOpen(
describeWithReuseOpen( describeWithReuseOpen(
"结算开票查询 · 开票与结算", "结算开票查询 · 开票与结算",
(page) => new InvoiceSettlePage(page), (page) => new InvoiceSettlePage(page),
{}, { searchOnOpen: true },
({ getReport }) => { ({ getReport }) => {
test("STAT-ISV-006 结算月份与进院供应商组合查询", async () => { test("STAT-ISV-006 结算月份与进院供应商组合查询", async () => {
const invoiceSettlePage = getReport(); const invoiceSettlePage = getReport();
await invoiceSettlePage.searchWithQuickComboVerified( await invoiceSettlePage.searchWithQuickComboVerified(
invoiceSettleComboQuickFields, invoiceSettleDomainQuickFields,
invoiceSettleComboAssertKeys, invoiceSettleDomainAssertKeys,
); );
}); });
}, },
...@@ -133,16 +133,7 @@ describeWithReuseOpen( ...@@ -133,16 +133,7 @@ describeWithReuseOpen(
}); });
test("STAT-ISV-010 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-ISV-010 列设置取消勾选后再勾选列表列恢复", async () => {
const invoiceSettlePage = getReport(); const invoiceSettlePage = getReport();
const columnName = await invoiceSettlePage.pickToggleColumnName(); await invoiceSettlePage.executeColumnSettingsToggleRestoreTest();
await invoiceSettlePage.openColumnSettings();
await invoiceSettlePage.setColumnVisibleInSettings(columnName, false);
await invoiceSettlePage.closeColumnSettingsPanel();
await invoiceSettlePage.expectTableHeaderVisible(columnName, false);
await invoiceSettlePage.openColumnSettings();
await invoiceSettlePage.expectSettingsCheckboxChecked(columnName, false);
await invoiceSettlePage.setColumnVisibleInSettings(columnName, true);
await invoiceSettlePage.closeColumnSettingsPanel();
await invoiceSettlePage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -82,16 +82,7 @@ describeWithReuseOpen( ...@@ -82,16 +82,7 @@ describeWithReuseOpen(
}); });
test('STAT-PVC-006 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-PVC-006 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -66,16 +66,7 @@ describeWithReuseOpen( ...@@ -66,16 +66,7 @@ describeWithReuseOpen(
}); });
test('STAT-PDV-006 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-PDV-006 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -87,16 +87,7 @@ describeWithReuseOpen( ...@@ -87,16 +87,7 @@ describeWithReuseOpen(
}); });
test('STAT-PKP-009 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-PKP-009 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -87,16 +87,7 @@ describeWithReuseOpen( ...@@ -87,16 +87,7 @@ describeWithReuseOpen(
}); });
test('STAT-PRT-009 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-PRT-009 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -71,16 +71,7 @@ describeWithReuseOpen( ...@@ -71,16 +71,7 @@ describeWithReuseOpen(
}); });
test('STAT-PSV-006 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-PSV-006 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -96,16 +96,7 @@ describeWithReuseOpen( ...@@ -96,16 +96,7 @@ describeWithReuseOpen(
}); });
test('STAT-PTS-009 列设置取消勾选后再勾选列表列恢复', async () => { test('STAT-PTS-009 列设置取消勾选后再勾选列表列恢复', async () => {
const p = getReport(); const p = getReport();
const columnName = await p.pickToggleColumnName(); await p.executeColumnSettingsToggleRestoreTest();
await p.openColumnSettings();
await p.setColumnVisibleInSettings(columnName, false);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, false);
await p.openColumnSettings();
await p.expectSettingsCheckboxChecked(columnName, false);
await p.setColumnVisibleInSettings(columnName, true);
await p.closeColumnSettingsPanel();
await p.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -58,16 +58,7 @@ test.describe('试剂批号统计明细 · 列设置', () => { ...@@ -58,16 +58,7 @@ test.describe('试剂批号统计明细 · 列设置', () => {
await reagEntryPage.closeColumnSettingsPanel(); await reagEntryPage.closeColumnSettingsPanel();
}); });
test('STAT-RBE-006 列设置取消勾选后再勾选列表列恢复', async ({ reagEntryPage }) => { test('STAT-RBE-006 列设置取消勾选后再勾选列表列恢复', async ({ reagEntryPage }) => {
const columnName = await reagEntryPage.pickToggleColumnName(); await reagEntryPage.executeColumnSettingsToggleRestoreTest();
await reagEntryPage.openColumnSettings();
await reagEntryPage.setColumnVisibleInSettings(columnName, false);
await reagEntryPage.closeColumnSettingsPanel();
await reagEntryPage.expectTableHeaderVisible(columnName, false);
await reagEntryPage.openColumnSettings();
await reagEntryPage.expectSettingsCheckboxChecked(columnName, false);
await reagEntryPage.setColumnVisibleInSettings(columnName, true);
await reagEntryPage.closeColumnSettingsPanel();
await reagEntryPage.expectTableHeaderVisible(columnName, true);
}); });
}); });
......
...@@ -133,19 +133,7 @@ describeWithReuseOpen( ...@@ -133,19 +133,7 @@ describeWithReuseOpen(
}); });
test("STAT-RDA-011 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-RDA-011 列设置取消勾选后再勾选列表列恢复", async () => {
const reconDeptAccountPage = getReport(); const reconDeptAccountPage = getReport();
const columnName = await reconDeptAccountPage.pickToggleColumnName(); await reconDeptAccountPage.executeColumnSettingsToggleRestoreTest();
await reconDeptAccountPage.openColumnSettings();
await reconDeptAccountPage.setColumnVisibleInSettings(columnName, false);
await reconDeptAccountPage.closeColumnSettingsPanel();
await reconDeptAccountPage.expectTableHeaderVisible(columnName, false);
await reconDeptAccountPage.openColumnSettings();
await reconDeptAccountPage.expectSettingsCheckboxChecked(
columnName,
false,
);
await reconDeptAccountPage.setColumnVisibleInSettings(columnName, true);
await reconDeptAccountPage.closeColumnSettingsPanel();
await reconDeptAccountPage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -135,16 +135,7 @@ describeWithReuseOpen( ...@@ -135,16 +135,7 @@ describeWithReuseOpen(
}); });
test("STAT-RNI-011 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-RNI-011 列设置取消勾选后再勾选列表列恢复", async () => {
const reconDeptNetInPage = getReport(); const reconDeptNetInPage = getReport();
const columnName = await reconDeptNetInPage.pickToggleColumnName(); await reconDeptNetInPage.executeColumnSettingsToggleRestoreTest();
await reconDeptNetInPage.openColumnSettings();
await reconDeptNetInPage.setColumnVisibleInSettings(columnName, false);
await reconDeptNetInPage.closeColumnSettingsPanel();
await reconDeptNetInPage.expectTableHeaderVisible(columnName, false);
await reconDeptNetInPage.openColumnSettings();
await reconDeptNetInPage.expectSettingsCheckboxChecked(columnName, false);
await reconDeptNetInPage.setColumnVisibleInSettings(columnName, true);
await reconDeptNetInPage.closeColumnSettingsPanel();
await reconDeptNetInPage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -130,19 +130,7 @@ describeWithReuseOpen( ...@@ -130,19 +130,7 @@ describeWithReuseOpen(
}); });
test("STAT-RNO-011 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-RNO-011 列设置取消勾选后再勾选列表列恢复", async () => {
const reconDeptNetOutPage = getReport(); const reconDeptNetOutPage = getReport();
const columnName = await reconDeptNetOutPage.pickToggleColumnName(); await reconDeptNetOutPage.executeColumnSettingsToggleRestoreTest();
await reconDeptNetOutPage.openColumnSettings();
await reconDeptNetOutPage.setColumnVisibleInSettings(columnName, false);
await reconDeptNetOutPage.closeColumnSettingsPanel();
await reconDeptNetOutPage.expectTableHeaderVisible(columnName, false);
await reconDeptNetOutPage.openColumnSettings();
await reconDeptNetOutPage.expectSettingsCheckboxChecked(
columnName,
false,
);
await reconDeptNetOutPage.setColumnVisibleInSettings(columnName, true);
await reconDeptNetOutPage.closeColumnSettingsPanel();
await reconDeptNetOutPage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -136,22 +136,7 @@ describeWithReuseOpen( ...@@ -136,22 +136,7 @@ describeWithReuseOpen(
}); });
test("STAT-RPE-011 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-RPE-011 列设置取消勾选后再勾选列表列恢复", async () => {
const reconPurchaseEntryPage = getReport(); const reconPurchaseEntryPage = getReport();
const columnName = await reconPurchaseEntryPage.pickToggleColumnName(); await reconPurchaseEntryPage.executeColumnSettingsToggleRestoreTest();
await reconPurchaseEntryPage.openColumnSettings();
await reconPurchaseEntryPage.setColumnVisibleInSettings(
columnName,
false,
);
await reconPurchaseEntryPage.closeColumnSettingsPanel();
await reconPurchaseEntryPage.expectTableHeaderVisible(columnName, false);
await reconPurchaseEntryPage.openColumnSettings();
await reconPurchaseEntryPage.expectSettingsCheckboxChecked(
columnName,
false,
);
await reconPurchaseEntryPage.setColumnVisibleInSettings(columnName, true);
await reconPurchaseEntryPage.closeColumnSettingsPanel();
await reconPurchaseEntryPage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -135,16 +135,7 @@ describeWithReuseOpen( ...@@ -135,16 +135,7 @@ describeWithReuseOpen(
}); });
test("STAT-TBC-011 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-TBC-011 列设置取消勾选后再勾选列表列恢复", async () => {
const traceBarcodePage = getReport(); const traceBarcodePage = getReport();
const columnName = await traceBarcodePage.pickToggleColumnName(); await traceBarcodePage.executeColumnSettingsToggleRestoreTest();
await traceBarcodePage.openColumnSettings();
await traceBarcodePage.setColumnVisibleInSettings(columnName, false);
await traceBarcodePage.closeColumnSettingsPanel();
await traceBarcodePage.expectTableHeaderVisible(columnName, false);
await traceBarcodePage.openColumnSettings();
await traceBarcodePage.expectSettingsCheckboxChecked(columnName, false);
await traceBarcodePage.setColumnVisibleInSettings(columnName, true);
await traceBarcodePage.closeColumnSettingsPanel();
await traceBarcodePage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
...@@ -120,16 +120,7 @@ describeWithReuseOpen( ...@@ -120,16 +120,7 @@ describeWithReuseOpen(
}); });
test("STAT-TDB-009 列设置取消勾选后再勾选列表列恢复", async () => { test("STAT-TDB-009 列设置取消勾选后再勾选列表列恢复", async () => {
const traceDeptBuyPage = getReport(); const traceDeptBuyPage = getReport();
const columnName = await traceDeptBuyPage.pickToggleColumnName(); await traceDeptBuyPage.executeColumnSettingsToggleRestoreTest();
await traceDeptBuyPage.openColumnSettings();
await traceDeptBuyPage.setColumnVisibleInSettings(columnName, false);
await traceDeptBuyPage.closeColumnSettingsPanel();
await traceDeptBuyPage.expectTableHeaderVisible(columnName, false);
await traceDeptBuyPage.openColumnSettings();
await traceDeptBuyPage.expectSettingsCheckboxChecked(columnName, false);
await traceDeptBuyPage.setColumnVisibleInSettings(columnName, true);
await traceDeptBuyPage.closeColumnSettingsPanel();
await traceDeptBuyPage.expectTableHeaderVisible(columnName, true);
}); });
}, },
); );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment