diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts b/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts index 4aea7ed6..c8424391 100644 --- a/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts +++ b/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts @@ -39,6 +39,10 @@ describe('UnifiedOrdersView contract', () => { expect(source).toContain("warehouse.warehouseType === 'DOMESTIC'") expect(source).toContain("loaded: optionalBoolean(filters.value.loaded)") expect(source).toContain("fullContainer: optionalBoolean(filters.value.fullContainer)") + expect(source).toContain("{ value: 'UNRECORDED', label: '未录入' }") + expect(source).not.toContain("{ value: 'DRAFT', label: '草稿' }") + expect(source).not.toContain("{ value: 'CANCELLED', label: '已取消' }") + expect(source).toContain("placeholder: '订单号或客户名称'") }) it('covers real list states and keeps operation column first and left-fixed', () => { diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.vue b/src/modules/unified-orders/pages/UnifiedOrdersView.vue index a15ecd73..0c6a38e3 100644 --- a/src/modules/unified-orders/pages/UnifiedOrdersView.vue +++ b/src/modules/unified-orders/pages/UnifiedOrdersView.vue @@ -93,7 +93,7 @@ const primaryQueryFields = computed(() => [ })), props: { 'aria-label': '客户', filterable: true, loading: customerLoading.value, disabled: Boolean(customerLoadError.value) }, }, - { key: 'keyword', type: 'input', width: 260, label: '综合搜索', placeholder: '订单号、入仓码或客户名称', props: { 'aria-label': '订单关键词' } }, + { key: 'keyword', type: 'input', width: 260, label: '综合搜索', placeholder: '订单号或客户名称', props: { 'aria-label': '订单关键词' } }, { key: 'orderNo', type: 'input', width: 220, label: '订单号', placeholder: '请输入订单号', props: { 'aria-label': '订单号' } }, { key: 'createdRange', type: 'daterange', width: 300, label: '创建日期', placeholder: '创建日期范围', props: { 'aria-label': '创建日期范围' } }, ]) @@ -103,12 +103,13 @@ const advancedQueryFields = computed(() => [ { key: 'destinationWarehouseId', type: 'select', width: 220, label: '交货仓', placeholder: warehouseLoadError.value ? '仓库加载失败' : '请选择交货仓', options: warehouseOptions.value, props: { 'aria-label': '交货仓', filterable: true, loading: warehouseLoading.value, disabled: Boolean(warehouseLoadError.value) } }, { key: 'inboundCode', type: 'input', width: 220, label: '入仓码', placeholder: '请输入入仓码', props: { 'aria-label': '入仓码' } }, { key: 'internalOrderStatus', type: 'select', width: 190, label: '订单状态', placeholder: '请选择订单状态', options: [ - { value: 'DRAFT', label: '草稿' }, { value: 'SUBMITTED', label: '待审核' }, { value: 'APPROVED', label: '已审核' }, - { value: 'ACCEPTED', label: '已受理' }, { value: 'PROCESSING', label: '处理中' }, { value: 'COMPLETED', label: '已完成' }, { value: 'CANCELLED', label: '已取消' }, + { value: 'SUBMITTED', label: '待审核' }, { value: 'APPROVED', label: '已审核' }, + { value: 'ACCEPTED', label: '已受理' }, { value: 'PROCESSING', label: '处理中' }, { value: 'COMPLETED', label: '已完成' }, ], props: { 'aria-label': '订单状态' } }, { key: 'expectedArrivalDate', type: 'date', width: 190, label: '预计到达时间', placeholder: '请选择预计到达日期', props: { 'aria-label': '预计到达时间' } }, { key: 'feeReviewStatus', type: 'select', width: 190, label: '费用审核状态', placeholder: '请选择费用审核状态', options: [ - { value: 'PENDING', label: '待审核' }, { value: 'APPROVED', label: '审核通过' }, { value: 'REJECTED', label: '审核驳回' }, + { value: 'UNRECORDED', label: '未录入' }, { value: 'PENDING', label: '待审核' }, + { value: 'APPROVED', label: '审核通过' }, { value: 'REJECTED', label: '审核驳回' }, ], props: { 'aria-label': '费用审核状态' } }, { key: 'containerNo', type: 'input', width: 210, label: '集装箱号', placeholder: '请输入集装箱号', props: { 'aria-label': '集装箱号' } }, { key: 'cabinetNo', type: 'input', width: 190, label: '柜号', placeholder: '请输入柜号', props: { 'aria-label': '柜号' } }, @@ -117,7 +118,8 @@ const advancedQueryFields = computed(() => [ { key: 'loaded', type: 'select', width: 180, label: '是否已配载', placeholder: '请选择配载状态', options: [{ value: 'true', label: '已配载' }, { value: 'false', label: '未配载' }], props: { 'aria-label': '是否已配载' } }, { key: 'fullContainer', type: 'select', width: 180, label: '是否整柜', placeholder: '请选择装柜方式', options: [{ value: 'true', label: '整柜' }, { value: 'false', label: '拼箱' }], props: { 'aria-label': '是否整柜' } }, { key: 'measurementReviewStatus', type: 'select', width: 220, label: '测量数据审核状态', placeholder: '请选择测量审核状态', options: [ - { value: 'PENDING', label: '待审核' }, { value: 'APPROVED', label: '审核通过' }, { value: 'REJECTED', label: '审核驳回' }, + { value: 'UNRECORDED', label: '未录入' }, { value: 'PENDING', label: '待审核' }, + { value: 'APPROVED', label: '审核通过' }, { value: 'REJECTED', label: '审核驳回' }, ], props: { 'aria-label': '测量数据审核状态' } }, { key: 'fbaCode', type: 'input', width: 220, label: '商品 FBA 编码', placeholder: '请输入商品 FBA 编码', props: { 'aria-label': '商品 FBA 编码' } }, ])