From a0e9ad808bb3165ea6965d8c75e411b6d3f5edb0 Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Tue, 13 Oct 2026 10:16:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/ReturnOrdersView.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue index 8f87c87..8ab864b 100644 --- a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue +++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue @@ -393,7 +393,7 @@ onBeforeUnmount(clearPhotoUrls)
-

包裹签收明细打印全部包裹唛头（{{ parcelReceipts.length }} 个）{{ parcelDetailsExpanded ? '收起明细' : '展开明细' }}

+

包裹签收明细打印全部包裹唛头（{{ parcelReceipts.length }} 个）{{ parcelDetailsExpanded ? '收起明细' : '展开明细' }}

包裹 {{ receipt.unitCode || receipt.trackingNo || receipt.receiptNo }}{{ receipt.receivedQuantity }} 件 @@ -451,7 +451,7 @@ onBeforeUnmount(clearPhotoUrls)
-

签收批次{{ receiptBatchesExpanded ? '收起批次' : '展开批次' }}

+

签收批次{{ receiptBatchesExpanded ? '收起批次' : '展开批次' }}

@@ -519,6 +519,10 @@ onBeforeUnmount(clearPhotoUrls) .section-heading-with-action { display:flex; align-items:center; justify-content:space-between; gap:12px; } .return-label-actions { display:flex; align-items:center; gap:6px; } .return-label-actions :deep(.el-button) { height:28px; margin:0; padding:0 12px; border-radius:6px; font-size:12px; box-shadow:0 2px 5px rgba(33,103,232,.14); } +.return-parcel-heading { display:grid; grid-template-columns:800px minmax(0,1fr); gap:0; } +.return-parcel-heading .return-label-actions { display:grid; grid-template-columns:134px max-content; gap:6px; justify-content:start; } +.return-parcel-heading .return-label-actions :deep(.el-button:first-child) { height:auto; min-height:28px; padding:4px 2px; white-space:normal; } +.return-parcel-heading .return-label-actions :deep(.el-button:first-child > span) { line-height:16px; } .return-detail-grid { display:grid; grid-template-columns:repeat(4,minmax(0,1fr)); border-top:1px solid #edf1f5; } .return-detail-grid div { display:flex; min-width:0; min-height:40px; align-items:center; gap:6px; padding:6px 10px; border-right:1px solid #edf1f5; border-bottom:1px solid #edf1f5; } .return-detail-grid span,.return-detail-remark span { flex:0 0 82px; color:#8490a1; font-size:12px; } @@ -539,8 +543,8 @@ 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 { width:calc(100% - 32px); max-width:760px; box-sizing:border-box; margin:8px 16px 12px; 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:8px 12px; color:#26364f; font-size:13px; 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; } @@ -548,9 +552,10 @@ onBeforeUnmount(clearPhotoUrls) .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; } +.return-parcel-items__list { display:grid; grid-template-columns:minmax(0,1fr); gap:6px; padding:8px; } +/* Match the 300px table columns above, accounting for the parcel card's inset and 8px gaps. */ +.return-parcel-item { display:grid; grid-template-columns:minmax(0,272px) minmax(0,292px) minmax(0,1fr); align-items:center; gap:8px; min-height:32px; box-sizing:border-box; padding:5px 8px; border:1px solid #edf1f5; border-radius:6px; background:#fff; font-size:12px; } +.return-parcel-item__sku { min-width:0; overflow-wrap:anywhere; 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; } }