This commit is contained in:
yin 2026-09-17 18:00:43 +08:00
parent 6f8e1c9ca9
commit 54e1caf8de
14 changed files with 730 additions and 318 deletions

View File

@ -150,6 +150,8 @@
v-if="rows.length > pageSize" v-if="rows.length > pageSize"
class="detail-pagination" class="detail-pagination"
layout="prev, pager, next, total" layout="prev, pager, next, total"
size="small"
background
:current-page="page" :current-page="page"
:page-size="pageSize" :page-size="pageSize"
:total="rows.length" :total="rows.length"

View File

@ -145,58 +145,76 @@
<div v-if="detailActiveTab === 'detail'" class="detail-page detail-scroll"> <div v-if="detailActiveTab === 'detail'" class="detail-page detail-scroll">
<template v-if="detailRecord"> <template v-if="detailRecord">
<!-- 主表信息 --> <!-- 主表信息 -->
<el-descriptions title="拆包单信息" :column="3" border size="small" class="detail-section"> <div class="section">
<el-descriptions-item label="拆包单ID">{{ detailRecord.id ?? '-' }}</el-descriptions-item> <div class="section-title">拆包单信息</div>
<el-descriptions-item label="仓库ID">{{ detailRecord.warehouse_id ?? '-' }}</el-descriptions-item> <el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="拆包单号"> <el-descriptions-item label="拆包单ID">{{ detailRecord.id ?? '-' }}</el-descriptions-item>
<span <el-descriptions-item label="仓库ID">{{ detailRecord.warehouse_id ?? '-' }}</el-descriptions-item>
v-if="detailRecord.unpack_no" <el-descriptions-item label="拆包单号">
class="copyable" <span
role="button" v-if="detailRecord.unpack_no"
title="点击复制" class="copyable"
@click="copyText(detailRecord.unpack_no)" role="button"
>{{ detailRecord.unpack_no }}</span> title="点击复制"
<span v-else>-</span> @click="copyText(detailRecord.unpack_no)"
</el-descriptions-item> >{{ detailRecord.unpack_no }}</span>
<el-descriptions-item label="退回运单号"> <span v-else>-</span>
<span </el-descriptions-item>
v-if="detailRecord.waybill_code" <el-descriptions-item label="退回运单号">
class="copyable" <span
role="button" v-if="detailRecord.waybill_code"
title="点击复制" class="copyable"
@click="copyText(detailRecord.waybill_code)" role="button"
>{{ detailRecord.waybill_code }}</span> title="点击复制"
<span v-else>-</span> @click="copyText(detailRecord.waybill_code)"
</el-descriptions-item> >{{ detailRecord.waybill_code }}</span>
<el-descriptions-item label="拆包状态"> <span v-else>-</span>
<span :class="getStatusTextClass(statusTagType(detailRecord.status))">{{ statusLabel(detailRecord.status) }}</span> </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item label="拆包状态">
<el-descriptions-item label="明细识别状态"> <span :class="getStatusTextClass(statusTagType(detailRecord.status))">{{ statusLabel(detailRecord.status) }}</span>
<span :class="getStatusTextClass(detailStatusTagType(detailRecord.detail_status))">{{ detailStatusLabel(detailRecord.detail_status) }}</span> </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item label="明细识别状态">
<el-descriptions-item label="是否原单退回"> <span :class="getStatusTextClass(detailStatusTagType(detailRecord.detail_status))">{{ detailStatusLabel(detailRecord.detail_status) }}</span>
<span :class="getStatusTextClass(detailRecord.is_original_return ? 'success' : 'info')"> </el-descriptions-item>
{{ detailRecord.is_original_return ? '是' : '否' }} <el-descriptions-item label="是否原单退回">
</span> <span :class="getStatusTextClass(detailRecord.is_original_return ? 'success' : 'info')">
</el-descriptions-item> {{ detailRecord.is_original_return ? '是' : '否' }}
<el-descriptions-item label="物品种类">{{ detailRecord.total_items ?? '-' }}</el-descriptions-item> </span>
<el-descriptions-item label="总数量">{{ detailRecord.total_quantity ?? '-' }}</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="物品种类">{{ detailRecord.total_items ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="总数量">{{ detailRecord.total_quantity ?? '-' }}</el-descriptions-item>
</el-descriptions>
</div>
<!-- 拆包操作 -->
<div class="section">
<div class="section-title">拆包操作</div>
<el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="拆包人员">{{ detailRecord.unpacker_name ?? '-' }}</el-descriptions-item> <el-descriptions-item label="拆包人员">{{ detailRecord.unpacker_name ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="拆包日期">{{ formatTime(detailRecord.unpack_date) }}</el-descriptions-item> <el-descriptions-item label="拆包日期">{{ formatTime(detailRecord.unpack_date) }}</el-descriptions-item>
<el-descriptions-item label="拆包开始时间">{{ formatTime(detailRecord.start_time) }}</el-descriptions-item> <el-descriptions-item label="拆包开始时间">{{ formatTime(detailRecord.start_time) }}</el-descriptions-item>
<el-descriptions-item label="拆包结束时间">{{ formatTime(detailRecord.end_time) }}</el-descriptions-item> <el-descriptions-item label="拆包结束时间">{{ formatTime(detailRecord.end_time) }}</el-descriptions-item>
<el-descriptions-item label="摄像头" :span="2">{{ cameraIdsLabel(detailRecord.camera_ids) }}</el-descriptions-item>
</el-descriptions>
</div>
<!-- 货主与关联单据 -->
<div class="section">
<div class="section-title">货主与关联单据</div>
<el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="货主ID">{{ detailRecord.store_id ?? '-' }}</el-descriptions-item> <el-descriptions-item label="货主ID">{{ detailRecord.store_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="货主名称">{{ detailRecord.shop_name || '-' }}</el-descriptions-item> <el-descriptions-item label="货主名称">{{ detailRecord.shop_name || '-' }}</el-descriptions-item>
<el-descriptions-item label="平台交易单号">{{ detailRecord.source_order_codes || '-' }}</el-descriptions-item> <el-descriptions-item label="平台交易单号">{{ detailRecord.source_order_codes || '-' }}</el-descriptions-item>
<el-descriptions-item label="原运单ID">{{ detailRecord.order_express_id ?? '-' }}</el-descriptions-item> <el-descriptions-item label="原运单ID">{{ detailRecord.order_express_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="原订单ID">{{ detailRecord.order_id ?? '-' }}</el-descriptions-item> <el-descriptions-item label="原订单ID">{{ detailRecord.order_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="关联退回收到单">{{ detailRecord.return_received_id ?? '-' }}</el-descriptions-item> <el-descriptions-item label="关联退回收到单">{{ detailRecord.return_received_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="摄像头" :span="3">{{ cameraIdsLabel(detailRecord.camera_ids) }}</el-descriptions-item>
<el-descriptions-item label="备注" :span="3">{{ detailRecord.remark || '-' }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div>
<!-- 原订单信息 --> <!-- 原订单信息 -->
<el-descriptions v-if="detailOrder" title="原订单信息" :column="3" border size="small" class="detail-section"> <div v-if="detailOrder" class="section">
<div class="section-title">原订单信息</div>
<el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="订单ID">{{ detailOrder.id ?? '-' }}</el-descriptions-item> <el-descriptions-item label="订单ID">{{ detailOrder.id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="订单号">{{ detailOrder.delivery_order_code ?? detailOrder.order_no ?? '-' }}</el-descriptions-item> <el-descriptions-item label="订单号">{{ detailOrder.delivery_order_code ?? detailOrder.order_no ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="货主ID">{{ detailOrder.store_id ?? '-' }}</el-descriptions-item> <el-descriptions-item label="货主ID">{{ detailOrder.store_id ?? '-' }}</el-descriptions-item>
@ -205,10 +223,26 @@
<el-descriptions-item label="收件人">{{ detailOrder.recipient?.name ?? '-' }}</el-descriptions-item> <el-descriptions-item label="收件人">{{ detailOrder.recipient?.name ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="联系电话">{{ detailOrder.recipient?.tel || detailOrder.recipient?.mobile || '-' }}</el-descriptions-item> <el-descriptions-item label="联系电话">{{ detailOrder.recipient?.tel || detailOrder.recipient?.mobile || '-' }}</el-descriptions-item>
<el-descriptions-item label="收货地址" :span="2">{{ detailOrder.recipient?.address ?? '-' }}</el-descriptions-item> <el-descriptions-item label="收货地址" :span="2">{{ detailOrder.recipient?.address ?? '-' }}</el-descriptions-item>
</el-descriptions>
</div>
<!-- 商品与金额 -->
<div v-if="detailOrder" class="section">
<div class="section-title">商品与金额</div>
<el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="商品件数">{{ detailOrder.items_count ?? detailOrder.items?.length ?? '-' }}</el-descriptions-item> <el-descriptions-item label="商品件数">{{ detailOrder.items_count ?? detailOrder.items?.length ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="商品总数">{{ detailOrder.items_total ?? '-' }}</el-descriptions-item> <el-descriptions-item label="商品总数">{{ detailOrder.items_total ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="订单金额">{{ detailOrder.total_amount ?? '-' }}</el-descriptions-item> <el-descriptions-item label="订单金额">{{ detailOrder.total_amount ?? '-' }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div>
<!-- 备注 -->
<div class="section">
<div class="section-title">备注</div>
<el-descriptions :column="1" border size="small" class="detail-descriptions">
<el-descriptions-item label="备注">{{ detailRecord.remark || '-' }}</el-descriptions-item>
</el-descriptions>
</div>
<!-- 原单商品明细 --> <!-- 原单商品明细 -->
<!-- <template v-if="detailOrder?.items?.length"> <!-- <template v-if="detailOrder?.items?.length">
@ -234,7 +268,7 @@
<!-- 拆包录像分页列表 --> <!-- 拆包录像分页列表 -->
<div v-else class="detail-page detail-scroll"> <div v-else class="detail-page detail-scroll">
<div v-loading="videoListLoading" class="detail-list-pane"> <div v-loading="videoListLoading" class="detail-list-pane">
<el-table :data="videoListRows" size="small" border empty-text="暂无录像"> <el-table :data="videoListRows" size="small" border stripe>
<el-table-column prop="id" label="录像ID" width="90" /> <el-table-column prop="id" label="录像ID" width="90" />
<el-table-column label="摄像头" min-width="130" show-overflow-tooltip> <el-table-column label="摄像头" min-width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.camera_name || '-' }}</template> <template #default="{ row }">{{ row.camera_name || '-' }}</template>
@ -252,11 +286,17 @@
<span v-else class="detail-video-unplayable">不可播放</span> <span v-else class="detail-video-unplayable">不可播放</span>
</template> </template>
</el-table-column> </el-table-column>
<template #empty>
<div class="empty-tip">暂无录像</div>
</template>
</el-table> </el-table>
<el-pagination <el-pagination
v-if="videoPagination.total > videoPagination.pageSize" v-if="videoPagination.total > videoPagination.pageSize"
class="detail-pagination" class="detail-pagination"
layout="prev, pager, next, total" layout="prev, pager, next, total"
size="small"
background
:current-page="videoPagination.currentPage" :current-page="videoPagination.currentPage"
:page-size="videoPagination.pageSize" :page-size="videoPagination.pageSize"
:total="videoPagination.total" :total="videoPagination.total"
@ -1016,18 +1056,41 @@ onMounted(() => {
color: #c0c4cc; color: #c0c4cc;
} }
.detail-scroll { /* 详情区外壳与 stock/external_stock 一致:不留上/下间距,左右 10px,
height: 100%; 由各详情页自身 padding 控制上下留白 */
padding: 16px; .order-sub-container .main-content .lower-level .detail-container {
box-sizing: border-box; padding: 0 10px;
overflow: auto;
} }
.detail-section { .detail-scroll {
margin-bottom: 16px; height: 100%;
padding: 8px 0;
box-sizing: border-box;
overflow: auto;
&:last-child { /* 拆包详情:分区标题 + 带边框描述列表(对齐 stock/external_stock「基本信息」新设计) */
margin-bottom: 0; .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 { .detail-pagination {
margin-top: 10px; margin-top: 6px;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }

View File

@ -124,69 +124,116 @@
<div class="detail-container"> <div class="detail-container">
<div v-if="activeTab === 'detail'" class="detail-page"> <div v-if="activeTab === 'detail'" class="detail-page">
<el-descriptions :column="2" border size="small"> <!-- 工单信息 -->
<el-descriptions-item label="工单号">{{ selectedRow.after_sale_no || '—' }}</el-descriptions-item> <div class="section">
<el-descriptions-item label="售后类型"> <div class="section-title">工单信息</div>
<span :class="getStatusTextClass(typeTagType(selectedRow.type))"> <el-descriptions :column="3" border size="small" class="detail-descriptions">
{{ typeLabel(selectedRow.type) }} <el-descriptions-item label="工单号">{{ selectedRow.after_sale_no || '—' }}</el-descriptions-item>
</span> <el-descriptions-item label="售后类型">
</el-descriptions-item> <span :class="getStatusTextClass(typeTagType(selectedRow.type))">
<el-descriptions-item label="子类型">{{ subTypeLabel(selectedRow.sub_type) }}</el-descriptions-item> {{ typeLabel(selectedRow.type) }}
<el-descriptions-item label="标题">{{ selectedRow.title || '—' }}</el-descriptions-item> </span>
<el-descriptions-item label="状态"> </el-descriptions-item>
<span :class="getStatusTextClass(statusTagType(selectedRow.status))"> <el-descriptions-item label="子类型">{{ subTypeLabel(selectedRow.sub_type) }}</el-descriptions-item>
{{ statusLabel(selectedRow.status) }} <el-descriptions-item label="标题" :span="2">{{ selectedRow.title || '—' }}</el-descriptions-item>
</span> <el-descriptions-item label="状态">
</el-descriptions-item> <span :class="getStatusTextClass(statusTagType(selectedRow.status))">
<el-descriptions-item label="优先级">{{ selectedRow.priority ?? '—' }}</el-descriptions-item> {{ statusLabel(selectedRow.status) }}
<el-descriptions-item label="角色组"> </span>
<span v-if="selectedRow.role_group" :class="getStatusTextClass(roleGroupTagType(selectedRow.role_group))"> </el-descriptions-item>
{{ roleGroupLabel(selectedRow.role_group) }} <el-descriptions-item label="优先级">{{ selectedRow.priority ?? '—' }}</el-descriptions-item>
</span> <el-descriptions-item label="角色组">
<span v-else>—</span> <span v-if="selectedRow.role_group" :class="getStatusTextClass(roleGroupTagType(selectedRow.role_group))">
</el-descriptions-item> {{ roleGroupLabel(selectedRow.role_group) }}
<el-descriptions-item label="仓库理赔"> </span>
<span v-if="selectedRow.claim_status" :class="getStatusTextClass(claimStatusTagType(selectedRow.claim_status))"> <span v-else>—</span>
{{ claimStatusLabel(selectedRow.claim_status) }} </el-descriptions-item>
</span> <el-descriptions-item label="工单ID">{{ selectedRow.id ?? '—' }}</el-descriptions-item>
<span v-else>—</span> </el-descriptions>
</el-descriptions-item> </div>
<el-descriptions-item label="运方理赔">
<span v-if="selectedRow.carrier_claim_status" :class="getStatusTextClass(claimStatusTagType(selectedRow.carrier_claim_status))"> <!-- 归属信息 -->
{{ claimStatusLabel(selectedRow.carrier_claim_status) }} <div class="section">
</span> <div class="section-title">归属信息</div>
<span v-else>—</span> <el-descriptions :column="3" border size="small" class="detail-descriptions">
</el-descriptions-item> <el-descriptions-item label="仓库ID">{{ selectedRow.warehouse_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="工单ID">{{ selectedRow.id ?? '—' }}</el-descriptions-item> <el-descriptions-item label="货主ID">{{ selectedRow.store_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="仓库ID">{{ selectedRow.warehouse_id ?? '—' }}</el-descriptions-item> <el-descriptions-item label="货主名称">{{ selectedRow.store_name || '—' }}</el-descriptions-item>
<el-descriptions-item label="货主ID">{{ selectedRow.store_id ?? '—' }}</el-descriptions-item> <el-descriptions-item label="创建人ID">{{ selectedRow.creator_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="货主名称">{{ selectedRow.store_name || '—' }}</el-descriptions-item> <el-descriptions-item label="站内信ID" :span="2">{{ selectedRow.inbox_message_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="创建人ID">{{ selectedRow.creator_id ?? '—' }}</el-descriptions-item> </el-descriptions>
<el-descriptions-item label="站内信ID">{{ selectedRow.inbox_message_id ?? '—' }}</el-descriptions-item> </div>
<el-descriptions-item label="需仓库理赔">{{ selectedRow.claim_needed ? '是' : '否' }}</el-descriptions-item>
<el-descriptions-item label="仓库理赔金额">{{ selectedRow.claim_amount ?? '—' }}</el-descriptions-item> <!-- 理赔信息 -->
<el-descriptions-item label="需运方理赔">{{ selectedRow.carrier_claim_needed ? '是' : '否' }}</el-descriptions-item> <div class="section">
<el-descriptions-item label="运方理赔金额">{{ selectedRow.carrier_claim_amount ?? '—' }}</el-descriptions-item> <div class="section-title">理赔信息</div>
<el-descriptions-item label="详细描述" :span="2">{{ selectedRow.description || '—' }}</el-descriptions-item> <el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="关联运单号">{{ selectedRow.waybill_no || '—' }}</el-descriptions-item> <el-descriptions-item label="仓库理赔">
<el-descriptions-item label="关联发货订单号">{{ selectedRow.order_delivery_no || '—' }}</el-descriptions-item> <span v-if="selectedRow.claim_status" :class="getStatusTextClass(claimStatusTagType(selectedRow.claim_status))">
<el-descriptions-item label="关联入库单号">{{ selectedRow.entry_order_no || '—' }}</el-descriptions-item> {{ claimStatusLabel(selectedRow.claim_status) }}
<el-descriptions-item label="关联出库单号">{{ selectedRow.order_stockout_no || '—' }}</el-descriptions-item> </span>
<el-descriptions-item label="关联收货单号">{{ selectedRow.receiving_no || '—' }}</el-descriptions-item> <span v-else>—</span>
<el-descriptions-item label="运单ID">{{ selectedRow.waybill_id ?? '—' }}</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单ID">{{ selectedRow.order_id ?? '—' }}</el-descriptions-item> <el-descriptions-item label="需仓库理赔">{{ selectedRow.claim_needed ? '是' : '否' }}</el-descriptions-item>
<el-descriptions-item label="入库单ID">{{ selectedRow.entry_order_id ?? '—' }}</el-descriptions-item> <el-descriptions-item label="仓库理赔金额">{{ selectedRow.claim_amount ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="出库单ID">{{ selectedRow.order_stockout_id ?? '—' }}</el-descriptions-item> <el-descriptions-item label="运方理赔">
<el-descriptions-item label="收货单ID">{{ selectedRow.receiving_id ?? '—' }}</el-descriptions-item> <span v-if="selectedRow.carrier_claim_status" :class="getStatusTextClass(claimStatusTagType(selectedRow.carrier_claim_status))">
<el-descriptions-item label="创建时间">{{ selectedRow.created_at || '—' }}</el-descriptions-item> {{ claimStatusLabel(selectedRow.carrier_claim_status) }}
<el-descriptions-item label="更新时间">{{ selectedRow.updated_at || '—' }}</el-descriptions-item> </span>
<el-descriptions-item label="开始时间">{{ selectedRow.started_at || '—' }}</el-descriptions-item> <span v-else>—</span>
<el-descriptions-item label="完成时间">{{ selectedRow.completed_at || '—' }}</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="删除时间">{{ selectedRow.deleted_at || '—' }}</el-descriptions-item> <el-descriptions-item label="需运方理赔">{{ selectedRow.carrier_claim_needed ? '是' : '否' }}</el-descriptions-item>
<el-descriptions-item label="处理结果" :span="2">{{ selectedRow.resolution || '—' }}</el-descriptions-item> <el-descriptions-item label="运方理赔金额">{{ selectedRow.carrier_claim_amount ?? '—' }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div>
<!-- 关联单据 -->
<div class="section">
<div class="section-title">关联单据</div>
<el-descriptions :column="2" border size="small" class="detail-descriptions">
<el-descriptions-item label="关联运单号">{{ selectedRow.waybill_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联发货订单号">{{ selectedRow.order_delivery_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联入库单号">{{ selectedRow.entry_order_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联出库单号">{{ selectedRow.order_stockout_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联收货单号">{{ selectedRow.receiving_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="运单ID">{{ selectedRow.waybill_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="订单ID">{{ selectedRow.order_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="入库单ID">{{ selectedRow.entry_order_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="出库单ID">{{ selectedRow.order_stockout_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="收货单ID">{{ selectedRow.receiving_id ?? '—' }}</el-descriptions-item>
</el-descriptions>
</div>
<!-- 时间信息 -->
<div class="section">
<div class="section-title">时间信息</div>
<el-descriptions :column="2" border size="small" class="detail-descriptions">
<el-descriptions-item label="创建时间">{{ selectedRow.created_at || '—' }}</el-descriptions-item>
<el-descriptions-item label="更新时间">{{ selectedRow.updated_at || '—' }}</el-descriptions-item>
<el-descriptions-item label="开始时间">{{ selectedRow.started_at || '—' }}</el-descriptions-item>
<el-descriptions-item label="完成时间">{{ selectedRow.completed_at || '—' }}</el-descriptions-item>
<el-descriptions-item label="删除时间" :span="2">{{ selectedRow.deleted_at || '—' }}</el-descriptions-item>
</el-descriptions>
</div>
<!-- 详细描述 -->
<div class="section">
<div class="section-title">详细描述</div>
<el-descriptions :column="1" border size="small" class="detail-descriptions">
<el-descriptions-item label="详细描述">{{ selectedRow.description || '—' }}</el-descriptions-item>
</el-descriptions>
</div>
<!-- 处理结果 -->
<div class="section">
<div class="section-title">处理结果</div>
<el-descriptions :column="1" border size="small" class="detail-descriptions">
<el-descriptions-item label="处理结果">{{ selectedRow.resolution || '—' }}</el-descriptions-item>
</el-descriptions>
</div>
<div class="detail-actions" style="margin-top:12px"> <div class="detail-actions" style="margin-top:12px">
<el-button size="small" type="primary" @click.stop="handleViewDetail(selectedRow)"> <el-button size="small" type="primary" plain @click.stop="handleViewDetail(selectedRow)">
查看完整详情 查看完整详情
</el-button> </el-button>
</div> </div>
@ -610,4 +657,41 @@ onMounted(() => {
<style scoped lang="scss"> <style scoped lang="scss">
@use "../order/orderManagement/styles/order-sub.scss"; @use "../order/orderManagement/styles/order-sub.scss";
/* 详情区外壳与 stock/external_stock 一致:不留上/下间距,左右 10px,
面板自身 padding: 6px 10px 8px(合计内容缩进 20px) */
.order-sub-container .main-content .lower-level .detail-container {
padding: 0 10px;
overflow: auto;
}
/* 工单详情面板:分区标题 + 带边框描述列表(对齐 stock/external_stock「基本信息」) */
.detail-page {
padding: 6px 10px 8px;
box-sizing: border-box;
.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: 120px;
background: #fafbfc;
font-weight: 500;
}
}
</style> </style>

View File

@ -2,7 +2,7 @@
ColumnCellRenderer — 通用表格列渲染器 ColumnCellRenderer — 通用表格列渲染器
根据传入的 ColumnSlotConfig 决定如何渲染单元格: 根据传入的 ColumnSlotConfig 决定如何渲染单元格:
- type='tag' → el-tag(支持 tagResolver / tagType 颜色映射) - type='tag' → 状态文字颜色(ut-status-text,替代 el-tag;支持 tagResolver / tagType 颜色映射)
- type='text' → 纯文本(支持 datetime 格式化) - type='text' → 纯文本(支持 datetime 格式化)
- type='default' → 默认插槽渲染 - type='default' → 默认插槽渲染
- type='operation' → 操作列(由 OperationCellRenderer 处理) - type='operation' → 操作列(由 OperationCellRenderer 处理)
@ -12,9 +12,9 @@
<slot /> <slot />
</template> </template>
<template v-else-if="config.type === 'tag'"> <template v-else-if="config.type === 'tag'">
<el-tag size="small" :type="resolvedTagType"> <span :class="getStatusTextClass(resolvedTagType)">
{{ displayValue }} {{ displayValue }}
</el-tag> </span>
</template> </template>
<template v-else> <template v-else>
<span>{{ displayValue }}</span> <span>{{ displayValue }}</span>
@ -25,6 +25,7 @@
import { computed } from 'vue' import { computed } from 'vue'
import type { ColumnSlotConfig } from '../config/template-config' import type { ColumnSlotConfig } from '../config/template-config'
import { TAG_RESOLVERS, translate, formatTime } from '../config/template-config' import { TAG_RESOLVERS, translate, formatTime } from '../config/template-config'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
defineOptions({ name: 'ColumnCellRenderer' }) defineOptions({ name: 'ColumnCellRenderer' })
@ -63,3 +64,8 @@ const resolvedTagType = computed(() => {
}) })
</script> </script>
<style lang="scss" scoped>
/* ut-status-text 系列状态文字颜色类定义在 order-sub.scss 里(scoped 样式需要本组件自行引入) */
@use "../../order/orderManagement/styles/order-sub.scss";
</style>

View File

@ -19,11 +19,11 @@
:label="field.label" :label="field.label"
:span="field.span ?? 1" :span="field.span ?? 1"
> >
<!-- tag 渲染 --> <!-- 状态文字颜色(ut-status-text,替代 el-tag) -->
<template v-if="field.renderType === 'tag'"> <template v-if="field.renderType === 'tag'">
<el-tag size="small" :type="resolveTagType(field, getRowData()?.[field.key])"> <span :class="getStatusTextClass(resolveTagType(field, getRowData()?.[field.key]))">
{{ resolveDisplayValue(field, getRowData()?.[field.key]) }} {{ resolveDisplayValue(field, getRowData()?.[field.key]) }}
</el-tag> </span>
</template> </template>
<!-- pre 渲染 --> <!-- pre 渲染 -->
<template v-else-if="field.renderType === 'pre'"> <template v-else-if="field.renderType === 'pre'">
@ -44,6 +44,7 @@
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import { TAG_RESOLVERS, translate } from '../template-config' import { TAG_RESOLVERS, translate } from '../template-config'
import type { DetailSectionConfig, DetailFieldConfig } from '../template-config' import type { DetailSectionConfig, DetailFieldConfig } from '../template-config'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
defineOptions({ name: 'DetailPanel' }) defineOptions({ name: 'DetailPanel' })
@ -125,12 +126,16 @@ function resolveTagType(field: DetailFieldConfig, value: any): string {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/* 容器对齐 order/orderManagement 的 OrderDetailPanel(.order-detail-view) */ /* ut-status-text 系列状态文字颜色类定义在 order-sub.scss 里(scoped 样式需要本组件自行引入) */
@use "../../../order/orderManagement/styles/order-sub.scss";
/* 面板自带内边距 8px 0(左右由宿主 .detail-container 的 padding: 0 10px 提供),
合计内容缩进 10px,对齐 express/waybill 的 DetailPanel / stock/external_stock「基本信息」 */
.detail-panel { .detail-panel {
flex: 1; flex: 1;
min-height: 0; min-height: 0;
padding: 10px;
height: 100%; height: 100%;
padding: 8px 0;
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
} }

View File

@ -7,15 +7,30 @@
--> -->
<template> <template>
<div class="log-panel"> <div class="log-panel">
<div v-if="apiLoading" v-loading="true" class="log-empty">加载中…</div> <!-- 按钮行(间距 6px 对齐 toolbar),对齐 stock/external_stock 面板新样式 -->
<template v-else> <div class="header-actions">
<div class="left-actions">
<el-button
size="small"
type="primary"
:loading="apiLoading"
:disabled="!row || !apiMethod"
@click="loadLogs"
>
刷新
</el-button>
</div>
</div>
<div ref="tableHostRef" class="table-host">
<el-table <el-table
v-if="logs.length" ref="tableRef"
:data="pagedLogs" :data="pagedLogs"
border border
stripe stripe
size="small" size="small"
height="100%" :height="tableHeight"
v-loading="apiLoading"
class="log-table" class="log-table"
> >
<el-table-column prop="time" label="时间" width="175" /> <el-table-column prop="time" label="时间" width="175" />
@ -23,31 +38,36 @@
<el-table-column prop="action" label="操作类型" min-width="180" show-overflow-tooltip /> <el-table-column prop="action" label="操作类型" min-width="180" show-overflow-tooltip />
<el-table-column label="结果" width="90" align="center"> <el-table-column label="结果" width="90" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-tag size="small" :type="resultTagType(row)">{{ row.result }}</el-tag> <span :class="getStatusTextClass(resultTagType(row))">{{ row.result }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="说明" min-width="220" show-overflow-tooltip> <el-table-column label="说明" min-width="220" show-overflow-tooltip>
<template #default="{ row }">{{ row.detail || '—' }}</template> <template #default="{ row }">{{ row.detail || '—' }}</template>
</el-table-column> </el-table-column>
</el-table>
<div v-else class="log-empty">暂无操作日志</div>
<div v-if="logs.length > pageSize" class="log-pagination"> <template #empty>
<el-pagination <div class="empty-tip">暂无操作日志</div>
v-model:current-page="currentPage" </template>
:page-size="pageSize" </el-table>
:total="logs.length" </div>
layout="total, prev, pager, next"
background <div v-if="logs.length > pageSize" class="pagination-container">
size="small" <el-pagination
/> v-model:current-page="currentPage"
</div> :page-size="pageSize"
</template> :total="logs.length"
layout="total, prev, pager, next"
background
size="small"
/>
</div>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { computed, ref, watch } from 'vue' import { computed, nextTick, ref, watch } from 'vue'
import { useResizeObserver } from '@vueuse/core'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
defineOptions({ name: 'LogPanel' }) defineOptions({ name: 'LogPanel' })
@ -71,7 +91,26 @@ const props = defineProps<{
const apiLogs = ref<LogItem[] | null>(null) const apiLogs = ref<LogItem[] | null>(null)
const apiLoading = ref(false) const apiLoading = ref(false)
/** 表格本地分页(对齐 order/orderManagement 的 log.vue 体验) */ /** 表格自适应高度:容器 ref + 测高(不要给 el-table 写 height="100%",EP parseHeight('100%') → NaN) */
const tableRef = ref<any>(null)
const tableHostRef = ref<HTMLElement | null>(null)
const tableHeight = ref(280)
useResizeObserver(tableHostRef, (entries) => {
const h = entries[0]?.contentRect.height ?? 0
if (h >= 100) {
tableHeight.value = Math.floor(h)
}
})
/** 切页后把表格滚动位置归零 */
function resetTableScroll() {
nextTick(() => {
tableRef.value?.setScrollTop?.(0)
})
}
/** 表格本地分页(对齐 storage/receiving「操作日志」体验) */
const currentPage = ref(1) const currentPage = ref(1)
const pageSize = 10 const pageSize = 10
const pagedLogs = computed<LogItem[]>(() => { const pagedLogs = computed<LogItem[]>(() => {
@ -79,13 +118,21 @@ const pagedLogs = computed<LogItem[]>(() => {
return logs.value.slice(start, start + pageSize) return logs.value.slice(start, start + pageSize)
}) })
watch(currentPage, resetTableScroll)
function resultTagType(row: LogItem): string { function resultTagType(row: LogItem): string {
if (row.result === '成功') return 'success' if (row.result === '成功') return 'success'
if (row.result === '失败') return 'danger' if (row.result === '失败') return 'danger'
return 'info' return 'info'
} }
watch(() => props.row, async (newRow) => { watch(() => props.row, () => {
void loadLogs()
}, { immediate: true })
/** 拉取日志(按钮「刷新」也走这个函数) */
async function loadLogs() {
const newRow = props.row
currentPage.value = 1 currentPage.value = 1
if (newRow && props.apiMethod) { if (newRow && props.apiMethod) {
apiLoading.value = true apiLoading.value = true
@ -119,7 +166,7 @@ watch(() => props.row, async (newRow) => {
} else { } else {
apiLogs.value = null apiLogs.value = null
} }
}, { immediate: true }) }
/** 基于 row 生成模拟日志(无 apiMethod 时使用) */ /** 基于 row 生成模拟日志(无 apiMethod 时使用) */
const mockLogs = computed<LogItem[]>(() => { const mockLogs = computed<LogItem[]>(() => {
@ -157,38 +204,70 @@ const logs = computed<LogItem[]>(() => {
} }
return mockLogs.value return mockLogs.value
}) })
/** 数据变化后页码超出范围时回退到最后一页(必须放在 logs 声明之后,否则 setup 阶段 TDZ 报错) */
watch(logs, (list) => {
const maxPage = Math.max(1, Math.ceil(list.length / pageSize))
if (currentPage.value > maxPage) currentPage.value = maxPage
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/* 对齐 order/orderManagement 的 log.vue(el-table 表格 + 本地分页) */ /* ut-status-text 系列状态文字颜色类定义在 order-sub.scss 里(scoped 样式需要本组件自行引入) */
@use "../../../order/orderManagement/styles/order-sub.scss";
/* 日志面板:按钮行 + 自适应高度表格 + 右对齐分页(对齐 stock/external_stock 面板列表新样式) */
.log-panel { .log-panel {
flex: 1; flex: 1;
min-height: 0; min-height: 0;
padding: 10px; width: 100%;
height: 100%; height: 100%;
padding: 8px 0;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden;
} }
.log-table { .header-actions {
flex: 1; display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 6px;
flex-shrink: 0;
gap: 4px;
flex-wrap: wrap;
} }
.log-empty { .left-actions {
flex: 1;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; gap: 6px;
font-size: 13px;
color: #909399; /* 清除 Element Plus 默认按钮左边距,统一由 gap 控制间距 */
padding: 40px 0; :deep(.el-button) {
margin-left: 0;
margin-right: 0;
}
} }
.log-pagination { .table-host {
flex: 1;
min-height: 120px;
min-width: 0;
overflow: hidden;
}
.pagination-container {
flex-shrink: 0; flex-shrink: 0;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
padding-top: 10px; align-items: center;
margin-top: 6px;
}
.empty-tip {
color: #909399;
font-size: 13px;
} }
</style> </style>

View File

@ -5,7 +5,7 @@
* *
* 1. FIELD_DICT — 全局字段预设表,每个字段拥有唯一翻译(label)和完整元数据 * 1. FIELD_DICT — 全局字段预设表,每个字段拥有唯一翻译(label)和完整元数据
* 2. VALUE_MAPS — 值翻译映射表(select options 和 tag 翻译共用) * 2. VALUE_MAPS — 值翻译映射表(select options 和 tag 翻译共用)
* 3. TAG_RESOLVERS — 标签颜色解析器(集中管理 tag 颜色逻辑) * 3. TAG_RESOLVERS — 状态文字颜色解析器(集中管理 ut-status-text 颜色逻辑,比 el-tag 轻量)
* 4. 各标签页通过 key 引用所需字段(scanBoxFieldKeys / tableColumnKeys) * 4. 各标签页通过 key 引用所需字段(scanBoxFieldKeys / tableColumnKeys)
* 5. resolveTabConfig() — 加载时将 key 列表展开为完整配置 * 5. resolveTabConfig() — 加载时将 key 列表展开为完整配置
* *
@ -145,7 +145,7 @@ export function formatTime(value: any): string {
} }
// ============================================================ // ============================================================
// TAG_RESOLVERS — 标签颜色解析器 // TAG_RESOLVERS — 状态文字颜色解析器
// ============================================================ // ============================================================
// 颜色规则:未xx=info(灰) 已xx=success(绿) xx中/部分xx=warning(黄) 错误=danger(红) // 颜色规则:未xx=info(灰) 已xx=success(绿) xx中/部分xx=warning(黄) 错误=danger(红)
export const TAG_RESOLVERS: Record<string, (val: any) => string> = { export const TAG_RESOLVERS: Record<string, (val: any) => string> = {

View File

@ -633,6 +633,12 @@ onMounted(() => {
/* 布局样式对齐 order/orderManagement(order-sub.scss) */ /* 布局样式对齐 order/orderManagement(order-sub.scss) */
@use "../order/orderManagement/styles/order-sub.scss"; @use "../order/orderManagement/styles/order-sub.scss";
/* 详情区外壳与 stock/external_stock 一致:不留上/下间距,左右 10px,
由各详情面板自身 padding 控制上下留白 */
.order-sub-container .main-content .lower-level .detail-container {
padding: 0 10px;
}
/* ================================================================ /* ================================================================
整体布局 整体布局
================================================================ */ ================================================================ */

View File

@ -518,6 +518,7 @@ export const ORDER_TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
updateRemark: { key: 'updateRemark', label: '修改留言', size: 'small', category: 'action', loadingKey: 'updateRemarkLoading', disabledKey: 'hasNoSelection', action: 'openUpdateRemarkDialog' }, updateRemark: { key: 'updateRemark', label: '修改留言', size: 'small', category: 'action', loadingKey: 'updateRemarkLoading', disabledKey: 'hasNoSelection', action: 'openUpdateRemarkDialog' },
cloneOrder: { key: 'cloneOrder', label: '克隆订单', size: 'small', category: 'action', loadingKey: 'cloneOrderLoading', disabledKey: 'notSingleSelection', action: 'openCloneOrderDialog' }, cloneOrder: { key: 'cloneOrder', label: '克隆订单', size: 'small', category: 'action', loadingKey: 'cloneOrderLoading', disabledKey: 'notSingleSelection', action: 'openCloneOrderDialog' },
syncOrderIds: { key: 'syncOrderIds', label: '同步订单', size: 'small', category: 'action', loadingKey: 'syncOrderIdsLoading', disabledKey: 'hasNoSelection', action: 'openSyncOrderIdsDialog' }, syncOrderIds: { key: 'syncOrderIds', label: '同步订单', size: 'small', category: 'action', loadingKey: 'syncOrderIdsLoading', disabledKey: 'hasNoSelection', action: 'openSyncOrderIdsDialog' },
removeFromWave: { key: 'removeFromWave', label: '移出波次', size: 'small', category: 'cancel', loadingKey: 'removeFromWaveLoading', disabledKey: 'hasNoSelection', action: 'handleRemoveOrdersFromWave' },
cancelOrder: { key: 'cancelOrder', label: '取消订单', size: 'small', category: 'cancel', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleCancelOrder' }, cancelOrder: { key: 'cancelOrder', label: '取消订单', size: 'small', category: 'cancel', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleCancelOrder' },
batchIntercept: { key: 'batchIntercept', label: '批量拦截', size: 'small', category: 'cancel', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchIntercept' }, batchIntercept: { key: 'batchIntercept', label: '批量拦截', size: 'small', category: 'cancel', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchIntercept' },
batchUnintercept: { key: 'batchUnintercept', label: '解除拦截', size: 'small', category: 'action', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchUnintercept' }, batchUnintercept: { key: 'batchUnintercept', label: '解除拦截', size: 'small', category: 'action', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchUnintercept' },

View File

@ -246,7 +246,7 @@
<el-dialog <el-dialog
v-model="groupOrderDialogVisible" v-model="groupOrderDialogVisible"
title="抓取团购单" title="抓取团购单"
width="1280px" width="min(1280px, 94vw)"
class="wave-fixed-height-dialog" class="wave-fixed-height-dialog"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@ -259,7 +259,6 @@
placeholder="全部" placeholder="全部"
clearable clearable
filterable filterable
style="width: 180px"
@change="handleGroupOrderFilterChange" @change="handleGroupOrderFilterChange"
> >
<el-option <el-option
@ -275,7 +274,6 @@
v-model="groupOrderFilters.sameOrderQuantity" v-model="groupOrderFilters.sameOrderQuantity"
:min="1" :min="1"
:controls="false" :controls="false"
style="width: 150px"
@change="handleGroupOrderFilterChange" @change="handleGroupOrderFilterChange"
/> />
</el-form-item> </el-form-item>
@ -284,7 +282,6 @@
v-model="groupOrderFilters.shopName" v-model="groupOrderFilters.shopName"
clearable clearable
placeholder="模糊匹配店铺名称" placeholder="模糊匹配店铺名称"
style="width: 180px"
@keyup.enter="fetchGroupOrderList" @keyup.enter="fetchGroupOrderList"
/> />
</el-form-item> </el-form-item>
@ -293,90 +290,89 @@
v-model="groupOrderFilters.includeSku" v-model="groupOrderFilters.includeSku"
clearable clearable
placeholder="仅保留包含该 SKU 的分组" placeholder="仅保留包含该 SKU 的分组"
style="width: 180px"
@keyup.enter="fetchGroupOrderList" @keyup.enter="fetchGroupOrderList"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item label="区分快递" class="group-order-filters__switch">
<el-switch <el-switch
v-model="groupOrderFilters.distinguishExpress" v-model="groupOrderFilters.distinguishExpress"
active-text="区分快递"
inactive-text="不区分快递"
@change="handleGroupOrderFilterChange" @change="handleGroupOrderFilterChange"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item class="group-order-filters__actions">
<el-button type="primary" :loading="groupOrderListLoading" @click="fetchGroupOrderList">查询</el-button> <el-button type="primary" :loading="groupOrderListLoading" @click="fetchGroupOrderList">查询</el-button>
<el-button @click="resetGroupOrderFilters">重置</el-button> <el-button @click="resetGroupOrderFilters">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="group-order-toolbar"> <div class="group-order-toolbar group-order-toolbar--end">
<div class="group-order-toolbar__left">
<span>已选 {{ groupOrderSelectionRows.length }} 个结构</span>
</div>
<el-checkbox v-model="groupOrderFilters.returnOrderIds">返回订单 ID 列表</el-checkbox> <el-checkbox v-model="groupOrderFilters.returnOrderIds">返回订单 ID 列表</el-checkbox>
</div> </div>
<el-table <div ref="groupOrderTableHostRef" class="group-order-table-host">
ref="groupOrderTableRef" <el-table
:data="groupOrderList" ref="groupOrderTableRef"
v-loading="groupOrderListLoading" :data="groupOrderList"
border v-loading="groupOrderListLoading"
size="small" border
row-key="item_detail_machine" size="small"
max-height="460" row-key="item_detail_machine"
@selection-change="handleGroupOrderSelectionChange" :height="groupOrderTableHeight"
> @selection-change="handleGroupOrderSelectionChange"
<el-table-column type="selection" width="48" reserve-selection /> >
<el-table-column prop="item_detail" label="商品结构" min-width="260" show-overflow-tooltip /> <el-table-column type="selection" width="48" reserve-selection />
<el-table-column prop="logistics_name" label="快递" min-width="130" show-overflow-tooltip /> <el-table-column prop="item_detail" label="商品结构" min-width="260" show-overflow-tooltip />
<el-table-column prop="group_count" label="同组订单数" min-width="100" align="right" /> <el-table-column prop="logistics_name" label="快递" min-width="130" show-overflow-tooltip />
<el-table-column prop="items_total" label="商品总数" min-width="100" align="right" /> <el-table-column prop="group_count" label="同组订单数" min-width="100" align="right" />
<el-table-column label="货主" min-width="110"> <el-table-column prop="items_total" label="商品总数" min-width="100" align="right" />
<template #default="{ row }"> <el-table-column label="货主" min-width="110">
{{ getGroupOrderStoreText(row) }} <template #default="{ row }">
</template> {{ getGroupOrderStoreText(row) }}
</el-table-column> </template>
<el-table-column label="状态汇总" min-width="240"> </el-table-column>
<template #default="{ row }"> <el-table-column label="状态汇总" min-width="240">
<span class="status-summary-text">{{ getGroupOrderStatusSummary(row) }}</span> <template #default="{ row }">
</template> <span class="status-summary-text">{{ getGroupOrderStatusSummary(row) }}</span>
</el-table-column> </template>
<el-table-column label="商品快照" min-width="280"> </el-table-column>
<template #default="{ row }"> <el-table-column label="商品快照" min-width="280">
<span class="order-info-text">{{ getGroupOrderItemSnapshotText(row) }}</span> <template #default="{ row }">
</template> <span class="order-info-text">{{ getGroupOrderItemSnapshotText(row) }}</span>
</el-table-column> </template>
<!-- <el-table-column label="抓取数量" width="120" align="center"> </el-table-column>
<template #default="{ row }"> <!-- <el-table-column label="抓取数量" width="120" align="center">
<el-input-number <template #default="{ row }">
:model-value="groupOrderQuantityMap[row.item_detail_machine]" <el-input-number
:min="1" :model-value="groupOrderQuantityMap[row.item_detail_machine]"
:controls="false" :min="1"
placeholder="默认" :controls="false"
style="width: 92px" placeholder="默认"
@change="(value: number | undefined) => updateGroupOrderQuantity(row, value)" style="width: 92px"
/> @change="(value: number | undefined) => updateGroupOrderQuantity(row, value)"
</template> />
</el-table-column> --> </template>
<el-table-column label="首单时间" min-width="168"> </el-table-column> -->
<template #default="{ row }"> <el-table-column label="首单时间" min-width="168">
{{ formatDateTime(row.first_order_time) }} <template #default="{ row }">
</template> {{ formatDateTime(row.first_order_time) }}
</el-table-column> </template>
<el-table-column label="末单时间" min-width="168"> </el-table-column>
<template #default="{ row }"> <el-table-column label="末单时间" min-width="168">
{{ formatDateTime(row.last_order_time) }} <template #default="{ row }">
</template> {{ formatDateTime(row.last_order_time) }}
</el-table-column> </template>
</el-table-column>
<template #empty> <template #empty>
<div class="empty-tip">暂无可抓取的团购单结构</div> <div class="empty-tip">暂无可抓取的团购单结构</div>
</template> </template>
</el-table> </el-table>
</div>
<div class="group-order-pagination"> <div class="group-order-pagination">
<div class="group-order-pagination__info">
<span>已选 {{ groupOrderSelectionRows.length }} 个结构</span>
</div>
<el-pagination <el-pagination
v-model:current-page="groupOrderPagination.currentPage" v-model:current-page="groupOrderPagination.currentPage"
v-model:page-size="groupOrderPagination.pageSize" v-model:page-size="groupOrderPagination.pageSize"
@ -875,7 +871,8 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { KeepAlive, computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue' import { KeepAlive, computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
import { useResizeObserver } from '@vueuse/core'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue' import ScanBox from '@/components/ScanBox/index.vue'
@ -1005,6 +1002,17 @@ const router = useRouter()
const scanBox = ref<any>(null) const scanBox = ref<any>(null)
const upperTable = ref<any>(null) const upperTable = ref<any>(null)
const groupOrderTableRef = ref<any>(null) const groupOrderTableRef = ref<any>(null)
const groupOrderTableHostRef = ref<HTMLElement | null>(null)
const groupOrderTableHeight = ref(320)
/** 表格高度跟随宿主容器(弹窗剩余高度),不要给 el-table 写 height="100%" */
useResizeObserver(groupOrderTableHostRef, (entries) => {
const h = entries[0]?.contentRect.height ?? 0
if (h >= 120) {
groupOrderTableHeight.value = Math.floor(h)
}
})
const loading = ref(false) const loading = ref(false)
const showInternalSourceWaves = ref(false) const showInternalSourceWaves = ref(false)
const onlyTodoWaves = ref(false) const onlyTodoWaves = ref(false)
@ -1038,6 +1046,19 @@ const selectedRow = ref<any>(null)
const selectionRows = ref<any[]>([]) const selectionRows = ref<any[]>([])
const hasSelection = ref(false) const hasSelection = ref(false)
const groupOrderDialogVisible = ref(false) const groupOrderDialogVisible = ref(false)
/** 打开弹窗后兜底取一次高度(ResizeObserver 首帧未回调时不留空白) */
watch(groupOrderDialogVisible, async (visible) => {
if (!visible) return
await nextTick()
requestAnimationFrame(() => {
const h = groupOrderTableHostRef.value?.clientHeight ?? 0
if (h >= 120) {
groupOrderTableHeight.value = Math.floor(h)
}
})
})
const groupOrderListLoading = ref(false) const groupOrderListLoading = ref(false)
const groupOrderSubmitting = ref(false) const groupOrderSubmitting = ref(false)
const groupOrderList = ref<any[]>([]) const groupOrderList = ref<any[]>([])
@ -4046,7 +4067,17 @@ async function submitFallbackOrderFetchByIds() {
.group-order-dialog { .group-order-dialog {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 10px; gap: 8px;
height: 100%;
min-height: 0;
}
/* 表格区填满弹窗剩余高度,避免分页器与底部按钮之间出现空白 */
.group-order-table-host {
flex: 1;
min-height: 120px;
min-width: 0;
overflow: hidden;
} }
.toolbar-switch-label { .toolbar-switch-label {
@ -4141,22 +4172,83 @@ async function submitFallbackOrderFetchByIds() {
height: 100%; height: 100%;
} }
/* 抓取团购单:筛选条——单行排列,标签等宽 + 控件等宽,右侧跟随开关与按钮 */
.group-order-filters { .group-order-filters {
padding: 4px 0 0; display: flex;
flex-wrap: wrap;
align-items: center;
gap: 6px 12px;
:deep(.el-form-item) {
flex: 1 1 200px;
min-width: 208px;
margin: 0;
align-items: center;
}
:deep(.el-form-item__label) {
flex: 0 0 96px;
padding: 0 4px 0 0;
white-space: nowrap;
color: var(--el-text-color-regular);
}
:deep(.el-select),
:deep(.el-input),
:deep(.el-input-number) {
width: 100%;
}
/* 开关 + 查询/重置:按内容宽度,不参与列等分 */
:deep(.el-form-item.group-order-filters__switch),
:deep(.el-form-item.group-order-filters__actions) {
flex: 0 0 auto;
min-width: 0;
}
:deep(.group-order-filters__switch .el-form-item__content),
:deep(.group-order-filters__actions .el-form-item__content) {
flex: 0 0 auto;
flex-wrap: nowrap;
gap: 8px;
}
:deep(.group-order-filters__actions .el-button) {
margin: 0;
}
} }
.group-order-toolbar { .group-order-toolbar {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
gap: 12px;
font-size: 13px; font-size: 13px;
color: #606266; color: #606266;
} }
/* 只放右侧选项时(左侧内容已移到底部行) */
.group-order-toolbar--end {
justify-content: flex-end;
}
.group-order-pagination { .group-order-pagination {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
padding-top: 4px; align-items: center;
flex-shrink: 0;
gap: 12px;
/* 左侧计数,右侧分页器 */
&__info {
display: flex;
align-items: center;
gap: 12px;
margin-right: auto;
font-size: 13px;
color: #606266;
white-space: nowrap;
}
} }
.status-summary-text { .status-summary-text {

View File

@ -17,16 +17,6 @@
<div class="pending-order-panel__toolbar"> <div class="pending-order-panel__toolbar">
<div class="pending-order-panel__toolbar-left"> <div class="pending-order-panel__toolbar-left">
<span class="pending-order-panel__wave">当前波次:{{ waveNo }}</span> <span class="pending-order-panel__wave">当前波次:{{ waveNo }}</span>
<el-button
size="small"
type="danger"
plain
:disabled="!hasSelection"
:loading="removeFromWaveLoading"
@click="handleRemoveOrdersFromWave"
>
移出波次
</el-button>
<order-toolbar-button-group <order-toolbar-button-group
:buttons="toolbarButtons" :buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled" :resolve-disabled="resolveButtonDisabled"
@ -221,7 +211,7 @@ const availableFieldsRef = reactive(
) )
) )
) )
const toolbarButtons = pickToolbarButtons(['refresh', 'columnConfig', 'allocateStorage', 'allocateExpress', 'manualWaybill', 'syncOrderIds']) const toolbarButtons = pickToolbarButtons(['refresh', 'columnConfig', 'allocateStorage', 'allocateExpress', 'manualWaybill', 'syncOrderIds', 'removeFromWave'])
const list = ref<any[]>([]) const list = ref<any[]>([])
const loading = ref(false) const loading = ref(false)
@ -441,7 +431,8 @@ function resolveButtonLoading(loadingKey?: string) {
storageAllocateLoading: storageAllocateLoading.value, storageAllocateLoading: storageAllocateLoading.value,
allocateLoading: allocateLoading.value, allocateLoading: allocateLoading.value,
syncOrderIdsLoading: syncOrderIdsLoading.value, syncOrderIdsLoading: syncOrderIdsLoading.value,
manualWaybillLoading: manualWaybillLoading.value manualWaybillLoading: manualWaybillLoading.value,
removeFromWaveLoading: removeFromWaveLoading.value
} }
return Boolean(loadingMap[loadingKey]) return Boolean(loadingMap[loadingKey])
} }
@ -471,12 +462,18 @@ const toolbarLayoutKey = computed(() =>
storageAllocateLoading: storageAllocateLoading.value, storageAllocateLoading: storageAllocateLoading.value,
allocateLoading: allocateLoading.value, allocateLoading: allocateLoading.value,
syncOrderIdsLoading: syncOrderIdsLoading.value, syncOrderIdsLoading: syncOrderIdsLoading.value,
manualWaybillLoading: manualWaybillLoading.value manualWaybillLoading: manualWaybillLoading.value,
removeFromWaveLoading: removeFromWaveLoading.value
} }
}) })
) )
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
// 「移出波次」是本面板自有逻辑,未接入公共 pending 控制器
if (action === 'handleRemoveOrdersFromWave') {
void handleRemoveOrdersFromWave()
return
}
const handler = actionMap[action] const handler = actionMap[action]
if (!handler) return if (!handler) return
void handler() void handler()

View File

@ -137,44 +137,61 @@
</div> </div>
<div class="detail-container"> <div class="detail-container">
<el-descriptions v-if="activeTab === 'details'" :column="2" border size="small"> <div v-if="activeTab === 'details'" class="detail-panel">
<el-descriptions-item label="签约ID">{{ selectedRow.id }}</el-descriptions-item> <!-- 签约主体 -->
<el-descriptions-item label="签约状态"> <div class="section">
<span :class="getStatusTextClass(getAuthStatusType(selectedRow.auth_status))"> <div class="section-title">签约主体</div>
{{ selectedRow.auth_status_label || getAuthStatusLabel(selectedRow.auth_status) }} <el-descriptions :column="2" border size="small" class="detail-descriptions">
</span> <el-descriptions-item v-if="currentSubject.company_name" label="当前仓库">
</el-descriptions-item> {{ currentSubject.company_name }}
<el-descriptions-item label="签约货主"> <el-tag size="small" type="primary" effect="plain" style="margin-left:6px">仓库方</el-tag>
{{ selectedRow.remask || selectedRow.counterparty_name || '—' }} </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item label="签约货主" :span="currentSubject.company_name ? 1 : 2">
<el-descriptions-item v-if="currentSubject.company_name" label="当前仓库"> {{ selectedRow.remask || selectedRow.counterparty_name || '—' }}
{{ currentSubject.company_name }} </el-descriptions-item>
<el-tag size="small" type="primary" effect="plain" style="margin-left:6px">仓库方</el-tag> <el-descriptions-item
</el-descriptions-item> v-if="selectedRow.counterparty_name && selectedRow.remask"
<el-descriptions-item label="货主ID">{{ selectedRow.store_id ?? '—' }}</el-descriptions-item> label="货主全称"
<el-descriptions-item label="仓库ID">{{ selectedRow.warehouse_id ?? '—' }}</el-descriptions-item> :span="2"
<el-descriptions-item label="使用状态"> >
<span :class="getStatusTextClass(selectedRow.use_status === 1 ? 'success' : 'info')"> {{ selectedRow.counterparty_name }}
{{ selectedRow.use_status === 1 ? '启用' : '禁用' }} </el-descriptions-item>
</span> </el-descriptions>
</el-descriptions-item> </div>
<el-descriptions-item label="待我确认">
<span v-if="selectedRow.needs_my_confirm" :class="getStatusTextClass('warning')">是</span> <!-- 签约信息 -->
<span v-else>否</span> <div class="section">
</el-descriptions-item> <div class="section-title">签约信息</div>
<el-descriptions-item label="授权截止"> <el-descriptions :column="3" border size="small" class="detail-descriptions">
<span :class="{ 'text-danger': isExpired(selectedRow.auth_end) }">{{ selectedRow.auth_end || '—' }}</span> <el-descriptions-item label="签约ID">{{ selectedRow.id }}</el-descriptions-item>
</el-descriptions-item> <el-descriptions-item label="签约状态">
<el-descriptions-item label="面单余额">{{ selectedRow.print_quantity ?? '—' }}</el-descriptions-item> <span :class="getStatusTextClass(getAuthStatusType(selectedRow.auth_status))">
<el-descriptions-item label="奇门配置"> {{ selectedRow.auth_status_label || getAuthStatusLabel(selectedRow.auth_status) }}
<span :class="getStatusTextClass(selectedRow.has_qimen_config ? 'success' : 'info')"> </span>
{{ selectedRow.has_qimen_config ? '已配置' : '未配置' }} </el-descriptions-item>
</span> <el-descriptions-item label="货主ID">{{ selectedRow.store_id ?? '—' }}</el-descriptions-item>
</el-descriptions-item> <el-descriptions-item label="仓库ID">{{ selectedRow.warehouse_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item v-if="selectedRow.counterparty_name && selectedRow.remask" label="货主全称" :span="2"> <el-descriptions-item label="使用状态">
{{ selectedRow.counterparty_name }} <span :class="getStatusTextClass(selectedRow.use_status === 1 ? 'success' : 'info')">
</el-descriptions-item> {{ selectedRow.use_status === 1 ? '启用' : '禁用' }}
</el-descriptions> </span>
</el-descriptions-item>
<el-descriptions-item label="待我确认">
<span v-if="selectedRow.needs_my_confirm" :class="getStatusTextClass('warning')">是</span>
<span v-else>否</span>
</el-descriptions-item>
<el-descriptions-item label="授权截止">
<span :class="{ 'text-danger': isExpired(selectedRow.auth_end) }">{{ selectedRow.auth_end || '—' }}</span>
</el-descriptions-item>
<el-descriptions-item label="面单余额">{{ selectedRow.print_quantity ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="奇门配置">
<span :class="getStatusTextClass(selectedRow.has_qimen_config ? 'success' : 'info')">
{{ selectedRow.has_qimen_config ? '已配置' : '未配置' }}
</span>
</el-descriptions-item>
</el-descriptions>
</div>
</div>
</div> </div>
</div> </div>
@ -517,14 +534,49 @@ onMounted(() => {
<style scoped lang="scss"> <style scoped lang="scss">
@use "../../order/orderManagement/styles/order-sub.scss"; @use "../../order/orderManagement/styles/order-sub.scss";
/* 详情区外壳与 storage/entry_owner 一致:不留上/下间距,左右 10px,
面板自身 padding: 6px 10px 8px(合计内容缩进 20px) */
.order-sub-container .main-content .lower-level .detail-container { .order-sub-container .main-content .lower-level .detail-container {
padding: 6px 10px; padding: 0 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
flex: 1; flex: 1;
min-height: 0; min-height: 0;
/* 签约详情:分区标题 + 带边框描述列表(对齐 stock/external_stock「基本信息」新设计) */
.detail-panel {
flex: 1;
min-height: 0;
padding: 6px 10px 8px;
box-sizing: border-box;
overflow: auto;
.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;
}
}
} }
.empty-tip { .empty-tip {

View File

@ -1,23 +1,34 @@
<template> <template>
<div class="pickcart-info-panel" v-loading="loading"> <div class="pickcart-info-panel" v-loading="loading">
<template v-if="data"> <template v-if="data">
<el-descriptions :column="2" border size="small"> <!-- 拣货车信息 -->
<el-descriptions-item label="ID">{{ data.cart_id }}</el-descriptions-item> <div class="section">
<el-descriptions-item label="仓库ID">{{ data.warehouse_id }}</el-descriptions-item> <div class="section-title">拣货车信息</div>
<el-descriptions-item label="编码">{{ data.cart_code }}</el-descriptions-item> <el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="名称">{{ data.cart_name || '--' }}</el-descriptions-item> <el-descriptions-item label="ID">{{ data.cart_id }}</el-descriptions-item>
<el-descriptions-item label="状态"> <el-descriptions-item label="仓库ID">{{ data.warehouse_id }}</el-descriptions-item>
<span :class="getStatusTextClass(statusInfo.type)"> <el-descriptions-item label="编码">{{ data.cart_code }}</el-descriptions-item>
{{ statusInfo.text }} <el-descriptions-item label="名称" :span="2">{{ data.cart_name || '--' }}</el-descriptions-item>
</span> </el-descriptions>
</el-descriptions-item> </div>
<el-descriptions-item label="绑定任务ID">
{{ data.current_task_id ?? '未绑定' }} <!-- 状态与绑定任务 -->
</el-descriptions-item> <div class="section">
<el-descriptions-item label="绑定任务编号" :span="2"> <div class="section-title">状态与绑定任务</div>
{{ data.current_task_no || '--' }} <el-descriptions :column="3" border size="small" class="detail-descriptions">
</el-descriptions-item> <el-descriptions-item label="状态">
</el-descriptions> <span :class="getStatusTextClass(statusInfo.type)">
{{ statusInfo.text }}
</span>
</el-descriptions-item>
<el-descriptions-item label="绑定任务ID">
{{ data.current_task_id ?? '未绑定' }}
</el-descriptions-item>
<el-descriptions-item label="绑定任务编号">
{{ data.current_task_no || '--' }}
</el-descriptions-item>
</el-descriptions>
</div>
</template> </template>
<div v-else class="empty-tip">暂无详情数据</div> <div v-else class="empty-tip">暂无详情数据</div>
</div> </div>
@ -40,6 +51,36 @@ const statusInfo = computed(() => formatPickCartStatus(props.data?.status))
<style scoped lang="scss"> <style scoped lang="scss">
@use "../../../../order/orderManagement/styles/order-sub.scss"; @use "../../../../order/orderManagement/styles/order-sub.scss";
/* 属性面板:分区标题 + 带边框描述列表(对齐 stock/external_stock「基本信息」) */
.pickcart-info-panel {
padding: 6px 10px 8px;
box-sizing: border-box;
.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;
}
}
.empty-tip { .empty-tip {
text-align: center; text-align: center;
font-size: 13px; font-size: 13px;

View File

@ -955,32 +955,16 @@ onMounted(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
@use "../../../order/orderManagement/styles/order-sub.scss"; @use "../../../order/orderManagement/styles/order-sub.scss";
/* 详情区外壳与 storage/entry_owner 一致:不留上/下间距,左右 10px,
面板自身 padding: 6px 10px 8px(合计内容缩进 20px) */
.order-sub-container .main-content .lower-level .detail-container { .order-sub-container .main-content .lower-level .detail-container {
padding: 12px; padding: 0 10px;
} }
.order-sub-container .main-content .lower-level .detail-header { .order-sub-container .main-content .lower-level .detail-header {
padding: 0 12px; padding: 0 12px;
} }
.detail-header__title {
display: flex;
align-items: center;
gap: 10px;
font-size: 14px;
font-weight: 600;
color: #303133;
}
.detail-header__code {
font-size: 12px;
font-weight: 400;
color: #909399;
padding: 0 8px;
background: #f0f2f5;
border-radius: 4px;
}
.pickcart-operation-actions { .pickcart-operation-actions {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;