style:库存调拨-单位字段回显

main
黄伟杰 6 days ago
parent 4b770e6702
commit 4ff26b5195

@ -8,9 +8,26 @@ export interface StockUnitStockVO {
stockDisplay?: string
}
export interface ProductPackagingStockVO {
productId?: number
productName?: string
packagingSchemeId?: number
packagingSchemeName?: string
totalCount?: number
unitName?: string
stockDisplay?: string
packagingDisplay?: string
packageQuantity?: number
palletPackageQuantity?: number
palletTotalQuantity?: number
}
export interface ProductStockCardVO {
skuCount?: number
stockDisplay?: string
totalCount?: number
unitName?: string
packagingStocks?: ProductPackagingStockVO[]
todayFinishedInDisplay?: string
}
@ -23,6 +40,9 @@ export interface UnitGroupedStockCardVO {
export interface TodayInCardVO {
orderCount?: number
itemCount?: number
productStock?: ProductStockCardVO
materialStock?: UnitGroupedStockCardVO
sparePartStock?: UnitGroupedStockCardVO
productDisplay?: string
materialDisplay?: string
sparePartDisplay?: string
@ -31,6 +51,9 @@ export interface TodayInCardVO {
export interface TodayOutCardVO {
orderCount?: number
itemCount?: number
materialStock?: UnitGroupedStockCardVO
sparePartStock?: UnitGroupedStockCardVO
productStock?: ProductStockCardVO
materialDisplay?: string
sparePartDisplay?: string
productDisplay?: string

@ -287,7 +287,7 @@ const categoryTypeLabel = computed(() => {
const productColumnLabel = computed(() => categoryTypeLabel.value)
const productPlaceholder = computed(() => `请选择${productColumnLabel.value}`)
const productSelectTitle = computed(() => `选择${productColumnLabel.value}`)
const getRowUnitName = (row) => row.unitName || '-'
const getRowUnitName = (row) => row.productUnitName || '-'
watch(
() => props.items,

@ -218,6 +218,14 @@ const displayValue = (value: unknown) => {
const formatCardLine = (label: string, value: unknown) => `${label}: ${displayValue(value)}`
const formatUnitStocksDisplay = (card?: { unitStocks?: Array<{ stockDisplay?: string }> }, fallback?: string) => {
const display = card?.unitStocks
?.map((item) => item?.stockDisplay)
.filter((item): item is string => Boolean(item))
.join('/')
return display || fallback
}
const summaryCards = computed(() => {
const data: StockStatisticsCardsRespVO = statisticsCards.value || {}
const productStock = data.productStock || {}
@ -265,9 +273,9 @@ const summaryCards = computed(() => {
lines: [
formatCardLine(t('ErpStock.Overview.cardLabels.inboundOrders'), todayIn.orderCount),
formatCardLine(t('ErpStock.Overview.cardLabels.detailLines'), todayIn.itemCount),
formatCardLine(t('ErpStock.Overview.cardLabels.productIn'), todayIn.productDisplay),
formatCardLine(t('ErpStock.Overview.cardLabels.materialIn'), todayIn.materialDisplay),
formatCardLine(t('ErpStock.Overview.cardLabels.sparePartIn'), todayIn.sparePartDisplay)
formatCardLine(t('ErpStock.Overview.cardLabels.productIn'), todayIn.productStock?.stockDisplay || todayIn.productDisplay),
formatCardLine(t('ErpStock.Overview.cardLabels.materialIn'), formatUnitStocksDisplay(todayIn.materialStock, todayIn.materialDisplay)),
formatCardLine(t('ErpStock.Overview.cardLabels.sparePartIn'), formatUnitStocksDisplay(todayIn.sparePartStock, todayIn.sparePartDisplay))
]
},
{
@ -277,9 +285,9 @@ const summaryCards = computed(() => {
lines: [
formatCardLine(t('ErpStock.Overview.cardLabels.outboundOrders'), todayOut.orderCount),
formatCardLine(t('ErpStock.Overview.cardLabels.detailLines'), todayOut.itemCount),
formatCardLine(t('ErpStock.Overview.cardLabels.productOut'), todayOut.productDisplay),
formatCardLine(t('ErpStock.Overview.cardLabels.materialOut'), todayOut.materialDisplay),
formatCardLine(t('ErpStock.Overview.cardLabels.sparePartOut'), todayOut.sparePartDisplay)
formatCardLine(t('ErpStock.Overview.cardLabels.productOut'), todayOut.productStock?.stockDisplay || todayOut.productDisplay),
formatCardLine(t('ErpStock.Overview.cardLabels.materialOut'), formatUnitStocksDisplay(todayOut.materialStock, todayOut.materialDisplay)),
formatCardLine(t('ErpStock.Overview.cardLabels.sparePartOut'), formatUnitStocksDisplay(todayOut.sparePartStock, todayOut.sparePartDisplay))
]
}
]

@ -150,7 +150,7 @@
</el-table-column> -->
<el-table-column :label="t('ErpStock.Stock.unit')" align="center" prop="purchaseUnitName" min-width="90" sortable>
<template #default="{ row }">
{{ row.purchaseUnitName || row.unitName || '-' }}
{{ row.unitName || '-' }}
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Stock.latestInTime')" align="center" min-width="180">

Loading…
Cancel
Save