diff --git a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue index 05d0177c..a7392466 100644 --- a/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue +++ b/src/modules/overseas-warehouse/pages/LastMileOrdersView.vue @@ -694,11 +694,11 @@ function orderTypeText(orderType: string) { } function readinessText(readiness: ContainerInboundPlanPreviewOrderDto['readiness']) { - return readiness === 'READY' ? '可生成' : readiness === 'RESOURCE_PENDING' ? '待补托盘' : readiness === 'PLANNED' ? '已有计划' : '已阻断' + return readiness === 'READY' ? '可生成' : readiness === 'RESOURCE_PENDING' ? '将自动补齐' : readiness === 'PLANNED' ? '已有计划' : '已阻断' } function readinessType(readiness: ContainerInboundPlanPreviewOrderDto['readiness']) { - return readiness === 'READY' ? 'success' : readiness === 'RESOURCE_PENDING' ? 'warning' : readiness === 'PLANNED' ? 'info' : 'danger' + return readiness === 'READY' || readiness === 'RESOURCE_PENDING' ? 'success' : readiness === 'PLANNED' ? 'info' : 'danger' } function blockerText(blockers: string[]) { diff --git a/src/modules/overseas-warehouse/pages/containerPlanPreviewContract.test.ts b/src/modules/overseas-warehouse/pages/containerPlanPreviewContract.test.ts index 422dc445..ddbd5c6c 100644 --- a/src/modules/overseas-warehouse/pages/containerPlanPreviewContract.test.ts +++ b/src/modules/overseas-warehouse/pages/containerPlanPreviewContract.test.ts @@ -17,6 +17,7 @@ describe('container inbound plan preview contract', () => { expect(pageSource).toContain('containerPreview.supplementPalletCount') expect(pageSource).toContain('v-for="group in containerPreview.groups"') expect(pageSource).toContain('readinessText(row.readiness)') + expect(pageSource).toContain("RESOURCE_PENDING' ? '将自动补齐'") expect(pageSource).toContain('blockerText(row.blockers)') expect(pageSource).not.toContain('containerPreview.groups.sort(') })