From e3baf69db5a8d33a232f08a95e8f3909fe0e3dcf Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Mon, 14 Sep 2026 15:52:00 +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 --- src/modules/inbounds/components/InboundTaskList.vue | 2 +- .../inbounds/measurement/InboundMeasurementPanel.vue | 2 +- .../loading-lists/components/LoadingListDetailDrawer.vue | 9 +++++---- src/modules/unified-orders/pages/UnifiedOrdersView.vue | 1 + src/modules/unified-orders/styles/orderDensity.css | 2 +- src/styles/adminDensity.css | 4 ++++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/modules/inbounds/components/InboundTaskList.vue b/src/modules/inbounds/components/InboundTaskList.vue index 884e5421..b4612a97 100644 --- a/src/modules/inbounds/components/InboundTaskList.vue +++ b/src/modules/inbounds/components/InboundTaskList.vue @@ -262,7 +262,7 @@ async function batchApproveMeasurements() { await ElMessageBox.confirm( `确认批量审核通过已勾选的 ${selected.length} 条测量数据吗？一件代发通过后进入待组托，其他订单进入待分柜。`, '批量审核测量数据', - { confirmButtonText: '确认批量审核', cancelButtonText: '取消', type: 'warning' }, + { customClass: 'admin-density-confirm', confirmButtonText: '确认批量审核', cancelButtonText: '取消', type: 'warning' }, ) let successCount = 0 let failureCount = 0 diff --git a/src/modules/inbounds/measurement/InboundMeasurementPanel.vue b/src/modules/inbounds/measurement/InboundMeasurementPanel.vue index 6ea93b5e..60f5d114 100644 --- a/src/modules/inbounds/measurement/InboundMeasurementPanel.vue +++ b/src/modules/inbounds/measurement/InboundMeasurementPanel.vue @@ -944,7 +944,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock .measurement-section__heading > div { min-width: 0; } .measurement-section-actions { display: flex; flex-wrap: wrap; justify-content: flex-end; gap: 8px; }.measurement-section-actions :deep(.el-button) { margin-left: 0; } .warehouse-suggestion-form { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 16px; }.warehouse-suggestion-form :deep(.el-select),.warehouse-suggestion-form :deep(.el-input-number) { width: 100%; }.warehouse-suggestion-form :deep(.el-form-item:last-child) { grid-column: 1 / -1; }.suggestion-preview { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); margin: 4px 0 0; border: 1px solid var(--cc-border); border-radius: 6px; }.suggestion-preview div { padding: 12px; border-right: 1px solid var(--cc-border); }.suggestion-preview div:last-child { border-right: 0; }.suggestion-preview dt { color: var(--cc-muted); font-size: 11px; }.suggestion-preview dd { margin: 5px 0 0; color: var(--cc-text); font-size: 13px; font-weight: 650; } -.measurement-form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px 24px; } +.measurement-form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 16px; } .measurement-data-grid { display: grid; grid-template-columns: repeat(5, minmax(0, 1fr)); gap: 12px; } .measurement-form label { display: flex; min-width: 0; flex-direction: column; gap: 7px; color: #344054; font-size: 12px; font-weight: 650; } .measurement-form :deep(.el-input-number), .measurement-form :deep(.el-input) { width: 100%; } diff --git a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue index 93bf275f..b5c2d379 100644 --- a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue +++ b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue @@ -32,11 +32,11 @@ const baseItemColumns: DataTableColumn[] = [ { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 170, className: 'identifier-column', showOverflowTooltip: true }, { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 155, className: 'identifier-column', showOverflowTooltip: true }, { key: 'unitType', label: '装柜单位', width: 110, slotName: 'unitType' }, - { key: 'orderNo', prop: 'orderNo', label: '订单号', minWidth: 170, className: 'identifier-column', showOverflowTooltip: true }, + { key: 'orderNo', prop: 'orderNo', label: '订单号', minWidth: 210, className: 'identifier-column', showOverflowTooltip: true }, { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 165, className: 'identifier-column', showOverflowTooltip: true, formatter: (row: LoadingItem) => row.containerNo || '待补录' }, - { key: 'skuCode', prop: 'skuCode', label: 'SKU', minWidth: 150, className: 'identifier-column', showOverflowTooltip: true }, + { key: 'skuCode', prop: 'skuCode', label: 'SKU', minWidth: 220, className: 'identifier-column', showOverflowTooltip: true }, { key: 'destinationWarehouse', prop: 'destinationWarehouse', label: '目的仓', minWidth: 150, className: 'identifier-column', showOverflowTooltip: true }, - { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150 }, + { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 220 }, { key: 'taxRefundFlag', label: '是否退税', width: 96, align: 'center', slotName: 'taxRefundFlag' }, { key: 'chineseName', prop: 'chineseName', label: '中文品名', minWidth: 160 }, { key: 'englishName', prop: 'englishName', label: '英文品名', minWidth: 170 }, @@ -283,7 +283,8 @@ function formatNumber(value?: number | null, digits = 3) { .preload-density .detail-summary__wide { grid-column: span 2; } .preload-density .detail-layout :deep(.detail-page-layout__content) { gap: 12px; } .preload-density .detail-section, .preload-density .history-section { padding-top: 8px; } -.preload-density .detail-section__heading h2 { font-size: 14px; } +.preload-density .detail-section__heading h2, .preload-density .history-section h2 { font-size: 14px; } +.preload-density .history-section header { margin-bottom: 8px; } .preload-density .detail-section__heading p, .preload-density small { font-size: 12px; } .preload-density .readiness-note { align-items: baseline; } .preload-density .readiness-note span { white-space: normal; overflow: visible; overflow-wrap: anywhere; } diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.vue b/src/modules/unified-orders/pages/UnifiedOrdersView.vue index 89e598e7..b260d343 100644 --- a/src/modules/unified-orders/pages/UnifiedOrdersView.vue +++ b/src/modules/unified-orders/pages/UnifiedOrdersView.vue @@ -2994,4 +2994,5 @@ onBeforeUnmount(() => { @media (max-width: 420px) { .weight-evidence { padding: 10px; } .weight-evidence-grid { grid-template-columns: 1fr; } } + diff --git a/src/modules/unified-orders/styles/orderDensity.css b/src/modules/unified-orders/styles/orderDensity.css index 345c34db..2ec548ec 100644 --- a/src/modules/unified-orders/styles/orderDensity.css +++ b/src/modules/unified-orders/styles/orderDensity.css @@ -1,4 +1,4 @@ -/* Order workspace pilot. Keep these rules local until the visual baseline is approved. */ +/* Order-specific sections. Shared density lives in styles/adminDensity.css. */ .unified-orders-page .inbound-fee-panel .fee-summary { grid-template-columns: minmax(230px, 1.3fr) repeat(4, minmax(150px, 1fr)); border-top: 0; diff --git a/src/styles/adminDensity.css b/src/styles/adminDensity.css index 0902d5f9..18c2eaf2 100644 --- a/src/styles/adminDensity.css +++ b/src/styles/adminDensity.css @@ -60,3 +60,7 @@ .admin-density-dialog.el-dialog .el-empty { padding: 12px 0; } .admin-density-dialog.el-dialog .el-empty__image { display: none; } .admin-density-dialog.el-dialog .el-empty__description { margin-top: 0; } + +/* Headers must keep units visible even when a saved column width is narrow. */ +.admin-density .el-table th.el-table__cell .cell, +.admin-density-dialog .el-table th.el-table__cell .cell { white-space: normal; overflow-wrap: anywhere; text-overflow: clip; line-height: 18px; }