feat: 完善头程审核与计费信息
This commit is contained in:
@@ -89,6 +89,9 @@ function measurement(overrides: Partial<InboundMeasurementDetail> = {}): Inbound
|
||||
items: [{
|
||||
id: '9101',
|
||||
inboundDetailId: '8101',
|
||||
inboundCode: 'RK202608040001',
|
||||
fbaShipmentNo: 'FBA18ABC1234',
|
||||
scannedShipmentId: 'FBA18SCAN5678',
|
||||
boxCode: 'RK202608040001#10-1',
|
||||
itemNo: '001',
|
||||
boxSpecification: '50×40×30cm',
|
||||
@@ -168,6 +171,8 @@ describe('InboundMeasurementPanel', () => {
|
||||
|
||||
expect(getInboundMeasurement).toHaveBeenCalledWith('10001', '7001')
|
||||
expect(wrapper.text()).toContain('RK202608040001')
|
||||
expect(wrapper.find('.measurement-table').text()).toContain('FBA18ABC1234')
|
||||
expect(wrapper.find('.measurement-table').text()).toContain('FBA18SCAN5678')
|
||||
expect(wrapper.find('.measurement-table').text()).toContain('0.6')
|
||||
expect(wrapper.find('.measurement-table').text()).not.toContain('周长')
|
||||
await wrapper.find('.el-table__expand-icon').trigger('click')
|
||||
|
||||
@@ -32,6 +32,9 @@ const emit = defineEmits<{
|
||||
type EditableMeasurementItem = Omit<SaveInboundMeasurementItemRequest, 'coefficientMode'> & {
|
||||
itemId: string
|
||||
clientKey: string
|
||||
inboundCode: string
|
||||
fbaShipmentNo: string | null
|
||||
scannedShipmentId: string | null
|
||||
serverValues: Pick<InboundMeasurementItem, 'girthCm' | 'unitVolumeCbm' | 'totalWeightKg' | 'totalVolumeCbm' | 'volumeWeightKg'>
|
||||
chargeRuleId: string | null
|
||||
coefficientMode: 'ACTUAL' | 'ADD' | 'MULTIPLY'
|
||||
@@ -266,6 +269,9 @@ function editableItem(item: InboundMeasurementItem): EditableMeasurementItem {
|
||||
itemId: String(item.id),
|
||||
inboundDetailId: String(item.inboundDetailId || item.id),
|
||||
clientKey: nextItemKey(),
|
||||
inboundCode: item.inboundCode || '—',
|
||||
fbaShipmentNo: item.fbaShipmentNo || null,
|
||||
scannedShipmentId: item.scannedShipmentId || null,
|
||||
boxCode: item.boxCode,
|
||||
itemNo: item.itemNo,
|
||||
boxSpecification: item.boxSpecification,
|
||||
@@ -701,6 +707,15 @@ defineExpose({ saveDraft, submitForReview, updateActualWeights, mayMaintain, may
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="itemNo" label="#" width="70" align="center" />
|
||||
<el-table-column label="入仓码" min-width="154" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.inboundCode || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="FBA 货件号" min-width="150" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.fbaShipmentNo || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设备实扫货件号" min-width="164" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.scannedShipmentId || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="箱号" min-width="156" show-overflow-tooltip>
|
||||
<template #default="{ row }"><span class="measurement-box-code">{{ row.boxCode || '—' }}</span></template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -13,7 +13,10 @@ export type InboundMeasurementProcessStatus =
|
||||
|
||||
export interface InboundMeasurementItem {
|
||||
id: MeasurementIdentifier
|
||||
inboundCode?: string | null
|
||||
inboundDetailId?: MeasurementIdentifier | null
|
||||
fbaShipmentNo?: string | null
|
||||
scannedShipmentId?: string | null
|
||||
boxCode: string | null
|
||||
itemNo: string
|
||||
boxSpecification: string
|
||||
|
||||
Reference in New Issue
Block a user