优化

2026-10-12 13:43:29 +08:00
parent db44d24eb4
commit 6d0eb2a5f3
11 changed files with 184 additions and 74 deletions
@@ -14,7 +14,7 @@ export interface ReturnInventorySummaryItem {
 export interface ReturnInventoryCartonItem { skuCode: string; productNameZh?: string; quantity: number }

 export interface ReturnInventoryCartonSummary {
-  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; status: string
+  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; relabelStatus?: string; relabelledQuantity?: number; relabelReservedQuantity?: number; status: string
  skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; createdAt: string
 }

@@ -23,7 +23,7 @@ export function listReturnInventoryCartons(params: Record<string, unknown>) {
 }

 export interface ReturnInventoryCartonDetail {
-  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; status: string
+  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; relabelStatus?: string; relabelledQuantity?: number; relabelReservedQuantity?: number; status: string
  skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; receivedAt: string; items: ReturnInventoryCartonItem[]
 }

@@ -34,7 +34,7 @@ export interface RelabelInventoryCandidate {
  availablePackages: number | string; version: number
  positions: Array<{ positionId: string; palletNo?: string; batchNo?: string; warehouseLocationCode?: string; availablePackages: number }>
  sourceType?: 'INBOUND' | 'RETURN_CARTON' | 'RETURN_PARCEL'; returnCartonId?: string; cartonMark?: string
-  skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>; relabelledPackages?: number
+  skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>; relabelledPackages?: number; relabelledQuantity?: number; relabelReservedQuantity?: number; relabelStatus?: string
 }

 export interface TransferCreate {
@@ -8,6 +8,13 @@ const compiled = ts.transpileModule(source, { compilerOptions: { target: ts.Scri
 const exports = {}
 new Function('exports', compiled)(exports)

+test('签收箱号只包含箱子和托盘签收，包裹实物记录不重复展示为箱子', () => {
+  const receipts = [{ receiptNo: 'PARCEL-1', unitType: 'PARCEL' }, { receiptNo: 'BOX-1', unitType: 'BOX' }, { receiptNo: 'PALLET-1', unitType: 'PALLET' }]
+  const cartons = [{ receiptNo: 'PARCEL-1', cartonMark: 'RP-1' }, { receiptNo: 'BOX-1', cartonMark: 'RC-1' }, { receiptNo: 'PALLET-1', cartonMark: 'RC-2' }, { receiptNo: 'UNKNOWN', cartonMark: 'RP-UNKNOWN' }]
+  assert.deepEqual(exports.receiptBoxDetails(receipts, cartons).map(item => item.cartonMark), ['RC-1', 'RC-2'])
+  assert.deepEqual(exports.receiptBoxDetails(receipts.slice(0, 1), cartons), [])
+})
+
 test('volume rounds upward to exactly three decimal places without increasing exact thousandths', () => {
  for (const [input, expected] of [[0.186624, '0.187'], [0.15, '0.150'], [1.001, '1.001'], [1.00100001, '1.002'], [0.0000001, '0.001'], [0, '0.000'], [null, '—'], [NaN, '—']]) {
    assert.equal(exports.formatReturnVolume(input), expected)
@@ -1,4 +1,9 @@
-import type { ReturnReceipt } from '../api/returnOrders'
+import type { ReturnReceipt, ReturnReceiptCarton } from '../api/returnOrders'
+
+export function receiptBoxDetails(receipts: Pick<ReturnReceipt, 'receiptNo' | 'unitType'>[], cartons: ReturnReceiptCarton[]) {
+  const boxReceiptNos = new Set(receipts.filter(receipt => receipt.unitType === 'BOX' || receipt.unitType === 'PALLET').map(receipt => receipt.receiptNo))
+  return cartons.filter(carton => boxReceiptNos.has(carton.receiptNo))
+}

 export function receiptTrackingNo(receipt: Pick<ReturnReceipt, 'trackingNo' | 'unitCode' | 'unitType'> | Record<string, unknown>) {
  const trackingNo = typeof receipt.trackingNo === 'string' ? receipt.trackingNo.trim() : ''
@@ -0,0 +1,4 @@
+export function returnRelabelStatusLabel(status?: string) {
+  const labels: Record<string, string> = { UNLABELLED: '未换标', BOUND: '处理中', PROCESSING: '处理中', PARTIALLY_COMPLETED: '部分完成', COMPLETED: '全部完成' }
+  return status ? labels[status] || '—' : '—'
+}
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { returnRelabelStatusLabel } from '../utils/returnRelabelProgress'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { ArrowLeft, Printer, Plus } from '@lucide/vue'
@@ -101,6 +102,7 @@ const cartonSummaryColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', slotName: 'actions', width: 150, fixed: 'left' }, { prop: 'cartonMark', label: '箱号', minWidth: 220 },
  { key: 'warehouse', label: '海外仓', slotName: 'warehouse', minWidth: 190 }, { prop: 'skuTypes', label: 'SKU 种类', width: 110, align: 'right' },
  { prop: 'totalQuantity', label: '总件数', width: 100, align: 'right' }, { prop: 'sourceReturnNo', label: '来源退货单', minWidth: 210 },
+  { key: 'relabelProgress', label: '换标进度', minWidth: 290, slotName: 'relabelProgress' },
  { prop: 'sourceBatchNo', label: '签收批次', minWidth: 180 }, { key: 'dimensions', label: '箱规', slotName: 'dimensions', width: 170 },
  { key: 'weight', label: '重量', slotName: 'weight', width: 100 }, { key: 'time', label: '生成时间', slotName: 'time', width: 180 },
 ]
@@ -257,6 +259,7 @@ onMounted(() => { if (props.detailPage) void Promise.all([loadCartonDetail(), lo
    <div v-else class="return-inventory-table">
      <DataTable v-model:page="query.page" v-model:page-size="query.size" :data="currentRows" :columns="currentColumns" :loading="loading" :total="total" :page-sizes="[20, 50, 100]" :row-actions="rowActions" :empty-text="loadError ? '库存加载失败，请核对权限或重试' : '暂无数据'">
        <template #warehouse="{ row }">{{ warehouseLabel(row.overseasWarehouseId) }}</template>
+        <template #relabelProgress="{ row }">{{ returnRelabelStatusLabel(row.relabelStatus) }}｜实际完成 {{ row.relabelledQuantity ?? '—' }} 件｜处理中占用 {{ row.relabelReservedQuantity ?? '—' }} 件</template>
        <template #status="{ row }"><el-tag effect="light">{{ cartonStatusLabel(row.status) }}</el-tag></template>
        <template #dimensions="{ row }">{{ row.length && row.width && row.height ? `${row.length} × ${row.width} × ${row.height} cm` : '—' }}</template>
        <template #weight="{ row }">{{ row.weight ? `${row.weight} kg` : '—' }}</template>
@@ -268,7 +271,7 @@ onMounted(() => { if (props.detailPage) void Promise.all([loadCartonDetail(), lo
    <article v-else v-loading="loading" class="carton-detail-surface">
      <template v-if="cartonDetail">
        <header class="carton-detail-header"><button type="button" class="carton-detail-back" @click="returnToCartons"><ArrowLeft :size="16" />返回列表</button><div><strong>{{ cartonDetail.cartonMark }}</strong><span>{{ warehouseLabel(cartonDetail.overseasWarehouseId) }} · 退货箱明细</span></div><div class="carton-detail-actions"><el-tag effect="light">{{ cartonStatusLabel(cartonDetail.status) }}</el-tag><el-button type="primary" @click="printLabel(cartonDetail.cartonMark)"><Printer :size="16" />打印箱唛</el-button></div></header>
-        <section class="carton-detail-section"><h3>箱号概览</h3><dl class="carton-detail-grid"><div><dt>来源退货单</dt><dd>{{ cartonDetail.sourceReturnNo || '—' }}</dd></div><div><dt>签收批次</dt><dd>{{ cartonDetail.sourceBatchNo || '—' }}</dd></div><div><dt>SKU 种类</dt><dd>{{ cartonDetail.skuTypes }}</dd></div><div><dt>箱内总件数</dt><dd>{{ cartonDetail.totalQuantity }}</dd></div><div><dt>箱规</dt><dd>{{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }}</dd></div><div><dt>重量</dt><dd>{{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}</dd></div><div><dt>签收时间</dt><dd>{{ formatInventoryTime(cartonDetail.receivedAt) }}</dd></div></dl></section>
+        <section class="carton-detail-section"><h3>箱号概览</h3><dl class="carton-detail-grid"><div><dt>来源退货单</dt><dd>{{ cartonDetail.sourceReturnNo || '—' }}</dd></div><div><dt>签收批次</dt><dd>{{ cartonDetail.sourceBatchNo || '—' }}</dd></div><div><dt>SKU 种类</dt><dd>{{ cartonDetail.skuTypes }}</dd></div><div><dt>箱内总件数</dt><dd>{{ cartonDetail.totalQuantity }}</dd></div><div><dt>箱规</dt><dd>{{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }}</dd></div><div><dt>重量</dt><dd>{{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}</dd></div><div><dt>换标进度</dt><dd>{{ returnRelabelStatusLabel(cartonDetail.relabelStatus) }}</dd></div><div><dt>实际完成（件）</dt><dd>{{ cartonDetail.relabelledQuantity ?? '—' }}</dd></div><div><dt>处理中占用（件）</dt><dd>{{ cartonDetail.relabelReservedQuantity ?? '—' }}</dd></div><div><dt>签收时间</dt><dd>{{ formatInventoryTime(cartonDetail.receivedAt) }}</dd></div></dl></section>
        <section class="carton-detail-section"><h3>箱内 SKU</h3><DataTable :data="cartonDetail.items" :columns="cartonItemColumns" row-key="skuCode" empty-text="暂无箱内 SKU" /></section>
      </template>
      <div v-else class="carton-detail-error" role="alert"><strong>{{ detailError || '箱号详情加载失败' }}</strong><el-button @click="loadCartonDetail">重新加载</el-button></div>
@@ -77,6 +77,17 @@ test('新建退货预报使用独立路由页面，编辑仍保留加宽弹框',
  assert.match(view, /class="return-create-actions"[\s\S]*?<el-button type="primary" :loading="creating" @click="submit">提交预报<\/el-button>/)
 })

+test('新建预报居左限宽，联系字段与数量输入保持紧凑', () => {
+  assert.match(view, /return-create-surface \{ width:calc\(100% - 24px\);[^}]*max-width:1120px;[^}]*margin:0 0 0 24px; justify-self:start;/)
+  assert.match(view, /<el-form label-width="130px" class="return-create-form">/)
+  assert.match(view, /return-create-form :deep\(\.el-input\) \{ max-width:320px;/)
+  assert.match(view, /return-create-form :deep\(\.el-select\) \{ max-width:520px;/)
+  assert.match(view, /:deep\(\.el-table \.el-input-number\) \{ width:120px;/)
+  assert.match(view, /<el-table class="return-forecast-table"[^>]*>/)
+  assert.match(view, /return-forecast-table \{[^}]*border-radius:8px;/)
+  assert.match(view, /return-forecast-table :deep\(th.el-table__cell\) \{ height:38px;/)
+})
+
 test('退货列表和详情使用客户可读仓库、状态与时间', () => {
  assert.match(view, /function operationWarehouseLabel\(warehouseId: string\)/)
  assert.match(view, /return warehouse \? warehouseLabel\(warehouse\) : '未关联'/)
@@ -92,10 +103,9 @@ test('退货列表和详情使用客户可读仓库、状态与时间', () => {
 })

 test('可操作退货表格把操作列固定在最左侧', () => {
-  const createTable = view.slice(view.indexOf('<el-table :data="form.items"'), view.indexOf('</el-table>', view.indexOf('<el-table :data="form.items"')))
  assert.match(view, /label: '操作', slotName: 'actions', width: 220, fixed: 'left'/)
  assert.match(view, /<DataTable[^>]*:row-actions="rowActions"/)
-  assert.match(createTable, /^<el-table[\s\S]*?<el-table-column label="操作" width="80" fixed="left">/)
+  assert.match(view, /<el-table class="return-forecast-table"[\s\S]*?<el-table-column label="操作" width="80" fixed="left">/)
 })

 test('分页初始化不会重复请求退货列表', () => {
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
-import { ArrowLeft, Plus } from '@lucide/vue'
+import { ArrowLeft, ChevronDown, Plus } from '@lucide/vue'
 import { useRoute, useRouter } from 'vue-router'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
@@ -11,7 +11,7 @@ import { getMerchantWarehouses, type MerchantWarehouse } from '@/modules/first-l
 import { createIdempotencyKey } from '@/utils/idempotencyKey'
 import { createReturnOrder, downloadReturnPhoto, getReturnOrder, listReturnOrders, updateReturnOrder, type ReturnOrderDetail, type ReturnOrderSummary, type ReturnReceipt } from '../api/returnOrders'
 import { getReturnInventoryLabel } from '../api/returnInventory'
-import { formatReturnVolume, receiptTrackingNo } from '../utils/returnReceiptDisplay'
+import { formatReturnVolume, receiptBoxDetails, receiptTrackingNo } from '../utils/returnReceiptDisplay'

 const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean; returnNo?: string }>(), { createPage: false, detailPage: false, returnNo: '' })
 const router = useRouter()
@@ -26,6 +26,9 @@ const showCreate = ref(false)
 const editingReturnNo = ref('')
 const selected = ref<ReturnOrderDetail>()
 const showCartons = ref(false)
+const parcelDetailsExpanded = ref(true)
+const receiptBatchesExpanded = ref(true)
+const signedBoxDetails = computed(() => receiptBoxDetails(selected.value?.receipts || [], selected.value?.cartons || []))
 const printableReceipts = computed(() => selected.value?.receipts.filter(item => item.unitType !== 'PARCEL' && (item.cartonMark || item.labels?.length)) || [])
 const printableBoxCount = computed(() => printableReceipts.value.reduce((total, receipt) => total + (receipt.labels?.length || receipt.boxCount || 1), 0))
 const photoUrls = reactive<Record<string, string>>({})
@@ -282,7 +285,7 @@ onBeforeUnmount(clearPhotoUrls)
          <el-button @click="returnToList"><ArrowLeft :size="16" />返回列表</el-button>
        </header>
        <div class="return-create-body">
-          <el-form label-width="150px" class="return-create-form">
+          <el-form label-width="130px" class="return-create-form">
            <el-form-item label="海外仓" required class="return-form-wide"><el-select v-model="form.overseasWarehouseId" filterable clearable :loading="operationWarehousesLoading" :disabled="Boolean(operationWarehousesError)" placeholder="请选择海外仓" @change="selectOperationWarehouse"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><div v-if="operationWarehousesError" class="warehouse-error">{{ operationWarehousesError }}</div></el-form-item>
            <el-form-item label="海外仓联系人" required><el-input v-model="form.warehouseContactName" :readonly="Boolean(selectedOperationWarehouse?.contactName)" :placeholder="selectedOperationWarehouse?.contactName ? '已从海外仓资料带出' : '该海外仓未维护，请手动填写'" /></el-form-item>
            <el-form-item label="海外仓联系电话" required><el-input v-model="form.warehouseContactPhone" :readonly="Boolean(selectedOperationWarehouse?.contactPhone)" :placeholder="selectedOperationWarehouse?.contactPhone ? '已从海外仓资料带出' : '该海外仓未维护，请手动填写'" /></el-form-item>
@@ -292,11 +295,11 @@ onBeforeUnmount(clearPhotoUrls)
          <div class="items-title"><span>SKU 预报明细</span><el-button text type="primary" @click="addItem"><Plus :size="15" />添加 SKU</el-button></div>
          <div class="return-relabel-option"><span>换标</span><el-checkbox v-model="form.needRelabel">需要换标</el-checkbox></div>
          <div class="items-hint">客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。</div>
-          <el-table :data="form.items" row-key="id" size="small" border>
+          <el-table class="return-forecast-table" :data="form.items" row-key="id" size="small">
            <el-table-column label="操作" width="80" fixed="left"><template #default="{ $index }"><el-button link type="danger" :disabled="form.items.length === 1" @click="removeItem($index)">删除</el-button></template></el-table-column>
-            <el-table-column label="SKU" min-width="240"><template #default="{ row }"><div><el-input v-model="row.skuCode" :class="{ 'duplicate-sku-input': duplicateSkuIds.has(row.id) }" placeholder="填写 SKU" @blur="row.skuCode = row.skuCode.trim()" /><div v-if="duplicateSkuIds.has(row.id)" class="duplicate-sku-error">该 SKU 已在明细中填写</div></div></template></el-table-column>
+            <el-table-column label="SKU" width="300"><template #default="{ row }"><div><el-input v-model="row.skuCode" :class="{ 'duplicate-sku-input': duplicateSkuIds.has(row.id) }" placeholder="填写 SKU" @blur="row.skuCode = row.skuCode.trim()" /><div v-if="duplicateSkuIds.has(row.id)" class="duplicate-sku-error">该 SKU 已在明细中填写</div></div></template></el-table-column>
            <el-table-column label="中文品名" min-width="320"><template #default="{ row }"><el-input v-model="row.productNameZh" placeholder="填写中文品名（选填）" /></template></el-table-column>
-            <el-table-column label="预报数量" width="180"><template #default="{ row }"><el-input-number v-model="row.expectedQuantity" :min="1" controls-position="right" placeholder="数量" /></template></el-table-column>
+            <el-table-column label="预报数量" width="150"><template #default="{ row }"><el-input-number v-model="row.expectedQuantity" :min="1" controls-position="right" placeholder="数量" /></template></el-table-column>
          </el-table>
        </div>
        <footer class="return-create-actions"><el-button @click="cancelCreate">取消</el-button><el-button type="primary" :loading="creating" @click="submit">提交预报</el-button></footer>
@@ -380,10 +383,12 @@ onBeforeUnmount(clearPhotoUrls)
          </el-table>
        </section>
        <section v-if="selected.receipts?.some(item => item.unitType === 'PARCEL')" class="return-detail-section">
-          <h3>包裹签收明细</h3>
-          <div v-for="receipt in (selected.receipts || []).filter(item => item.unitType === 'PARCEL')" :key="`${receipt.receiptNo}-items`" class="return-parcel-items">
-            <div class="return-parcel-items__head"><strong>包裹 {{ receipt.unitCode || receipt.trackingNo || receipt.receiptNo }}</strong><span>{{ receipt.receivedQuantity }} 件</span></div>
+          <h3 class="section-heading-with-action"><span>包裹签收明细</span><el-button text :aria-expanded="parcelDetailsExpanded" aria-controls="return-parcel-details" @click="parcelDetailsExpanded = !parcelDetailsExpanded">{{ parcelDetailsExpanded ? '收起明细' : '展开明细' }}</el-button></h3>
+          <div v-show="parcelDetailsExpanded" id="return-parcel-details">
+          <details v-for="receipt in (selected.receipts || []).filter(item => item.unitType === 'PARCEL')" :key="`${receipt.receiptNo}-items`" class="return-parcel-items" open>
+            <summary class="return-parcel-items__head"><strong>包裹 {{ receipt.unitCode || receipt.trackingNo || receipt.receiptNo }}</strong><span class="return-parcel-items__summary">{{ receipt.receivedQuantity }} 件<ChevronDown :size="16" aria-hidden="true" /></span></summary>
            <div class="return-parcel-items__list"><div v-for="item in receipt.items" :key="item.skuCode" class="return-parcel-item"><span class="return-parcel-item__sku">{{ item.skuCode }}</span><span class="return-parcel-item__name">{{ item.productNameZh || '中文品名未填写' }}</span><strong>{{ item.quantity }} 件</strong></div></div>
+          </details>
          </div>
        </section>
        <section v-if="selected.pallets?.length" class="return-detail-section">
@@ -402,12 +407,12 @@ onBeforeUnmount(clearPhotoUrls)
          </el-collapse>
          <el-empty v-else description="暂无打托记录" :image-size="64" />
        </section>
-        <section v-if="selected.cartons?.length" class="return-detail-section">
-          <h3 class="section-heading-with-action"><span>签收箱号明细（{{ selected.cartons?.length || 0 }} 箱）</span><span class="return-label-actions"><el-button type="primary" size="small" @click="showCartons = true">查看箱号明细</el-button></span></h3>
+        <section v-if="signedBoxDetails.length" class="return-detail-section">
+          <h3 class="section-heading-with-action"><span>签收箱号明细（{{ signedBoxDetails.length }} 箱）</span><span class="return-label-actions"><el-button type="primary" size="small" @click="showCartons = true">查看箱号明细</el-button></span></h3>
          <el-dialog v-model="showCartons" title="签收箱号明细" width="1120px" align-center destroy-on-close>
          <div class="return-cartons-dialog-body">
-          <el-collapse v-if="selected.cartons?.length" class="return-pallet-list">
-            <el-collapse-item v-for="box in selected.cartons" :key="box.cartonMark" :name="box.cartonMark">
+          <el-collapse v-if="signedBoxDetails.length" class="return-pallet-list">
+            <el-collapse-item v-for="box in signedBoxDetails" :key="box.cartonMark" :name="box.cartonMark">
              <template #title><strong>{{ box.cartonMark }}</strong><span class="return-pallet-summary">{{ box.countStatus === 'CONFIRMED' ? `已确认 · ${box.items.length} 种 SKU · ${box.items.reduce((sum, item) => sum + Number(item.quantity), 0)} 件` : box.countStatus === 'PENDING' ? '待清点' : '未留存箱内签收明细' }}</span></template>
              <div class="return-pallet-measurements">签收单 {{ box.receiptNo }}<template v-if="box.palletCode"> · 托盘 {{ box.palletCode }}</template><template v-if="box.countedAt"> · 确认时间 {{ formatDateTime(box.countedAt) }}</template></div>
              <el-table v-if="box.countStatus === 'CONFIRMED'" :data="box.items" size="small" border>
@@ -435,7 +440,8 @@ onBeforeUnmount(clearPhotoUrls)
          <el-empty v-else description="暂无退货打托照片" :image-size="64" />
        </section>
        <section class="return-detail-section">
-          <h3>签收批次</h3>
+          <h3 class="section-heading-with-action"><span>签收批次</span><el-button text :aria-expanded="receiptBatchesExpanded" aria-controls="return-receipt-batches" @click="receiptBatchesExpanded = !receiptBatchesExpanded">{{ receiptBatchesExpanded ? '收起批次' : '展开批次' }}</el-button></h3>
+          <div v-show="receiptBatchesExpanded" id="return-receipt-batches">
          <DataTable :data="selected.receipts" :columns="receiptColumns" row-key="receiptNo" empty-text="暂无签收批次">
            <template #unitType="{ row }">{{ row.unitType === 'PALLET' ? '托盘' : row.unitType === 'BOX' ? '箱子' : '包裹' }}</template>
            <template #unitCode="{ row }">{{ row.unitType === 'PARCEL' && row.unitCode === receiptTrackingNo(row) ? '—' : row.unitCode || '—' }}</template>
@@ -443,7 +449,7 @@ onBeforeUnmount(clearPhotoUrls)
            <template #startedBy="{ row }">{{ startedByLabel(row.startedBy) }}</template>
            <template #signedAt="{ row }">{{ formatDateTime(row.signedAt) }}</template>
          </DataTable>
-
+          </div>
        </section>
      </template>
    </article>
@@ -453,12 +459,26 @@ onBeforeUnmount(clearPhotoUrls)
 <style scoped>
 .relabel-suborder { display: flex; align-items: center; gap: 8px; min-height: 30px; white-space: nowrap; }
 .return-orders-page { display:grid; gap:12px; } .return-create-form { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); column-gap:20px; } .return-form-wide { grid-column:1 / -1; } .items-title { display:flex; justify-content:space-between; align-items:center; margin:16px 0 4px; font-weight:600; } .items-hint { margin-bottom:10px; color:var(--el-text-color-secondary); font-size:12px; } h3 { margin:24px 0 10px; font-size:16px; } h4 { margin:16px 0 8px; font-size:14px; } .remark { white-space:pre-wrap; } .warehouse-error, .duplicate-sku-error { margin-top:6px; color:var(--el-color-danger); font-size:12px; } :deep(.duplicate-sku-input .el-input__wrapper) { box-shadow:0 0 0 1px var(--el-color-danger) inset; } :deep(.el-dialog .el-select) { width:100%; }
-.return-create-surface { overflow:hidden; border:1px solid var(--client-border); border-radius:var(--client-radius); background:#fff; }
+.return-create-surface { width:calc(100% - 24px); max-width:1120px; min-width:0; margin:0 0 0 24px; justify-self:start; box-sizing:border-box; overflow:hidden; border:1px solid var(--client-border); border-radius:var(--client-radius); background:#fff; }
 .return-create-header { display:flex; min-height:68px; align-items:center; justify-content:space-between; gap:20px; padding:12px 20px; border-bottom:1px solid var(--client-border); }
 .return-create-header h2 { margin:0; color:#1f2d45; font-size:20px; }
 .return-create-header p { margin:4px 0 0; color:#7c899c; font-size:12px; }
 .return-create-body { padding:18px 20px 14px; }
 .return-create-body :deep(.el-select), .return-create-body :deep(.el-input-number) { width:100%; }
+.return-create-body .return-create-form { column-gap:24px; }
+.return-create-body .return-create-form :deep(.el-form-item) { margin-bottom:16px; }
+.return-create-body .return-create-form :deep(.el-form-item__content) { min-width:0; }
+.return-create-body .return-create-form :deep(.el-input) { max-width:320px; }
+.return-create-body .return-create-form :deep(.el-select) { max-width:520px; }
+.return-create-body .return-create-form :deep(.el-textarea) { max-width:100%; }
+.return-create-body :deep(.el-table .el-input-number) { width:120px; }
+.return-forecast-table { overflow:hidden; border:1px solid var(--client-border); border-radius:8px; --el-table-header-bg-color:#f5f7fb; --el-table-header-text-color:#526176; --el-table-border-color:#edf1f5; --el-table-row-hover-bg-color:#f8faff; }
+.return-forecast-table :deep(th.el-table__cell) { height:38px; padding:4px 0; font-size:12px; font-weight:600; }
+.return-forecast-table :deep(td.el-table__cell) { padding:9px 0; }
+.return-forecast-table :deep(.cell) { padding:0 12px; }
+.return-forecast-table :deep(.el-input__wrapper) { min-height:30px; box-sizing:border-box; border-radius:6px; }
+.return-forecast-table :deep(.el-input__inner) { font-size:13px; }
+.return-forecast-table :deep(.el-button) { font-size:12px; }
 .return-create-body .items-title { margin-top:8px; }
 .return-relabel-option { display:flex; align-items:center; gap:16px; margin:8px 0; color:#526176; }
 .return-create-actions { display:flex; align-items:center; justify-content:flex-end; gap:10px; padding:12px 20px; border-top:1px solid var(--client-border); background:#fbfcfe; }
@@ -510,6 +530,12 @@ onBeforeUnmount(clearPhotoUrls)
 .return-parcel-items { margin:10px 16px 16px; overflow:hidden; border:1px solid #dfe6ef; border-radius:8px; background:#fbfcfe; }
 .return-parcel-items__head { display:flex; align-items:center; justify-content:space-between; gap:12px; padding:10px 14px; color:#26364f; background:#f3f7fc; border-bottom:1px solid #e7edf5; }
 .return-parcel-items__head span { color:#1764c0; font-size:12px; font-weight:600; }
+.return-parcel-items__head { cursor:pointer; list-style:none; }
+.return-parcel-items__head::-webkit-details-marker { display:none; }
+.return-parcel-items__head:focus-visible { outline:2px solid var(--el-color-primary); outline-offset:-2px; }
+.return-parcel-items__summary { display:flex; align-items:center; gap:12px; }
+.return-parcel-items__summary svg { transition:transform .15s ease; }
+.return-parcel-items:not([open]) .return-parcel-items__summary svg { transform:rotate(-90deg); }
 .return-parcel-items__list { display:grid; grid-template-columns:repeat(auto-fit,minmax(280px,1fr)); gap:8px; padding:10px; }
 .return-parcel-item { display:grid; grid-template-columns:minmax(110px,1fr) minmax(100px,1.4fr) auto; align-items:center; gap:10px; min-height:38px; padding:7px 10px; border:1px solid #edf1f5; border-radius:6px; background:#fff; }
 .return-parcel-item__sku { color:#2c3c55; font-weight:600; }
@@ -198,34 +198,36 @@ const selectedTransferInventory = ref('')
 const selectedTransferSourceOrderIds = ref<string[]>([])
 const isReturnRelabelSource = computed(() => props.service === 'labeling' && selectedRelabelInboundOrderId.value.startsWith('RETURN_ORDER:'))
 const selectedReturnOrderNo = computed(() => isReturnRelabelSource.value ? selectedRelabelInboundOrderId.value.slice('RETURN_ORDER:'.length) : '')
-const hideReturnSkuCartonMark = computed(() => isReturnRelabelSource.value && labelingMode.value === 'sku')
-const selectedReturnCandidates = computed(() => relabelCandidates.value.filter(item => Boolean(item.returnCartonId) && item.inboundOrderNo === selectedReturnOrderNo.value))
+const selectedReturnCandidates = computed(() => relabelCandidates.value.filter(item => Boolean(item.returnCartonId) && returnSourceNos(item).includes(selectedReturnOrderNo.value)))
 const returnBoxCandidates = computed(() => selectedReturnCandidates.value.filter(item => item.sourceType === 'RETURN_CARTON'))
 const returnLooseCandidates = computed(() => selectedReturnCandidates.value.filter(item => item.sourceType === 'RETURN_PARCEL'))
-const returnSkuOnly = computed(() => isReturnRelabelSource.value && returnLooseCandidates.value.length > 0 && returnBoxCandidates.value.length === 0)
 const requiresBothTotalFiles = computed(() => (props.service === 'labeling' || (props.service === 'transfer' && form.relabel)) && labelingMode.value === 'carton_and_sku')
 function inventoryQuantity(value: number | string | null | undefined) {
  const quantity = Number(value)
  return Number.isFinite(quantity) && quantity > 0 ? quantity : 0
 }
+function returnSourceNos(candidate: RelabelInventoryCandidate): string[] {
+  return [...new Set((candidate.inboundOrderNo || '').split(',').map(value => value.trim()).filter(Boolean))]
+}
+function returnRelabelProgress(candidate: RelabelInventoryCandidate) {
+  const labels: Record<string, string> = { UNLABELLED: '未换标', BOUND: '处理中', PROCESSING: '处理中', PARTIALLY_COMPLETED: '部分完成', COMPLETED: '全部完成' }
+  return [labels[candidate.relabelStatus || ''] || '—', '实际完成 ' + (candidate.relabelledQuantity ?? '—') + ' 件', '处理中占用 ' + (candidate.relabelReservedQuantity ?? '—') + ' 件'].join('｜')
+}
 const relabelInboundOptions = computed(() => {
-  const grouped = new Map<string, { value: string; inboundOrderNo: string; inboundCode: string; availablePackages: number; relabelledPackages: number; quantityUnit: '箱' | '件' }>()
+  const grouped = new Map<string, { value: string; inboundOrderNo: string; inboundCode: string; availablePackages: number; quantityUnit: '箱' | '件' }>()
  for (const candidate of relabelCandidates.value) {
-    const returnOrderNo = candidate.inboundOrderNo || String(candidate.returnCartonId || '')
-    const value = candidate.returnCartonId ? `RETURN_ORDER:${returnOrderNo}` : String(candidate.inboundOrderId)
-    const current = grouped.get(value)
-    if (current) {
-      current.availablePackages += inventoryQuantity(candidate.availablePackages)
-      current.relabelledPackages += inventoryQuantity(candidate.relabelledPackages)
+    const sources = candidate.returnCartonId ? returnSourceNos(candidate) : [String(candidate.inboundOrderId)]
+    for (const sourceNo of sources) {
+      const value = candidate.returnCartonId ? 'RETURN_ORDER:' + sourceNo : sourceNo
+      const current = grouped.get(value)
+      if (current) current.availablePackages += inventoryQuantity(candidate.availablePackages)
+      else grouped.set(value, {
+        value, inboundOrderNo: candidate.returnCartonId ? '退货单 ' + sourceNo : (candidate.inboundOrderNo || '—'),
+        inboundCode: candidate.returnCartonId ? '已签收退货库存（含合箱）' : (candidate.inboundCode || '—'),
+        availablePackages: inventoryQuantity(candidate.availablePackages),
+        quantityUnit: candidate.returnCartonId ? '件' : '箱',
+      })
    }
-    else grouped.set(value, {
-      value,
-      inboundOrderNo: candidate.returnCartonId ? `退货单 ${candidate.inboundOrderNo || '—'}` : (candidate.inboundOrderNo || '—'),
-      inboundCode: candidate.returnCartonId ? '已签收退货库存' : (candidate.inboundCode || '—'),
-      availablePackages: inventoryQuantity(candidate.availablePackages),
-      relabelledPackages: inventoryQuantity(candidate.relabelledPackages),
-      quantityUnit: candidate.returnCartonId ? '件' : '箱',
-    })
  }
  return [...grouped.values()]
 })
@@ -268,9 +270,8 @@ watch(() => cargoRows.value.map((row) => row.sku), (skus) => {
    if (sourceSku) row.sku = sourceSku
  })
 })
-watch([returnSkuOnly, labelingMode], ([skuOnly, value]) => {
-  if (skuOnly && value !== 'sku') { labelingMode.value = 'sku'; return }
-  if (value !== 'carton' && !skuRelabelRows.value.length) addSkuRelabelRow()
+watch(labelingMode, (value) => {
+  if (!isReturnRelabelSource.value && value !== 'carton' && !skuRelabelRows.value.length) addSkuRelabelRow()
 })
 watch(() => form.destination, (value) => {
  if (props.service !== 'labeling') return
@@ -499,9 +500,10 @@ function clearTransferRelabelRows() {
  transferRelabelRows.value = []
 }
 function addSkuRelabelRow() {
+  if (isReturnRelabelSource.value) { ElMessage.warning('请从上方实际包裹/箱库存选择 SKU'); return }
  const source = cargoRows.value[Math.min(skuRelabelRows.value.length, Math.max(0, cargoRows.value.length - 1))]
  skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: source?.id || null,
-    cartonMark: hideReturnSkuCartonMark.value ? source?.cartonMark || '' : '', originalSku: source?.sku || '', newSku: '', quantity: 1,
+    cartonMark: '', originalSku: source?.sku || '', newSku: '', quantity: 1,
    fbaCartonMark: '', destinationWarehouseId: form.destination, remark: '' })
 }
 function removeSkuRelabelRow(id: number) { skuRelabelRows.value = skuRelabelRows.value.filter((row) => row.id !== id) }
@@ -543,16 +545,6 @@ function chooseCreateTotalFile(scope: 'CARTON_TOTAL' | 'SKU_TOTAL') {
 function buildSkuRelabelItems(): RelabelCreate['items'] {
  const groups = new Map<string, SkuRelabelRow[]>()
  for (const row of skuRelabelRows.value) {
-    if (hideReturnSkuCartonMark.value) {
-      const source = cargoRows.value.find(item => item.id === row.sourceRowId)
-      const candidate = selectedReturnCandidates.value.find(item => String(item.returnCartonId) === source?.returnCartonId)
-      if (candidate?.skuItems?.some(item => item.skuCode === row.originalSku.trim())) row.cartonMark = source?.cartonMark || ''
-      else {
-        const matches = selectedReturnCandidates.value.filter(item => item.skuItems?.some(sku => sku.skuCode === row.originalSku.trim()))
-        if (matches.length !== 1) throw new Error(`请从上方库存明细选择 SKU ${row.originalSku} 的来源库存`)
-        row.cartonMark = matches[0].cartonMark || ''
-      }
-    }
    const cartonMark = row.cartonMark.trim().toUpperCase()
    if (!cartonMark) throw new Error('请填写每个箱子的我方箱唛')
    const rows = groups.get(cartonMark) || []
@@ -568,12 +560,12 @@ function buildSkuRelabelItems(): RelabelCreate['items'] {
  }
  return [...groups.entries()].map(([_, rows], groupIndex) => {
    const source = isReturnRelabelSource.value
-      ? cargoRows.value.find(item => item.cartonMark === rows[0].cartonMark.trim())
+      ? cargoRows.value.find(item => item.id === rows[0].sourceRowId && item.cartonMark === rows[0].cartonMark.trim())
      : cargoRows.value.find((item) => item.id === rows[0].sourceRowId) || anchors[groupIndex]
    if (isReturnRelabelSource.value && !source) throw new Error('请选择该退货单实际可用的来源箱号')
    if (isReturnRelabelSource.value) {
      const candidate = selectedReturnCandidates.value.find(item => String(item.returnCartonId) === source?.returnCartonId)
-      if (candidate?.sourceType === 'RETURN_PARCEL' && labelingMode.value !== 'sku') throw new Error('散件库存只能贴 SKU，请先合箱后申请箱唛或混贴')
+      if (rows.some(row => row.sourceRowId !== source?.id)) throw new Error('同一换标箱内的 SKU 必须选择相同的实际来源包裹/箱')
      const requested = new Map<string, number>()
      for (const row of rows) {
        const quantity = (requested.get(row.originalSku) || 0) + row.quantity
@@ -994,7 +986,7 @@ async function submit(action: 'draft' | 'submit' = 'submit') {
    ? !selectedDiscardOrderId.value || cargoRows.value.every((item) => item.quantity < 1)
      || cargoRows.value.some((item) => item.quantity < 0 || item.quantity > Number(item.availableQuantity || 0))
    : (props.service === 'labeling' || props.service === 'relabel') && (relabelRows.length === 0 || (props.service === 'labeling' && labelingMode.value !== 'carton'
-      ? skuRelabelRows.value.some((item) => (!hideReturnSkuCartonMark.value && !item.cartonMark) || !item.originalSku || !item.newSku || item.quantity < 1
+      ? skuRelabelRows.value.some((item) => !item.cartonMark || !item.originalSku || !item.newSku || item.quantity < 1
        || (labelingMode.value === 'carton_and_sku' && !item.fbaCartonMark))
      : cargoRows.value.some((item) => (props.service !== 'labeling' && !item.sku) || !item.name
        || (props.service !== 'labeling' && item.quantity < 1))))
@@ -1007,8 +999,8 @@ async function submit(action: 'draft' | 'submit' = 'submit') {
  if (props.service === 'labeling' && requiresBothTotalFiles.value && (!cartonTotalFile.value || !skuTotalFile.value)) {
    ElMessage.warning('SKU 和箱唛都换时，必须同时上传箱唛总文件和 SKU 总文件'); return
  }
-  if (props.service === 'labeling' && !requiresBothTotalFiles.value && !cartonTotalFile.value && !skuTotalFile.value) {
-    ElMessage.warning('请上传箱唛总文件或 SKU 总文件（二选一）'); return
+  if (props.service === 'labeling' && !requiresBothTotalFiles.value && (labelingMode.value === 'sku' ? !skuTotalFile.value : !cartonTotalFile.value)) {
+    ElMessage.warning(labelingMode.value === 'sku' ? '请上传 SKU 标签总文件' : '请上传箱唛总文件'); return
  }
  if (props.service === 'labeling' && labelingMode.value !== 'sku' && !form.deliveryMethod) {
    ElMessage.warning('请选择换标完成后的派送方式'); return
@@ -1404,8 +1396,7 @@ async function selectOperationWarehouse() {
 function selectRelabelInventory(inboundOrderId: string) {
  const rows: CargoRow[] = []
  const selectedCandidates = relabelCandidates.value.filter((item) => {
-    const returnOrderNo = item.inboundOrderNo || String(item.returnCartonId || '')
-    return (item.returnCartonId ? `RETURN_ORDER:${returnOrderNo}` : String(item.inboundOrderId)) === inboundOrderId
+    return item.returnCartonId ? returnSourceNos(item).includes(inboundOrderId.slice('RETURN_ORDER:'.length)) : String(item.inboundOrderId) === inboundOrderId
  })
  if (inboundOrderId.startsWith('RETURN_ORDER:')) {
    labelingMode.value = 'sku'
@@ -1489,7 +1480,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
            <label v-if="props.service === 'relabel'"><span><i>*</i>来源 FBA 仓库</span><el-select v-model="form.sourceWarehouse" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" placeholder="请选择平台维护的 FBA 仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></label>
            <label v-else-if="props.service === 'disposal'" class="warehouse-disposal-field"><span><i>*</i>废弃原因</span><el-select v-model="form.reason" placeholder="请选择"><el-option label="客户退货" value="客户退货" /><el-option label="亚马逊移除" value="亚马逊移除" /><el-option label="残损不可售" value="残损不可售" /></el-select></label>
            <label v-else><span><i>*</i>{{ props.service === 'labeling' ? '海外操作仓（中转仓）' : props.service === 'transfer' ? '入库海外仓' : '操作仓' }}</span><el-select v-model="form.warehouse" :loading="fbaWarehousesLoading || operationWarehouseDetailLoading" :disabled="Boolean(operationWarehousesError)" clearable :placeholder="props.service === 'transfer' ? '请选择海外仓' : '请选择国外中转仓'" @change="props.service === 'labeling' ? selectOperationWarehouse() : props.service === 'transfer' && selectTransferWarehouse()"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><small v-if="operationWarehousesError" class="warehouse-hint">{{ operationWarehousesError }}</small></label>
-            <label v-if="props.service === 'labeling'" class="warehouse-span-2"><span><i>*</i>选择有库存的入仓单或退货单</span><el-select v-model="selectedRelabelInboundOrderId" filterable clearable :loading="relabelCandidatesLoading" :disabled="!form.warehouse" no-data-text="当前中转仓暂无可用库存" placeholder="请选择当前仍有可用库存的入仓单或退货单" @change="selectRelabelInventory"><el-option v-for="option in relabelInboundOptions" :key="option.value" :label="`${option.inboundOrderNo}｜${option.inboundCode}｜可用 ${option.availablePackages} ${option.quantityUnit}${option.relabelledPackages > 0 ? `｜已换标 ${option.relabelledPackages} ${option.quantityUnit}` : ''}`" :value="option.value" /></el-select></label>
+            <label v-if="props.service === 'labeling'" class="warehouse-span-2"><span><i>*</i>选择有库存的入仓单或退货单</span><el-select v-model="selectedRelabelInboundOrderId" filterable clearable :loading="relabelCandidatesLoading" :disabled="!form.warehouse" no-data-text="当前中转仓暂无可用库存" placeholder="请选择当前仍有可用库存的入仓单或退货单" @change="selectRelabelInventory"><el-option v-for="option in relabelInboundOptions" :key="option.value" :label="`${option.inboundOrderNo}｜${option.inboundCode}｜可用 ${option.availablePackages} ${option.quantityUnit}`" :value="option.value" /></el-select></label>
            <label v-if="props.service === 'transfer'"><span>库存转运来源（可选）</span><el-select v-model="selectedTransferInventory" filterable clearable :loading="relabelCandidatesLoading" :disabled="!form.warehouse" no-data-text="当前海外仓暂无可用库存" placeholder="不选则按新货转运；选择后免 PDA 测量" @change="selectTransferInventory"><el-option v-for="option in transferInventoryOptions" :key="option.value" :label="`${option.label}｜可用 ${option.packages} 箱`" :value="option.value" /></el-select><small class="warehouse-hint">库存转运可直接进入目的仓、换标和排车流程，PDA 可拆托、重打或同目的仓合托。</small></label>
            <label v-if="props.service === 'labeling' && (isReturnRelabelSource || labelingMode !== 'sku')"><span><i>*</i>FBA 目的仓</span><el-select v-model="form.destination" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" filterable placeholder="请选择本张申请统一的 FBA 目的仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></label>
            <div v-if="props.service === 'transfer'" class="warehouse-choice-field warehouse-span-2"><span><i>*</i>入仓方式</span><el-radio-group v-model="form.deliveryMethod" @change="selectTransferInboundMethod"><el-radio-button value="WAREHOUSE_PICKUP">仓库上门提货</el-radio-button><el-radio-button value="CUSTOMER_DELIVERY">客户送货到仓</el-radio-button></el-radio-group></div>
@@ -1536,7 +1527,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
            </div>
            <div class="warehouse-file-groups warehouse-file-groups--compact">
              <section v-if="canManageRelabelFiles" class="warehouse-file-group warehouse-file-group--primary">
-                <div class="warehouse-file-group__heading"><div><strong><span>1</span>贴标总文件</strong></div><em>{{ requiresBothTotalFiles ? '必传 · 两份文件' : '必传 · 二选一' }}</em></div>
+                <div class="warehouse-file-group__heading"><div><strong><span>1</span>贴标总文件</strong></div><em>{{ requiresBothTotalFiles ? '必传 · 两份文件' : isReturnRelabelSource ? labelingMode === 'sku' ? '必传 · SKU 标签文件' : '必传 · 箱唛文件' : '必传 · 二选一' }}</em></div>
                <div class="warehouse-file-options">
                  <div class="warehouse-file-option" :class="{ 'is-selected': Boolean(cartonTotalFile) }"><div class="warehouse-file-option__name"><strong>箱唛总文件</strong></div><el-button native-type="button" :type="cartonTotalFile ? 'primary' : 'default'" plain @click="chooseCreateTotalFile('CARTON_TOTAL')"><Upload :size="15" />{{ cartonTotalFile ? '重新上传' : '选择文件' }}</el-button><div class="warehouse-file-option__status" :class="{ 'is-empty': !cartonTotalFile }"><span>{{ cartonTotalFile?.name || '尚未选择文件' }}</span><button v-if="cartonTotalFile" type="button" class="warehouse-file-clear" title="清除箱唛总文件" aria-label="清除箱唛总文件" :disabled="saving" @click="clearCreateTotalFile('CARTON_TOTAL')"><X :size="14" /></button></div></div>
                  <div class="warehouse-file-choice-or" :class="{ 'is-both': requiresBothTotalFiles }">{{ requiresBothTotalFiles ? '和' : '或' }}</div>
@@ -1553,22 +1544,23 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
              </section>
            </div>
            <input ref="skuTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'sku')"><input ref="cartonTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'carton')"><input ref="mixedTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'mixed')"><input ref="cartonTotalCreateInput" class="warehouse-hidden-input" type="file" accept="application/pdf,.pdf" @change="selectCartonTotalFile"><input ref="skuTotalCreateInput" class="warehouse-hidden-input" type="file" accept="application/pdf,.pdf" @change="selectSkuTotalFile">
+            <p v-if="isReturnRelabelSource" class="warehouse-list-notice">仓库识别码用于定位实物，不代表商品已换标。部分数量换标须由仓库合箱为独立新箱，源包裹/箱余量保留，下游按新箱出库；整包裹可未确认仓库识别标签即出库。</p>
            <div v-if="isReturnRelabelSource" class="warehouse-table-scroll">
              <template v-if="returnLooseCandidates.length">
-              <div class="warehouse-section-heading"><h3>可用散件 SKU</h3><el-button text type="primary" native-type="button" :aria-expanded="!availableSkusCollapsed" aria-controls="return-available-skus" @click="availableSkusCollapsed = !availableSkusCollapsed">{{ availableSkusCollapsed ? '展开明细' : '收起明细' }}</el-button></div>
-              <table v-show="!availableSkusCollapsed" id="return-available-skus" class="warehouse-edit-table"><thead><tr><th>SKU</th><th>可用数量（件）</th><th>操作</th></tr></thead><tbody><template v-for="source in returnLooseCandidates" :key="source.returnCartonId"><tr v-for="sku in source.skuItems" :key="sku.skuCode"><td>{{ sku.skuCode }}</td><td>{{ sku.quantity }}</td><td><el-button size="small" :disabled="labelingMode !== 'sku'" @click="addReturnSkuBinding(source, sku.skuCode)">添加贴标</el-button></td></tr></template><tr v-if="!returnLooseCandidates.length"><td colspan="3">暂无可用散件库存</td></tr></tbody></table>
+              <div class="warehouse-section-heading"><h3>可用包裹</h3><el-button text type="primary" native-type="button" :aria-expanded="!availableSkusCollapsed" aria-controls="return-available-skus" @click="availableSkusCollapsed = !availableSkusCollapsed">{{ availableSkusCollapsed ? '展开明细' : '收起明细' }}</el-button></div>
+              <table v-show="!availableSkusCollapsed" id="return-available-skus" class="warehouse-edit-table"><thead><tr><th>包裹识别码</th><th>来源退货单</th><th>SKU</th><th>可用数量（件）</th><th>换标进度</th><th>操作</th></tr></thead><tbody><template v-for="source in returnLooseCandidates" :key="source.returnCartonId"><tr v-for="sku in source.skuItems" :key="sku.skuCode"><td>{{ source.cartonMark }}</td><td>{{ source.inboundOrderNo }}</td><td>{{ sku.skuCode }}</td><td>{{ sku.quantity }}</td><td>{{ returnRelabelProgress(source) }}</td><td><el-button size="small" @click="labelingMode === 'sku' ? addReturnSkuBinding(source, sku.skuCode) : addReturnBoxBinding(source)">添加贴标</el-button></td></tr></template><tr v-if="!returnLooseCandidates.length"><td colspan="6">暂无可用包裹库存</td></tr></tbody></table>
              </template>
              <template v-if="returnBoxCandidates.length">
              <div class="warehouse-section-heading"><h3>可用箱子（{{ returnBoxCandidates.length }} 箱）</h3><el-button text type="primary" native-type="button" :aria-expanded="!availableBoxesCollapsed" aria-controls="return-available-boxes" @click="availableBoxesCollapsed = !availableBoxesCollapsed">{{ availableBoxesCollapsed ? '展开明细' : '收起明细' }}</el-button></div>
-              <table v-show="!availableBoxesCollapsed" id="return-available-boxes" class="warehouse-edit-table"><thead><tr><th>系统箱唛号</th><th>箱内 SKU</th><th>可用数量（件）</th><th>操作</th></tr></thead><tbody><tr v-for="source in returnBoxCandidates" :key="source.returnCartonId"><td><strong>{{ source.cartonMark }}</strong></td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.skuCode }}</div></td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.quantity }}</div></td><td><el-button size="small" @click="addReturnBoxBinding(source)">添加贴标</el-button></td></tr><tr v-if="!returnBoxCandidates.length"><td colspan="4">暂无可用箱子库存</td></tr></tbody></table>
+              <table v-show="!availableBoxesCollapsed" id="return-available-boxes" class="warehouse-edit-table"><thead><tr><th>仓库箱识别码</th><th>来源退货单</th><th>箱内 SKU</th><th>可用数量（件）</th><th>换标进度</th><th>操作</th></tr></thead><tbody><tr v-for="source in returnBoxCandidates" :key="source.returnCartonId"><td><strong>{{ source.cartonMark }}</strong></td><td>{{ source.inboundOrderNo }}</td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.skuCode }}</div></td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.quantity }}</div></td><td>{{ returnRelabelProgress(source) }}</td><td><el-button size="small" @click="addReturnBoxBinding(source)">添加贴标</el-button></td></tr><tr v-if="!returnBoxCandidates.length"><td colspan="6">暂无可用箱子库存</td></tr></tbody></table>
              </template>
            </div>
            <div class="warehouse-labeling-mode">
              <span>换标类型</span>
              <el-radio-group v-model="labelingMode" aria-label="换标类型">
-                <el-radio-button value="carton" :disabled="returnSkuOnly">只换箱唛</el-radio-button>
+                <el-radio-button value="carton">只换箱唛</el-radio-button>
                <el-radio-button value="sku">只换 SKU 标签</el-radio-button>
-                <el-radio-button value="carton_and_sku" :disabled="returnSkuOnly">SKU 和箱唛都换</el-radio-button>
+                <el-radio-button value="carton_and_sku">SKU 和箱唛都换</el-radio-button>
              </el-radio-group>
            </div>
            <div v-if="importedRelabelBindings.length" class="warehouse-import-preview">
@@ -1580,8 +1572,8 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
              <div v-if="labelingMode === 'carton'"><el-button type="primary" size="small" @click="addRelabelCargoRow"><Plus :size="15" />手动添加行</el-button><el-button size="small" @click="clearRelabelRows">清空</el-button></div>
              <div v-else><el-button type="primary" size="small" @click="addSkuRelabelRow"><Plus :size="15" />添加 SKU 明细</el-button><el-button size="small" @click="skuRelabelRows = []">清空</el-button></div>
            </div>
-            <div v-if="labelingMode === 'carton'" class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-label-table"><thead><tr><th>商品 SKU</th><th>中文品名 *</th><th>FBA 货件编号 *</th><th>箱数</th><th>仓库唛头 *</th><th>新 FBA 箱唛 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in cartonDetailRows" :key="row.id"><td><el-input v-model="row.sku" placeholder="选填" /></td><td><el-input v-model="row.name" placeholder="请输入中文品名" /></td><td><el-input v-model="row.shipmentNo" placeholder="请输入FBA货件编号" /></td><td><strong>1 箱</strong></td><td><el-input v-model="row.cartonMark" placeholder="请输入仓库唛头" /></td><td><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td><el-input v-model="row.remark" type="textarea" :rows="2" maxlength="1000" show-word-limit placeholder="请输入明细备注" /></td><td><button type="button" class="warehouse-delete" title="移出本次明细" @click="removeCargoRow(row.id)"><Trash2 :size="16" />移出</button></td></tr><tr v-if="cartonDetailRows.length === 0"><td colspan="8"><div class="warehouse-empty">暂无本次换标明细，请上传关系后导入或手动添加</div></td></tr></tbody></table></div>
-            <div v-else class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-sku-label-table"><thead><tr><th v-if="!hideReturnSkuCartonMark">仓库唛头 *</th><th>旧 SKU *</th><th>新 SKU *</th><th>换标数量（件）*</th><th v-if="labelingMode === 'carton_and_sku'">新 FBA 箱唛 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in skuRelabelRows" :key="row.id"><td v-if="!hideReturnSkuCartonMark"><el-input v-model="row.cartonMark" placeholder="请输入仓库唛头" @change="applyExistingCartonBinding(row)" /></td><td><el-input v-model="row.originalSku" placeholder="请输入旧 SKU" @change="applyExistingSkuBinding(row)" /></td><td><el-input v-model="row.newSku" placeholder="请输入新 SKU" /></td><td><el-input-number v-model="row.quantity" :min="1" :precision="0" controls-position="right" placeholder="请输入件数" /></td><td v-if="labelingMode === 'carton_and_sku'"><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td><el-input v-model="row.remark" placeholder="请输入备注" /></td><td><button type="button" class="warehouse-delete" title="删除" @click="removeSkuRelabelRow(row.id)"><Trash2 :size="16" />删除</button></td></tr><tr v-if="skuRelabelRows.length === 0"><td :colspan="hideReturnSkuCartonMark ? 5 : labelingMode === 'carton_and_sku' ? 7 : 6"><div class="warehouse-empty">暂无绑定明细，请点击“添加 SKU 明细”</div></td></tr></tbody></table></div>
+            <div v-if="labelingMode === 'carton'" class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-label-table"><thead><tr><th>商品 SKU</th><th>中文品名 *</th><th>FBA 货件编号 *</th><th>箱数</th><th>仓库唛头 *</th><th>新 FBA 箱唛 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in cartonDetailRows" :key="row.id"><td><el-input v-model="row.sku" placeholder="选填" /></td><td><el-input v-model="row.name" placeholder="请输入中文品名" /></td><td><el-input v-model="row.shipmentNo" placeholder="请输入FBA货件编号" /></td><td><strong>1 箱</strong></td><td><el-input v-model="row.cartonMark" :readonly="isReturnRelabelSource" placeholder="请输入仓库唛头" /></td><td><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td><el-input v-model="row.remark" type="textarea" :rows="2" maxlength="1000" show-word-limit placeholder="请输入明细备注" /></td><td><button type="button" class="warehouse-delete" title="移出本次明细" @click="removeCargoRow(row.id)"><Trash2 :size="16" />移出</button></td></tr><tr v-if="cartonDetailRows.length === 0"><td colspan="8"><div class="warehouse-empty">暂无本次换标明细，请上传关系后导入或手动添加</div></td></tr></tbody></table></div>
+            <div v-else class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-sku-label-table"><thead><tr><th>仓库唛头 *</th><th>旧 SKU *</th><th>新 SKU *</th><th>换标数量（件）*</th><th v-if="labelingMode === 'carton_and_sku'">新 FBA 箱唛 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in skuRelabelRows" :key="row.id"><td><el-input v-model="row.cartonMark" :readonly="isReturnRelabelSource" placeholder="请输入仓库唛头" @change="applyExistingCartonBinding(row)" /></td><td><el-input v-model="row.originalSku" :readonly="isReturnRelabelSource" placeholder="请输入旧 SKU" @change="applyExistingSkuBinding(row)" /></td><td><el-input v-model="row.newSku" placeholder="请输入新 SKU" /></td><td><el-input-number v-model="row.quantity" :min="1" :precision="0" controls-position="right" placeholder="请输入件数" /></td><td v-if="labelingMode === 'carton_and_sku'"><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td><el-input v-model="row.remark" placeholder="请输入备注" /></td><td><button type="button" class="warehouse-delete" title="删除" @click="removeSkuRelabelRow(row.id)"><Trash2 :size="16" />删除</button></td></tr><tr v-if="skuRelabelRows.length === 0"><td :colspan="labelingMode === 'carton_and_sku' ? 7 : 6"><div class="warehouse-empty">暂无绑定明细，请点击“添加 SKU 明细”</div></td></tr></tbody></table></div>
          </template>
          <template v-else>
            <div class="warehouse-section-heading" :class="{ 'warehouse-step-heading': props.service === 'transfer' }"><div><h3><span v-if="props.service === 'transfer'" class="warehouse-step-number">1</span>货物明细</h3></div><div v-if="props.service !== 'disposal'" class="warehouse-heading-actions"><el-button v-if="props.service === 'transfer'" size="small" :disabled="!cargoRows.some((row) => row.sku.trim() && row.quantity > 0)" @click="printTransferDraftCartonMarks"><Printer :size="15" />打印唛头</el-button><el-button type="primary" size="small" @click="addCargoRow"><Plus :size="15" />添加行</el-button><el-button size="small" @click="cargoRows = []">清空</el-button></div></div>
@@ -137,12 +137,12 @@ test('箱唛相关换标必须选择四选一派送方式', () => {

 test('一次申请单选库存来源且退货库存按退货单汇总', () => {
  assert.doesNotMatch(view, /multiple filterable collapse-tags/)
-  assert.match(view, /RETURN_ORDER:\$\{returnOrderNo\}/)
+  assert.match(view, /returnSourceNos\(item\)\.includes\(selectedReturnOrderNo\.value\)/)
  assert.match(view, /current\.availablePackages \+= inventoryQuantity\(candidate\.availablePackages\)/)
  assert.match(view, /availablePackages: inventoryQuantity\(candidate\.availablePackages\)/)
  assert.match(view, /const quantity = Number\(value\)/)
-  assert.match(view, /可用散件 SKU/)
-  assert.match(view, /系统箱唛号/)
+  assert.match(view, /可用包裹<\/h3>/)
+  assert.match(view, /仓库箱识别码/)
  assert.match(view, /箱内 SKU/)
  assert.match(view, /returnLooseCandidates/)
  assert.match(view, /returnBoxCandidates/)
@@ -0,0 +1,63 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import ts from 'typescript'
+const view = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+const source = view.slice(view.indexOf('function returnSourceNos'), view.indexOf('const relabelInboundOptions'))
+const compiled = ts.transpileModule(source + '\nexports.sourceNos = returnSourceNos; exports.progress = returnRelabelProgress', { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText
+const exports = {}
+new Function('exports', compiled)(exports)
+test('合箱来源按单号集合精确匹配并去重，不能用子串匹配', () => {
+  const sources = exports.sourceNos({ inboundOrderNo: ' RETURN-1,RETURN-10, RETURN-1 ' })
+  assert.deepEqual(sources, ['RETURN-1', 'RETURN-10'])
+  assert.equal(sources.includes('RETURN'), false)
+  assert.deepEqual(exports.sourceNos({}), [])
+})
+test('实际完成和处理中占用分别展示，缺失投影保持未知', () => {
+  assert.equal(exports.progress({ relabelStatus: 'PARTIALLY_COMPLETED', relabelledQuantity: 3, relabelReservedQuantity: 2 }), '部分完成｜实际完成 3 件｜处理中占用 2 件')
+  assert.equal(exports.progress({}), '—｜实际完成 — 件｜处理中占用 — 件')
+  assert.equal(exports.progress({ relabelStatus: 'PROCESSING', relabelledQuantity: 0, relabelReservedQuantity: 4 }), '处理中｜实际完成 0 件｜处理中占用 4 件')
+})
+test('退货 SKU 申请按实物箱选择，来源标识只读，部分数量独立合箱', () => {
+  assert.match(view, /item.id === rows\[0\].sourceRowId/)
+  assert.match(view, /row.sourceRowId !== source\?\.id/)
+  assert.match(view, /:readonly="isReturnRelabelSource"/)
+  assert.match(view, /部分数量换标须由仓库合箱为独立新箱/)
+  assert.match(view, /labelingMode.value === 'sku' \? !skuTotalFile.value : !cartonTotalFile.value/)
+})
+
+test('整包裹支持SKU和混贴提交，实物数为1且各SKU数量仍按件', () => {
+  const builder = view.slice(view.indexOf('function buildSkuRelabelItems'), view.indexOf('function addRelabelCargoRow'))
+  const compiledBuilder = ts.transpileModule(builder, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const cargo = { id: 1, returnCartonId: 'PARCEL-ID', cartonMark: 'RP-1', sku: 'SKU-A', availableQuantity: 1 }
+  const rows = [{ sourceRowId: 1, cartonMark: 'RP-1', originalSku: 'SKU-A', newSku: 'NEW-A', quantity: 3, fbaCartonMark: 'FBA-NEW' }, { sourceRowId: 1, cartonMark: 'RP-1', originalSku: 'SKU-B', newSku: 'NEW-B', quantity: 2, fbaCartonMark: 'FBA-NEW' }]
+  const candidate = { returnCartonId: 'PARCEL-ID', sourceType: 'RETURN_PARCEL', skuItems: [{ skuCode: 'SKU-A', quantity: 3 }, { skuCode: 'SKU-B', quantity: 2 }] }
+  for (const mode of ['sku', 'carton_and_sku']) {
+    const build = new Function('skuRelabelRows', 'cargoRows', 'isReturnRelabelSource', 'selectedReturnCandidates', 'labelingMode', 'form', compiledBuilder + '; return buildSkuRelabelItems')({ value: rows }, { value: [cargo] }, { value: true }, { value: [candidate] }, { value: mode }, { destination: 'FBA-WH' })
+    const [item] = build()
+    assert.equal(item.returnCartonId, 'PARCEL-ID')
+    assert.equal(item.operationType, mode === 'sku' ? 'SKU_LABEL' : 'CARTON_AND_SKU')
+    assert.equal(item.totalPackageCount, 1)
+    assert.equal(item.notifiedPackageCount, 1)
+    assert.deepEqual(item.skuItems.map(sku => sku.quantity), [3, 2])
+    if (mode === 'carton_and_sku') assert.equal(item.fbaCartonMark, 'FBA-NEW')
+    rows[0].quantity = 4
+    assert.throws(build, /超过来源箱可用数量/)
+    rows[0].quantity = 3
+  }
+})
+
+test('包裹箱唛添加保持一个实物并去重，三种类型不再禁用', () => {
+  const binding = view.slice(view.indexOf('function addReturnBoxBinding'), view.indexOf('</script>'))
+  const compiledBinding = ts.transpileModule(binding, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const cargoRows = { value: [] }
+  const bind = new Function('labelingMode', 'cartonDetailRows', 'cargoRows', 'selectedReturnOrderNo', 'addReturnSkuBinding', 'let cargoSequence = 0; ' + compiledBinding + '; return addReturnBoxBinding')({ value: 'carton' }, { value: cargoRows.value }, cargoRows, { value: 'RETURN-1' }, () => assert.fail('箱唛模式不添加SKU行'))
+  const parcel = { returnCartonId: 'PARCEL-ID', sourceType: 'RETURN_PARCEL', cartonMark: 'RP-1', skuItems: [{ skuCode: 'SKU-A', quantity: 80 }] }
+  bind(parcel)
+  bind(parcel)
+  assert.equal(cargoRows.value.length, 1)
+  assert.equal(cargoRows.value[0].returnCartonId, 'PARCEL-ID')
+  assert.equal(cargoRows.value[0].quantity, 1)
+  assert.doesNotMatch(view, /returnSkuOnly|散件库存只能贴 SKU/)
+  assert.match(view, /labelingMode === 'sku' \? addReturnSkuBinding\(source, sku.skuCode\) : addReturnBoxBinding\(source\)/)
+})