Merge remote-tracking branch 'origin/release/test' into release/test

src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue

@@ -227,6 +227,33 @@ onMounted(load)
           </dl>
         </el-tab-pane>
         <el-tab-pane name="cargo"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>货物信息</span></template><section class="table-panel"><DataTable :data="cargo" :columns="cargoColumns" column-settings-mode="hide" row-key="id" empty-text="暂无货物明细"></DataTable></section></el-tab-pane>
+        <el-tab-pane v-if="detail?.order.orderType === 'RETURN_RELABEL'" name="return-receipt"><template #label><span class="density-tab-icon" aria-hidden="true">📦</span><span>退货签收与箱内清点</span></template>
+          <section v-if="detail.returnReceipt" class="table-panel" aria-label="退货签收与箱内清点">
+            <h3>{{ detail.returnReceipt.order.returnNo }} · 实收 {{ detail.returnReceipt.order.receivedQuantity }} / 预报 {{ detail.returnReceipt.order.expectedQuantity }} 件</h3>
+            <el-table :data="detail.returnReceipt.receipts" size="small" border>
+              <el-table-column prop="receiptNo" label="签收单号" min-width="190" />
+              <el-table-column label="签收方式" width="90"><template #default="{ row }">{{ row.unitType === 'PALLET' ? '托盘' : row.unitType === 'BOX' ? '箱子' : '包裹' }}</template></el-table-column>
+              <el-table-column prop="unitCode" label="签收载体" min-width="220" />
+              <el-table-column prop="boxCount" label="实收箱数" width="100" />
+              <el-table-column prop="receivedQuantity" label="实收数量" width="100" />
+            </el-table>
+            <h3>签收箱号明细（{{ detail.returnReceipt.cartons?.length || 0 }} 箱）</h3>
+            <el-collapse v-if="detail.returnReceipt.cartons?.length">
+              <el-collapse-item v-for="box in detail.returnReceipt.cartons" :key="box.cartonMark" :name="box.cartonMark">
+                <template #title>{{ box.cartonMark }} · {{ box.countStatus === 'CONFIRMED' ? `已确认 · ${box.items.length} 种 SKU · ${box.items.reduce((sum, item) => sum + Number(item.quantity), 0)} 件` : box.countStatus === 'PENDING' ? '待清点' : '未留存箱内签收明细' }}</template>
+                <p>签收单 {{ box.receiptNo }}<template v-if="box.palletCode"> · 托盘 {{ box.palletCode }}</template><template v-if="box.countedAt"> · 确认时间 {{ formatOverseasDateTime(box.countedAt) }}</template></p>
+                <el-table v-if="box.countStatus === 'CONFIRMED'" :data="box.items" size="small" border>
+                  <el-table-column prop="skuCode" label="SKU" min-width="220" />
+                  <el-table-column prop="productNameZh" label="中文品名" min-width="180" />
+                  <el-table-column prop="quantity" label="实际签收数量" width="130" />
+                </el-table>
+                <p v-else>{{ box.countStatus === 'PENDING' ? '箱内数量待仓库清点确认' : '未留存原始箱内明细，不以当前库存代替签收数量' }}</p>
+              </el-collapse-item>
+            </el-collapse>
+            <el-empty v-else description="暂无签收箱号明细" />
+          </section>
+          <el-empty v-else description="暂无退货签收记录" />
+        </el-tab-pane>
         <el-tab-pane name="plan" lazy><template #label><span class="density-tab-icon" aria-hidden="true">🗓️</span><span>计划信息</span></template>
           <WarehouseTransferFulfillmentPanel v-if="detail?.order.orderType === 'WAREHOUSE_TRANSFER'" :customer-id="detail.order.customerId" :transfer-no="detail.order.sourceOrderNo || ''" />
           <section class="info-panel plan-panel" aria-label="计划信息"><dl class="detail-fields plan-fields density-fields"><div v-for="field in planFields" :key="field.label"><dt>{{ field.label }}</dt><dd :class="{ 'detail-field-value--business': isSingleLineBusinessField(field) }" :title="isSingleLineBusinessField(field) ? String(field.value) : undefined">{{ field.value }}</dd></div></dl></section>