diff --git a/shared/src/index.ts b/shared/src/index.ts index ff5fa2a..ceb64c2 100644 --- a/shared/src/index.ts +++ b/shared/src/index.ts @@ -86,7 +86,6 @@ export const FIRST_LEG_ORDER_STATUSES = [ { code: 'DRAFT', label: '草稿' }, { code: 'PENDING_REVIEW', label: '待审核' }, { code: 'WAIT_MEASURE', label: '待测量数据' }, - { code: 'INBOUNDED', label: '已入库' }, { code: 'WAIT_SPLIT', label: '待分柜' }, { code: 'LOADING', label: '装柜中' }, { code: 'LOADED', label: '装柜完成' }, diff --git a/src/modules/first-leg/api/unifiedOrders.ts b/src/modules/first-leg/api/unifiedOrders.ts index 3f24b87..7c7ee97 100644 --- a/src/modules/first-leg/api/unifiedOrders.ts +++ b/src/modules/first-leg/api/unifiedOrders.ts @@ -4,7 +4,6 @@ import type { ApiFirstLegStatus, MerchantFirstLegOrderDetail, PageResult } from export type ApiUnifiedOrderMainStatus = | 'PENDING_REVIEW' | 'WAIT_MEASURE' - | 'INBOUNDED' | 'WAIT_SPLIT' | 'LOADING' | 'LOADED' diff --git a/src/modules/first-leg/components/InboundBillingPanel.test.mjs b/src/modules/first-leg/components/InboundBillingPanel.test.mjs index e45257b..98edded 100644 --- a/src/modules/first-leg/components/InboundBillingPanel.test.mjs +++ b/src/modules/first-leg/components/InboundBillingPanel.test.mjs @@ -10,7 +10,7 @@ test('renders loading, pending, isolated error, and published states', () => { assert.match(source, /role="alert"/) assert.match(source, /v-else-if="props\.unavailable \|\| !props\.data"/) assert.match(source, /role="status"/) - assert.match(source, /已入库 · 费用已发布/) + assert.match(source, /待分柜 · 费用已发布/) assert.match(source, /\$emit\('retry'\)/) }) diff --git a/src/modules/first-leg/components/InboundBillingPanel.vue b/src/modules/first-leg/components/InboundBillingPanel.vue index b745b51..0b15be3 100644 --- a/src/modules/first-leg/components/InboundBillingPanel.vue +++ b/src/modules/first-leg/components/InboundBillingPanel.vue @@ -34,7 +34,7 @@ defineEmits<{

入库与费用

- 已入库 · 费用已发布 + 待分柜 · 费用已发布
diff --git a/src/modules/first-leg/types/inboundBilling.ts b/src/modules/first-leg/types/inboundBilling.ts index bf52f8a..e700078 100644 --- a/src/modules/first-leg/types/inboundBilling.ts +++ b/src/modules/first-leg/types/inboundBilling.ts @@ -6,7 +6,7 @@ export type MerchantInboundProcessStatus = | 'WAIT_PRICING' | 'FEE_CONFIRMING' | 'INBOUNDING' - | 'INBOUNDED' + | 'WAIT_SPLIT' | 'VOIDED' export type MerchantInboundFeeStatus = 'UNPRICED' | 'CALCULATED' | 'CONFIRMED' | 'SENT' | 'VOIDED' diff --git a/src/modules/first-leg/utils/firstLegOrder.test.mjs b/src/modules/first-leg/utils/firstLegOrder.test.mjs index 221113a..4df1da9 100644 --- a/src/modules/first-leg/utils/firstLegOrder.test.mjs +++ b/src/modules/first-leg/utils/firstLegOrder.test.mjs @@ -58,7 +58,7 @@ function validDraft() { test('uses the confirmed status and transport labels', () => { assert.equal(getFirstLegStatusLabel('WAIT_MEASURE'), '待测量数据') - assert.equal(getFirstLegStatusLabel('INBOUNDED'), '已入库') + assert.equal(getFirstLegStatusLabel('WAIT_SPLIT'), '待分柜') assert.equal(getFirstLegStatusLabel('WAIT_SPLIT'), '待分柜') assert.equal(getFirstLegStatusLabel('LOADING'), '装柜中') assert.equal(getFirstLegStatusLabel('LOADED'), '装柜完成')