html/client-web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test

Browse Source
This commit is contained in:
ouyangxq
2026-10-10 02:20:16 +08:00
parent d7f8365ecc 3cdd14a521
commit 5751973c83
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/overseas-warehouse/views/ReturnOrdersView.vue
+18 -6
View File
@@ -378,7 +378,14 @@ onBeforeUnmount(clearPhotoUrls)
<el-table-column prop="createdAt" label="合箱时间" min-width="160" />
</el-table>
</section>
<section class="return-detail-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>
<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>
</div>
</section>
<section v-if="selected.pallets?.length" class="return-detail-section">
<h3 class="section-heading-with-action"><span>实物明细（{{ selected.pallets?.length || 0 }} 个托盘/箱）</span><span v-if="printableReceipts.length" class="return-label-actions"><el-button type="primary" size="small" @click="printReturnLabel(printableReceipts)">打印全部箱唛（{{ printableBoxCount }} 箱）</el-button></span></h3>
<el-collapse v-if="selected.pallets?.length" class="return-pallet-list">
<el-collapse-item v-for="pallet in selected.pallets" :key="pallet.palletCode" :name="pallet.palletCode">
@@ -394,7 +401,7 @@ onBeforeUnmount(clearPhotoUrls)
</el-collapse>
<el-empty v-else description="暂无打托记录" :image-size="64" />
</section>
<section class="return-detail-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>
<el-dialog v-model="showCartons" title="签收箱号明细" width="1120px" align-center destroy-on-close>
<div class="return-cartons-dialog-body">
@@ -434,10 +441,7 @@ onBeforeUnmount(clearPhotoUrls)
<template #startedBy="{ row }">{{ startedByLabel(row.startedBy) }}</template>
<template #signedAt="{ row }">{{ formatDateTime(row.signedAt) }}</template>
</DataTable>
<div v-for="receipt in (selected.receipts || []).filter(item => item.unitType === 'PARCEL')" :key="`${receipt.receiptNo}-items`" class="return-parcel-items">
<strong>包裹 {{ receipt.unitCode || receipt.trackingNo || receipt.receiptNo }} SKU 明细</strong>
<span v-for="item in receipt.items" :key="item.skuCode">{{ item.skuCode }} × {{ item.quantity }}</span>
</div>
</section>
</template>
</article>
@@ -501,6 +505,14 @@ onBeforeUnmount(clearPhotoUrls)
.return-photo { min-width:0; overflow:hidden; padding:0; border:1px solid #dfe6ef; border-radius:6px; color:#526176; background:#fff; cursor:pointer; }
.return-photo img,.return-photo>span { display:flex; width:100%; height:120px; align-items:center; justify-content:center; object-fit:cover; background:#f4f7fb; }
.return-photo small { display:block; overflow:hidden; padding:7px; text-overflow:ellipsis; white-space:nowrap; }
.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__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; }
.return-parcel-item__name { overflow:hidden; color:#8490a1; font-size:12px; text-overflow:ellipsis; white-space:nowrap; }
.return-parcel-item strong { color:#1764c0; white-space:nowrap; }
@media (max-width: 760px) { .return-create-form { grid-template-columns:1fr; } }
@media (max-width: 1100px) { .return-detail-grid { grid-template-columns:repeat(2,minmax(0,1fr)); } }
@media (max-width: 900px) { .return-photo-grid { grid-template-columns:repeat(3,minmax(0,1fr)); } }