feat(order): 商品明细增加操作列,按行展开 SN 码列表
- 详情抽屉的「商品明细」新增操作列:「SN码(N)」按钮点击展开该行的序列号列表(SN / 运单号 / 回传时间),再点收起 - 明细行与 el-table 展开箭头共用同一份展开状态;不再单独放一张独立的序列号表格 - 序列号按行号匹配,缺行号时按商品编码兜底 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
d4128c4eee
commit
e080bcbb76
@ -1290,5 +1290,5 @@ GET /api/order-status/list?status=delivery&sn_codes=SN1,SN2
|
|||||||
|
|
||||||
- 后端先按 `(principal_id, sn_code)` 从 `order_sn_codes` 取命中的订单ID,再回状态表过滤;
|
- 后端先按 `(principal_id, sn_code)` 从 `order_sn_codes` 取命中的订单ID,再回状态表过滤;
|
||||||
- 订单导出的筛选条件同样支持「序列号」(`sn_codes`);
|
- 订单导出的筛选条件同样支持「序列号」(`sn_codes`);
|
||||||
- 订单详情(`GET /api/order-status/:id`)返回 `order.sn_codes`,页面详情抽屉展示序列号明细。
|
- 订单详情(`GET /api/order-status/:id`)返回 `order.sn_codes`;页面详情抽屉在「商品明细」每行提供「SN码(N)」按钮,点击展开该行的序列号列表(含运单号 / 回传时间)。
|
||||||
|
|
||||||
|
|||||||
@ -593,11 +593,45 @@ const detailRow = ref<OrderStatusItem | null>(null)
|
|||||||
const detailProducts = ref<OrderItemLine[]>([])
|
const detailProducts = ref<OrderItemLine[]>([])
|
||||||
/** 仓库回传的序列号(order_sn_codes,随详情返回) */
|
/** 仓库回传的序列号(order_sn_codes,随详情返回) */
|
||||||
const detailSnCodes = ref<OrderStatusSnCode[]>([])
|
const detailSnCodes = ref<OrderStatusSnCode[]>([])
|
||||||
|
/** 商品明细里已展开 SN 列表的行(el-table 的受控展开行 key = 明细 id) */
|
||||||
|
const expandedItemIds = ref<number[]>([])
|
||||||
|
|
||||||
|
/** 该明细行对应的回传序列号(优先按行号匹配,缺行号时按商品编码匹配) */
|
||||||
|
function snCodesOfLine(row: OrderItemLine): OrderStatusSnCode[] {
|
||||||
|
const lineNo = String(row.order_line_no == null ? '' : row.order_line_no).trim()
|
||||||
|
const itemCode = String(row.item_code == null ? '' : row.item_code).trim()
|
||||||
|
return detailSnCodes.value.filter(sn => {
|
||||||
|
const snLineNo = String(sn.order_line_no == null ? '' : sn.order_line_no).trim()
|
||||||
|
if (lineNo && snLineNo) return snLineNo === lineNo
|
||||||
|
return Boolean(itemCode) && String(sn.item_code == null ? '' : sn.item_code).trim() === itemCode
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function isItemSnExpanded(row: OrderItemLine): boolean {
|
||||||
|
return row.id != null && expandedItemIds.value.includes(Number(row.id))
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 点「SN码」切换该明细行的折叠 SN 列表 */
|
||||||
|
function toggleItemSn(row: OrderItemLine) {
|
||||||
|
if (row.id == null) return
|
||||||
|
const id = Number(row.id)
|
||||||
|
expandedItemIds.value = isItemSnExpanded(row)
|
||||||
|
? expandedItemIds.value.filter(item => item !== id)
|
||||||
|
: [ ...expandedItemIds.value, id ]
|
||||||
|
}
|
||||||
|
|
||||||
|
/** el-table 展开箭头与按钮共用同一份展开状态 */
|
||||||
|
function onItemExpandChange(_row: OrderItemLine, expandedRows: OrderItemLine[]) {
|
||||||
|
expandedItemIds.value = (expandedRows || [])
|
||||||
|
.map(item => Number(item.id))
|
||||||
|
.filter(id => Number.isInteger(id))
|
||||||
|
}
|
||||||
|
|
||||||
async function openDetail(row: OrderStatusItem) {
|
async function openDetail(row: OrderStatusItem) {
|
||||||
detailRow.value = row
|
detailRow.value = row
|
||||||
detailProducts.value = []
|
detailProducts.value = []
|
||||||
detailSnCodes.value = []
|
detailSnCodes.value = []
|
||||||
|
expandedItemIds.value = []
|
||||||
detailVisible.value = true
|
detailVisible.value = true
|
||||||
detailLoading.value = true
|
detailLoading.value = true
|
||||||
try {
|
try {
|
||||||
@ -1146,7 +1180,7 @@ onBeforeUnmount(() => {
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- 详情(单据头 + 明细,实时取自详情接口) -->
|
<!-- 详情(单据头 + 明细,实时取自详情接口) -->
|
||||||
<el-drawer v-model="detailVisible" :title="`订单 ${detailRow?.order_no || ''}`" size="720px">
|
<el-drawer v-model="detailVisible" :title="`订单 ${detailRow?.order_no || ''}`" size="860px">
|
||||||
<template v-if="detailRow">
|
<template v-if="detailRow">
|
||||||
<el-descriptions v-loading="detailLoading" :column="2" border size="small">
|
<el-descriptions v-loading="detailLoading" :column="2" border size="small">
|
||||||
<el-descriptions-item label="订单号">{{ detailRow.order_no }}</el-descriptions-item>
|
<el-descriptions-item label="订单号">{{ detailRow.order_no }}</el-descriptions-item>
|
||||||
@ -1218,37 +1252,60 @@ onBeforeUnmount(() => {
|
|||||||
</template>
|
</template>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
|
|
||||||
<el-divider content-position="left">商品明细({{ detailProducts.length }} 行)</el-divider>
|
<el-divider content-position="left">
|
||||||
<DataTable :data="detailProducts" :stripe="true">
|
商品明细({{ detailProducts.length }} 行{{ detailSnCodes.length ? ` · 序列号 ${detailSnCodes.length} 个` : '' }})
|
||||||
<el-table-column prop="order_line_no" label="行号" width="70" />
|
</el-divider>
|
||||||
<el-table-column prop="item_code" label="商品编码" width="150" show-overflow-tooltip />
|
<DataTable
|
||||||
<el-table-column prop="item_name" label="商品名称" min-width="150" show-overflow-tooltip />
|
:data="detailProducts"
|
||||||
<el-table-column label="数量" width="80" align="right">
|
:stripe="true"
|
||||||
|
row-key="id"
|
||||||
|
:expand-row-keys="expandedItemIds"
|
||||||
|
@expand-change="onItemExpandChange"
|
||||||
|
>
|
||||||
|
<el-table-column type="expand" width="32">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<div class="sn-expand">
|
||||||
|
<template v-if="snCodesOfLine(row).length">
|
||||||
|
<div v-for="sn in snCodesOfLine(row)" :key="sn.id" class="sn-expand__item">
|
||||||
|
<el-tag size="small" effect="plain">{{ sn.sn_code }}</el-tag>
|
||||||
|
<span v-if="sn.express_code" class="sn-expand__meta">运单号 {{ sn.express_code }}</span>
|
||||||
|
<span class="sn-expand__meta">{{ formatDateTime(sn.created_at) }}</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<span v-else class="muted">该行没有仓库回传的序列号</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="order_line_no" label="行号" width="60" />
|
||||||
|
<el-table-column prop="item_code" label="商品编码" width="140" show-overflow-tooltip />
|
||||||
|
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
|
||||||
|
<el-table-column label="数量" width="60" align="right">
|
||||||
<template #default="{ row }">{{ fmtNum(row.plan_qty) }}</template>
|
<template #default="{ row }">{{ fmtNum(row.plan_qty) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="单价" width="80" align="right">
|
<el-table-column label="单价" width="70" align="right">
|
||||||
<template #default="{ row }">{{ fmtNum(row.actual_price) }}</template>
|
<template #default="{ row }">{{ fmtNum(row.actual_price) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="金额" width="90" align="right">
|
<el-table-column label="金额" width="80" align="right">
|
||||||
<template #default="{ row }">{{ lineAmount(row) }}</template>
|
<template #default="{ row }">{{ lineAmount(row) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="库存类型" width="90">
|
<el-table-column label="库存类型" width="80">
|
||||||
<template #default="{ row }">{{ row.inventory_type === 'CC' ? '残次' : '正品' }}</template>
|
<template #default="{ row }">{{ row.inventory_type === 'CC' ? '残次' : '正品' }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="操作" width="100">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-button
|
||||||
|
v-if="snCodesOfLine(row).length"
|
||||||
|
link
|
||||||
|
type="primary"
|
||||||
|
size="small"
|
||||||
|
@click="toggleItemSn(row)"
|
||||||
|
>
|
||||||
|
{{ isItemSnExpanded(row) ? '收起SN码' : `SN码(${snCodesOfLine(row).length})` }}
|
||||||
|
</el-button>
|
||||||
|
<span v-else class="muted">-</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
</DataTable>
|
</DataTable>
|
||||||
|
|
||||||
<template v-if="detailSnCodes.length">
|
|
||||||
<el-divider content-position="left">序列号({{ detailSnCodes.length }} 个)</el-divider>
|
|
||||||
<DataTable :data="detailSnCodes" :stripe="true">
|
|
||||||
<el-table-column prop="order_line_no" label="行号" width="70" />
|
|
||||||
<el-table-column prop="item_code" label="商品编码" width="150" show-overflow-tooltip />
|
|
||||||
<el-table-column prop="sn_code" label="序列号" min-width="200" show-overflow-tooltip />
|
|
||||||
<el-table-column prop="express_code" label="运单号" width="150" show-overflow-tooltip />
|
|
||||||
<el-table-column label="回传时间" width="160">
|
|
||||||
<template #default="{ row }">{{ formatDateTime(row.created_at) }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
</DataTable>
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
|
||||||
@ -1374,6 +1431,20 @@ onBeforeUnmount(() => {
|
|||||||
.muted {
|
.muted {
|
||||||
color: var(--el-text-color-secondary);
|
color: var(--el-text-color-secondary);
|
||||||
}
|
}
|
||||||
|
/* 商品明细:展开的 SN 列表(一行一个序列号) */
|
||||||
|
.sn-expand {
|
||||||
|
padding: 4px 8px 4px 28px;
|
||||||
|
}
|
||||||
|
.sn-expand__item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 2px 0;
|
||||||
|
}
|
||||||
|
.sn-expand__meta {
|
||||||
|
color: var(--el-text-color-secondary);
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
.add-line {
|
.add-line {
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user