From 09b0c4452dcc9e878ce541ec28e4129df4a2a7bc Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Wed, 16 Sep 2026 16:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/first-leg/views/FirstLegOrdersView.test.mjs | 3 +++ src/modules/first-leg/views/FirstLegOrdersView.vue | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs index afcc746..95a0fb3 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs +++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs @@ -400,6 +400,9 @@ test('loads only active server channels for the selected domestic warehouse', () assert.match(source, /availablePricingTaxModes/) assert.match(source, /:loading="channelLoading"/) assert.match(source, /:disabled="!form\.receivingWarehouseId \|\| channelLoading"/) + assert.match(source, /label="报价包税方式" prop="pricingTaxMode" required class="pricing-tax-mode-field"/) + assert.match(source, /\.compact-transport-grid > :deep\(\.pricing-tax-mode-field\) \{ display: none; \}/) + assert.doesNotMatch(source, /\.compact-transport-grid > :deep\(\.el-form-item:nth-child\(2\)\)/) assert.match(source, /当前收货仓暂无可用渠道/) assert.match(source, /渠道加载失败/) assert.match(source, /@click="retryPricingChannels"/) diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue index 08f031a..dd0acb3 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.vue +++ b/src/modules/first-leg/views/FirstLegOrdersView.vue @@ -2049,7 +2049,7 @@ async function searchOrders(model: QueryModel) { 渠道加载失败：{{ channelError }} 重试 当前收货仓暂无可用渠道，请联系平台管理员。 - + {{ pricingTaxModeLabel(mode) }} 当前渠道没有可用报价方式，请重新选择渠道。 @@ -2493,7 +2493,7 @@ async function searchOrders(model: QueryModel) { .shipping-form-flow .prototype-form-row--tabs { margin-bottom: 12px; } .compact-transport-grid { display: grid; width: 100%; grid-template-columns: 1fr; gap: 0; margin: 6px 0 0; } .compact-transport-grid > :deep(.el-form-item) { display: grid; width: 100%; grid-template-columns: 114px minmax(0, 560px); align-items: start; margin-bottom: 10px; } -.compact-transport-grid > :deep(.el-form-item:nth-child(2)) { display: none; } +.compact-transport-grid > :deep(.pricing-tax-mode-field) { display: none; } .compact-transport-grid > :deep(.el-form-item:nth-child(1)) { grid-template-columns: 114px minmax(0, 360px); } .compact-transport-grid > :deep(.el-form-item:nth-child(6)) { grid-template-columns: 114px minmax(0, 360px); } .compact-transport-grid > :deep(.el-form-item:nth-child(7)) { grid-template-columns: 114px minmax(0, 620px); margin-top: 2px; margin-bottom: 0; } @@ -2667,7 +2667,7 @@ async function searchOrders(model: QueryModel) { .segmented-options :deep(.el-radio-button__inner) { border: 1px solid var(--border); border-radius: 6px !important; box-shadow: none !important; } .warehouse-options { width: 100%; gap: 12px 18px; } .compact-transport-grid > :deep(.el-form-item), .compact-transport-grid > :deep(.el-form-item:nth-child(7)) { display: block; margin-bottom: 14px; } -.compact-transport-grid > :deep(.el-form-item:nth-child(2)) { display: none; } +.compact-transport-grid > :deep(.pricing-tax-mode-field) { display: none; } .compact-transport-grid > :deep(.el-form-item__label) { min-height: auto; justify-content: flex-start; padding: 0 0 8px; line-height: 1.4; } .cargo-table-toolbar { align-items: stretch; flex-direction: column; } .cargo-import-actions, .cargo-table-actions { flex-wrap: wrap; }