This commit is contained in:
2026-09-11 17:01:59 +08:00
parent 737dd41ff1
commit 2334bd846a
2 changed files with 10 additions and 6 deletions
@@ -353,6 +353,9 @@ describe('UnifiedOrdersView contract', () => {
expect(source).toContain('仓库修改外箱(长)') expect(source).toContain('仓库修改外箱(长)')
expect(source).toContain('仓库修改外箱(宽)') expect(source).toContain('仓库修改外箱(宽)')
expect(source).toContain('仓库修改外箱(高)') expect(source).toContain('仓库修改外箱(高)')
expect(source.match(/class="measurement-outer-dimension-input"/g)).toHaveLength(3)
expect(source.match(/label="仓库修改外箱([长宽高])" width="190" align="center"/g)).toHaveLength(3)
expect(source).toContain('.measurement-outer-dimension-input { width: 128px; max-width: 100%; }')
expect(source).toContain('saveWarehouseOuterDimensions') expect(source).toContain('saveWarehouseOuterDimensions')
expect(source).toContain("'PREPARING', 'WAIT_MEASURE', 'MEASURING', 'MEASURE_REJECTED'") expect(source).toContain("'PREPARING', 'WAIT_MEASURE', 'MEASURING', 'MEASURE_REJECTED'")
expect(source.match(/v-if="measurementStrategyEditable"/g)).toHaveLength(4) expect(source.match(/v-if="measurementStrategyEditable"/g)).toHaveLength(4)
@@ -2457,14 +2457,14 @@ onBeforeUnmount(() => {
<template #default="{ row }"><strong class="measurement-box-code">{{ row.boxCode || '—' }}</strong></template> <template #default="{ row }"><strong class="measurement-box-code">{{ row.boxCode || '—' }}</strong></template>
</el-table-column> </el-table-column>
<el-table-column label="#" prop="itemNo" min-width="70" fixed="left" /> <el-table-column label="#" prop="itemNo" min-width="70" fixed="left" />
<el-table-column label="仓库修改外箱(长)" min-width="160"> <el-table-column label="仓库修改外箱(长)" width="190" align="center">
<template #default="{ row }"><el-input-number v-if="measurementStrategyEditable" v-model="row.outerLengthCm" aria-label="仓库修改外箱长" :min="0.001" :precision="3" :controls="false" placeholder="不修改" /><template v-else>{{ formatNumber(row.outerLengthCm) }}</template></template> <template #default="{ row }"><el-input-number v-if="measurementStrategyEditable" v-model="row.outerLengthCm" class="measurement-outer-dimension-input" aria-label="仓库修改外箱长" :min="0.001" :precision="3" :controls="false" placeholder="不修改" /><template v-else>{{ formatNumber(row.outerLengthCm) }}</template></template>
</el-table-column> </el-table-column>
<el-table-column label="仓库修改外箱(宽)" min-width="160"> <el-table-column label="仓库修改外箱(宽)" width="190" align="center">
<template #default="{ row }"><el-input-number v-if="measurementStrategyEditable" v-model="row.outerWidthCm" aria-label="仓库修改外箱宽" :min="0.001" :precision="3" :controls="false" placeholder="不修改" /><template v-else>{{ formatNumber(row.outerWidthCm) }}</template></template> <template #default="{ row }"><el-input-number v-if="measurementStrategyEditable" v-model="row.outerWidthCm" class="measurement-outer-dimension-input" aria-label="仓库修改外箱宽" :min="0.001" :precision="3" :controls="false" placeholder="不修改" /><template v-else>{{ formatNumber(row.outerWidthCm) }}</template></template>
</el-table-column> </el-table-column>
<el-table-column label="仓库修改外箱(高)" min-width="160"> <el-table-column label="仓库修改外箱(高)" width="190" align="center">
<template #default="{ row }"><el-input-number v-if="measurementStrategyEditable" v-model="row.outerHeightCm" aria-label="仓库修改外箱高" :min="0.001" :precision="3" :controls="false" placeholder="不修改" /><template v-else>{{ formatNumber(row.outerHeightCm) }}</template></template> <template #default="{ row }"><el-input-number v-if="measurementStrategyEditable" v-model="row.outerHeightCm" class="measurement-outer-dimension-input" aria-label="仓库修改外箱高" :min="0.001" :precision="3" :controls="false" placeholder="不修改" /><template v-else>{{ formatNumber(row.outerHeightCm) }}</template></template>
</el-table-column> </el-table-column>
<el-table-column v-if="measurementStrategyEditable" label="仓库外箱操作" min-width="120"> <el-table-column v-if="measurementStrategyEditable" label="仓库外箱操作" min-width="120">
<template #default="{ row }"><el-button type="primary" plain size="small" :loading="measurementOuterSavingId === String(row.id)" :disabled="Boolean(measurementOuterSavingId)" @click="saveWarehouseOuterDimensions(row as Record<string, unknown>)">保存外箱</el-button></template> <template #default="{ row }"><el-button type="primary" plain size="small" :loading="measurementOuterSavingId === String(row.id)" :disabled="Boolean(measurementOuterSavingId)" @click="saveWarehouseOuterDimensions(row as Record<string, unknown>)">保存外箱</el-button></template>
@@ -2920,6 +2920,7 @@ onBeforeUnmount(() => {
.measurement-rule-selector__label { color: var(--cc-text); font-size: 12px; font-weight: 650; white-space: nowrap; } .measurement-rule-selector__label { color: var(--cc-text); font-size: 12px; font-weight: 650; white-space: nowrap; }
.measurement-rule-selector__control { width: 270px; } .measurement-rule-selector__control { width: 270px; }
.measurement-rule-selector__hint { color: var(--cc-muted); font-size: 11px; } .measurement-rule-selector__hint { color: var(--cc-muted); font-size: 11px; }
.measurement-outer-dimension-input { width: 128px; max-width: 100%; }
.measurement-total { display: flex; min-height: 42px; align-items: center; justify-content: flex-end; gap: 24px; padding: 9px 14px; border: 1px solid var(--cc-border); background: #f8fafc; color: var(--cc-muted); font-size: 12px; } .measurement-total { display: flex; min-height: 42px; align-items: center; justify-content: flex-end; gap: 24px; padding: 9px 14px; border: 1px solid var(--cc-border); background: #f8fafc; color: var(--cc-muted); font-size: 12px; }
.measurement-total { border-top: 0; border-radius: 0 0 7px 7px; } .measurement-total { border-top: 0; border-radius: 0 0 7px 7px; }
.measurement-total strong { margin-right: auto; color: var(--cc-text); font-size: 13px; } .measurement-total strong { margin-right: auto; color: var(--cc-text); font-size: 13px; }