feat（wms）：修复 inventory-select.vue、item-sku-select.vue 重叠的问题
YunaiV
parent
56de1f1412
commit
cd42a653c5
|
|
@ -55,6 +55,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
columns: useInventorySelectGridColumns(),
|
columns: useInventorySelectGridColumns(),
|
||||||
height: 560,
|
height: 560,
|
||||||
keepSource: true,
|
keepSource: true,
|
||||||
|
showOverflow: false,
|
||||||
checkboxConfig: {
|
checkboxConfig: {
|
||||||
checkMethod: ({ row }: { row: InventorySelectRow }) =>
|
checkMethod: ({ row }: { row: InventorySelectRow }) =>
|
||||||
isInventorySelectable(row),
|
isInventorySelectable(row),
|
||||||
|
|
@ -149,15 +150,19 @@ defineExpose({ open: openModal });
|
||||||
>
|
>
|
||||||
<Grid table-title="库存列表">
|
<Grid table-title="库存列表">
|
||||||
<template #itemInfo="{ row }">
|
<template #itemInfo="{ row }">
|
||||||
<div>{{ row.itemName || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
<div>{{ row.itemName || '-' }}</div>
|
||||||
商品编号：{{ row.itemCode }}
|
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
||||||
|
商品编号：{{ row.itemCode }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #skuInfo="{ row }">
|
<template #skuInfo="{ row }">
|
||||||
<div>{{ row.skuName || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.skuCode" class="text-xs text-gray-500">
|
<div>{{ row.skuName || '-' }}</div>
|
||||||
规格编号：{{ row.skuCode }}
|
<div v-if="row.skuCode" class="text-xs text-gray-500">
|
||||||
|
规格编号：{{ row.skuCode }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #availableQuantity="{ row }">
|
<template #availableQuantity="{ row }">
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
columns: useSkuSelectGridColumns(),
|
columns: useSkuSelectGridColumns(),
|
||||||
height: 560,
|
height: 560,
|
||||||
keepSource: true,
|
keepSource: true,
|
||||||
|
showOverflow: false,
|
||||||
checkboxConfig: {
|
checkboxConfig: {
|
||||||
checkMethod: isRowSelectable,
|
checkMethod: isRowSelectable,
|
||||||
highlight: true,
|
highlight: true,
|
||||||
|
|
@ -175,37 +176,45 @@ defineExpose({ open: openModal });
|
||||||
>
|
>
|
||||||
<Grid table-title="商品 SKU 列表">
|
<Grid table-title="商品 SKU 列表">
|
||||||
<template #itemInfo="{ row }">
|
<template #itemInfo="{ row }">
|
||||||
<div>{{ row.itemName || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
<div>{{ row.itemName || '-' }}</div>
|
||||||
商品编号：{{ row.itemCode }}
|
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
||||||
</div>
|
商品编号：{{ row.itemCode }}
|
||||||
<div v-if="row.brandName" class="text-xs text-gray-500">
|
</div>
|
||||||
品牌：{{ row.brandName }}
|
<div v-if="row.brandName" class="text-xs text-gray-500">
|
||||||
|
品牌：{{ row.brandName }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #skuInfo="{ row }">
|
<template #skuInfo="{ row }">
|
||||||
<div>{{ row.name || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.code" class="text-xs text-gray-500">
|
<div>{{ row.name || '-' }}</div>
|
||||||
编号：{{ row.code }}
|
<div v-if="row.code" class="text-xs text-gray-500">
|
||||||
</div>
|
编号：{{ row.code }}
|
||||||
<div v-if="row.barCode" class="text-xs text-gray-500">
|
</div>
|
||||||
条码：{{ row.barCode }}
|
<div v-if="row.barCode" class="text-xs text-gray-500">
|
||||||
|
条码：{{ row.barCode }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #priceInfo="{ row }">
|
<template #priceInfo="{ row }">
|
||||||
<div v-if="row.costPrice !== undefined">
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
成本价：{{ formatPrice(row.costPrice) }}
|
<div v-if="row.costPrice !== undefined">
|
||||||
</div>
|
成本价：{{ formatPrice(row.costPrice) }}
|
||||||
<div v-if="row.sellingPrice !== undefined">
|
</div>
|
||||||
销售价：{{ formatPrice(row.sellingPrice) }}
|
<div v-if="row.sellingPrice !== undefined">
|
||||||
|
销售价：{{ formatPrice(row.sellingPrice) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #weightInfo="{ row }">
|
<template #weightInfo="{ row }">
|
||||||
<div v-if="row.netWeight !== undefined">
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
净重：{{ formatWeight(row.netWeight) }}
|
<div v-if="row.netWeight !== undefined">
|
||||||
</div>
|
净重：{{ formatWeight(row.netWeight) }}
|
||||||
<div v-if="row.grossWeight !== undefined">
|
</div>
|
||||||
毛重：{{ formatWeight(row.grossWeight) }}
|
<div v-if="row.grossWeight !== undefined">
|
||||||
|
毛重：{{ formatWeight(row.grossWeight) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #dimensionInfo="{ row }">
|
<template #dimensionInfo="{ row }">
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
columns: useInventorySelectGridColumns(),
|
columns: useInventorySelectGridColumns(),
|
||||||
height: 560,
|
height: 560,
|
||||||
keepSource: true,
|
keepSource: true,
|
||||||
|
showOverflow: false,
|
||||||
checkboxConfig: {
|
checkboxConfig: {
|
||||||
checkMethod: ({ row }: { row: InventorySelectRow }) =>
|
checkMethod: ({ row }: { row: InventorySelectRow }) =>
|
||||||
isInventorySelectable(row),
|
isInventorySelectable(row),
|
||||||
|
|
@ -149,15 +150,19 @@ defineExpose({ open: openModal });
|
||||||
>
|
>
|
||||||
<Grid table-title="库存列表">
|
<Grid table-title="库存列表">
|
||||||
<template #itemInfo="{ row }">
|
<template #itemInfo="{ row }">
|
||||||
<div>{{ row.itemName || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
<div>{{ row.itemName || '-' }}</div>
|
||||||
商品编号：{{ row.itemCode }}
|
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
||||||
|
商品编号：{{ row.itemCode }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #skuInfo="{ row }">
|
<template #skuInfo="{ row }">
|
||||||
<div>{{ row.skuName || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.skuCode" class="text-xs text-gray-500">
|
<div>{{ row.skuName || '-' }}</div>
|
||||||
规格编号：{{ row.skuCode }}
|
<div v-if="row.skuCode" class="text-xs text-gray-500">
|
||||||
|
规格编号：{{ row.skuCode }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #availableQuantity="{ row }">
|
<template #availableQuantity="{ row }">
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
columns: useSkuSelectGridColumns(),
|
columns: useSkuSelectGridColumns(),
|
||||||
height: 560,
|
height: 560,
|
||||||
keepSource: true,
|
keepSource: true,
|
||||||
|
showOverflow: false,
|
||||||
checkboxConfig: {
|
checkboxConfig: {
|
||||||
checkMethod: isRowSelectable,
|
checkMethod: isRowSelectable,
|
||||||
highlight: true,
|
highlight: true,
|
||||||
|
|
@ -175,37 +176,45 @@ defineExpose({ open: openModal });
|
||||||
>
|
>
|
||||||
<Grid table-title="商品 SKU 列表">
|
<Grid table-title="商品 SKU 列表">
|
||||||
<template #itemInfo="{ row }">
|
<template #itemInfo="{ row }">
|
||||||
<div>{{ row.itemName || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
<div>{{ row.itemName || '-' }}</div>
|
||||||
商品编号：{{ row.itemCode }}
|
<div v-if="row.itemCode" class="text-xs text-gray-500">
|
||||||
</div>
|
商品编号：{{ row.itemCode }}
|
||||||
<div v-if="row.brandName" class="text-xs text-gray-500">
|
</div>
|
||||||
品牌：{{ row.brandName }}
|
<div v-if="row.brandName" class="text-xs text-gray-500">
|
||||||
|
品牌：{{ row.brandName }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #skuInfo="{ row }">
|
<template #skuInfo="{ row }">
|
||||||
<div>{{ row.name || '-' }}</div>
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
<div v-if="row.code" class="text-xs text-gray-500">
|
<div>{{ row.name || '-' }}</div>
|
||||||
编号：{{ row.code }}
|
<div v-if="row.code" class="text-xs text-gray-500">
|
||||||
</div>
|
编号：{{ row.code }}
|
||||||
<div v-if="row.barCode" class="text-xs text-gray-500">
|
</div>
|
||||||
条码：{{ row.barCode }}
|
<div v-if="row.barCode" class="text-xs text-gray-500">
|
||||||
|
条码：{{ row.barCode }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #priceInfo="{ row }">
|
<template #priceInfo="{ row }">
|
||||||
<div v-if="row.costPrice !== undefined">
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
成本价：{{ formatPrice(row.costPrice) }}
|
<div v-if="row.costPrice !== undefined">
|
||||||
</div>
|
成本价：{{ formatPrice(row.costPrice) }}
|
||||||
<div v-if="row.sellingPrice !== undefined">
|
</div>
|
||||||
销售价：{{ formatPrice(row.sellingPrice) }}
|
<div v-if="row.sellingPrice !== undefined">
|
||||||
|
销售价：{{ formatPrice(row.sellingPrice) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #weightInfo="{ row }">
|
<template #weightInfo="{ row }">
|
||||||
<div v-if="row.netWeight !== undefined">
|
<div class="flex flex-col gap-1 py-1 leading-5">
|
||||||
净重：{{ formatWeight(row.netWeight) }}
|
<div v-if="row.netWeight !== undefined">
|
||||||
</div>
|
净重：{{ formatWeight(row.netWeight) }}
|
||||||
<div v-if="row.grossWeight !== undefined">
|
</div>
|
||||||
毛重：{{ formatWeight(row.grossWeight) }}
|
<div v-if="row.grossWeight !== undefined">
|
||||||
|
毛重：{{ formatWeight(row.grossWeight) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #dimensionInfo="{ row }">
|
<template #dimensionInfo="{ row }">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue