From 54e1caf8defd92adbe6efd6cc2bf2dd377e4e42e Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Thu, 17 Sep 2026 18:00:43 +0800 Subject: [PATCH] 1 --- .../components/UnpackDetailTable.vue | 2 + src/views/express/returnUnpack/index.vue | 165 ++++++++---- src/views/message/index.vue | 208 ++++++++++----- .../mode/components/ColumnCellRenderer.vue | 12 +- .../mode/config/components/DetailPanel.vue | 15 +- src/views/mode/config/components/LogPanel.vue | 147 ++++++++--- src/views/mode/config/template-config.ts | 4 +- src/views/mode/index.vue | 6 + .../config/order-common-config.ts | 1 + .../waveOrder/GroupWaveBatchListPanel.vue | 238 ++++++++++++------ .../component/PendingOrderListPanel.vue | 23 +- src/views/store/shipperSigning/index.vue | 130 +++++++--- .../setting/pickcart/components/InfoPanel.vue | 75 ++++-- src/views/system/setting/pickcart/index.vue | 22 +- 14 files changed, 730 insertions(+), 318 deletions(-) diff --git a/src/views/express/returnUnpack/components/UnpackDetailTable.vue b/src/views/express/returnUnpack/components/UnpackDetailTable.vue index 1e903aa3..5787642b 100644 --- a/src/views/express/returnUnpack/components/UnpackDetailTable.vue +++ b/src/views/express/returnUnpack/components/UnpackDetailTable.vue @@ -150,6 +150,8 @@ v-if="rows.length > pageSize" class="detail-pagination" layout="prev, pager, next, total" + size="small" + background :current-page="page" :page-size="pageSize" :total="rows.length" diff --git a/src/views/express/returnUnpack/index.vue b/src/views/express/returnUnpack/index.vue index ad8dad74..93b153df 100644 --- a/src/views/express/returnUnpack/index.vue +++ b/src/views/express/returnUnpack/index.vue @@ -145,58 +145,76 @@
+ + { color: #c0c4cc; } -.detail-scroll { - height: 100%; - padding: 16px; - box-sizing: border-box; - overflow: auto; +/* 详情区外壳与 stock/external_stock 一致:不留上/下间距,左右 10px, + 由各详情页自身 padding 控制上下留白 */ +.order-sub-container .main-content .lower-level .detail-container { + padding: 0 10px; } -.detail-section { - margin-bottom: 16px; +.detail-scroll { + height: 100%; + padding: 8px 0; + box-sizing: border-box; + overflow: auto; - &:last-child { - margin-bottom: 0; + /* 拆包详情:分区标题 + 带边框描述列表(对齐 stock/external_stock「基本信息」新设计) */ + .section { + margin-bottom: 12px; + + &:last-child { + margin-bottom: 0; + } + } + + .section-title { + font-size: 14px; + font-weight: 600; + color: #303133; + margin-bottom: 10px; + padding-left: 8px; + border-left: 3px solid #409eff; + line-height: 1.4; + } + + .detail-descriptions :deep(.el-descriptions__label) { + width: 110px; + background: #fafbfc; + font-weight: 500; } } @@ -1058,7 +1121,7 @@ onMounted(() => { } .detail-pagination { - margin-top: 10px; + margin-top: 6px; display: flex; justify-content: flex-end; } diff --git a/src/views/message/index.vue b/src/views/message/index.vue index f7af832e..90f7be4e 100644 --- a/src/views/message/index.vue +++ b/src/views/message/index.vue @@ -124,69 +124,116 @@
- - {{ selectedRow.after_sale_no || '—' }} - - - {{ typeLabel(selectedRow.type) }} - - - {{ subTypeLabel(selectedRow.sub_type) }} - {{ selectedRow.title || '—' }} - - - {{ statusLabel(selectedRow.status) }} - - - {{ selectedRow.priority ?? '—' }} - - - {{ roleGroupLabel(selectedRow.role_group) }} - - — - - - - {{ claimStatusLabel(selectedRow.claim_status) }} - - — - - - - {{ claimStatusLabel(selectedRow.carrier_claim_status) }} - - — - - {{ selectedRow.id ?? '—' }} - {{ selectedRow.warehouse_id ?? '—' }} - {{ selectedRow.store_id ?? '—' }} - {{ selectedRow.store_name || '—' }} - {{ selectedRow.creator_id ?? '—' }} - {{ selectedRow.inbox_message_id ?? '—' }} - {{ selectedRow.claim_needed ? '是' : '否' }} - {{ selectedRow.claim_amount ?? '—' }} - {{ selectedRow.carrier_claim_needed ? '是' : '否' }} - {{ selectedRow.carrier_claim_amount ?? '—' }} - {{ selectedRow.description || '—' }} - {{ selectedRow.waybill_no || '—' }} - {{ selectedRow.order_delivery_no || '—' }} - {{ selectedRow.entry_order_no || '—' }} - {{ selectedRow.order_stockout_no || '—' }} - {{ selectedRow.receiving_no || '—' }} - {{ selectedRow.waybill_id ?? '—' }} - {{ selectedRow.order_id ?? '—' }} - {{ selectedRow.entry_order_id ?? '—' }} - {{ selectedRow.order_stockout_id ?? '—' }} - {{ selectedRow.receiving_id ?? '—' }} - {{ selectedRow.created_at || '—' }} - {{ selectedRow.updated_at || '—' }} - {{ selectedRow.started_at || '—' }} - {{ selectedRow.completed_at || '—' }} - {{ selectedRow.deleted_at || '—' }} - {{ selectedRow.resolution || '—' }} - + +
+
工单信息
+ + {{ selectedRow.after_sale_no || '—' }} + + + {{ typeLabel(selectedRow.type) }} + + + {{ subTypeLabel(selectedRow.sub_type) }} + {{ selectedRow.title || '—' }} + + + {{ statusLabel(selectedRow.status) }} + + + {{ selectedRow.priority ?? '—' }} + + + {{ roleGroupLabel(selectedRow.role_group) }} + + — + + {{ selectedRow.id ?? '—' }} + +
+ + +
+
归属信息
+ + {{ selectedRow.warehouse_id ?? '—' }} + {{ selectedRow.store_id ?? '—' }} + {{ selectedRow.store_name || '—' }} + {{ selectedRow.creator_id ?? '—' }} + {{ selectedRow.inbox_message_id ?? '—' }} + +
+ + +
+
理赔信息
+ + + + {{ claimStatusLabel(selectedRow.claim_status) }} + + — + + {{ selectedRow.claim_needed ? '是' : '否' }} + {{ selectedRow.claim_amount ?? '—' }} + + + {{ claimStatusLabel(selectedRow.carrier_claim_status) }} + + — + + {{ selectedRow.carrier_claim_needed ? '是' : '否' }} + {{ selectedRow.carrier_claim_amount ?? '—' }} + +
+ + +
+
关联单据
+ + {{ selectedRow.waybill_no || '—' }} + {{ selectedRow.order_delivery_no || '—' }} + {{ selectedRow.entry_order_no || '—' }} + {{ selectedRow.order_stockout_no || '—' }} + {{ selectedRow.receiving_no || '—' }} + {{ selectedRow.waybill_id ?? '—' }} + {{ selectedRow.order_id ?? '—' }} + {{ selectedRow.entry_order_id ?? '—' }} + {{ selectedRow.order_stockout_id ?? '—' }} + {{ selectedRow.receiving_id ?? '—' }} + +
+ + +
+
时间信息
+ + {{ selectedRow.created_at || '—' }} + {{ selectedRow.updated_at || '—' }} + {{ selectedRow.started_at || '—' }} + {{ selectedRow.completed_at || '—' }} + {{ selectedRow.deleted_at || '—' }} + +
+ + +
+
详细描述
+ + {{ selectedRow.description || '—' }} + +
+ + +
+
处理结果
+ + {{ selectedRow.resolution || '—' }} + +
+
- + 查看完整详情
@@ -610,4 +657,41 @@ onMounted(() => { \ No newline at end of file diff --git a/src/views/mode/components/ColumnCellRenderer.vue b/src/views/mode/components/ColumnCellRenderer.vue index 8aa6b3a8..3a946fdb 100644 --- a/src/views/mode/components/ColumnCellRenderer.vue +++ b/src/views/mode/components/ColumnCellRenderer.vue @@ -2,7 +2,7 @@ ColumnCellRenderer — 通用表格列渲染器 根据传入的 ColumnSlotConfig 决定如何渲染单元格: - - type='tag' → el-tag(支持 tagResolver / tagType 颜色映射) + - type='tag' → 状态文字颜色(ut-status-text,替代 el-tag;支持 tagResolver / tagType 颜色映射) - type='text' → 纯文本(支持 datetime 格式化) - type='default' → 默认插槽渲染 - type='operation' → 操作列(由 OperationCellRenderer 处理) @@ -12,9 +12,9 @@