feat(wms):优化 inventory 的实现
parent
32bbd912a2
commit
314293ced3
|
|
@ -27,7 +27,7 @@
|
||||||
@change="handleWarehouseChange"
|
@change="handleWarehouseChange"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="AREA_ENABLE" label="库区" prop="areaId">
|
<el-form-item v-if="isAreaQueryVisible" label="库区" prop="areaId">
|
||||||
<WarehouseAreaSelect
|
<WarehouseAreaSelect
|
||||||
v-model="queryParams.areaId"
|
v-model="queryParams.areaId"
|
||||||
:warehouse-id="queryParams.warehouseId"
|
:warehouse-id="queryParams.warehouseId"
|
||||||
|
|
@ -245,7 +245,7 @@ const getList = async () => {
|
||||||
try {
|
try {
|
||||||
const data = await InventoryApi.getInventoryPage({
|
const data = await InventoryApi.getInventoryPage({
|
||||||
...queryParams,
|
...queryParams,
|
||||||
areaId: AREA_ENABLE ? queryParams.areaId : undefined,
|
areaId: isAreaQueryVisible.value ? queryParams.areaId : undefined,
|
||||||
minQuantity: filterZero.value ? 1 : undefined
|
minQuantity: filterZero.value ? 1 : undefined
|
||||||
})
|
})
|
||||||
list.value = data.list.map((item: InventoryVO) => ({
|
list.value = data.list.map((item: InventoryVO) => ({
|
||||||
|
|
@ -295,6 +295,11 @@ const handleWarehouseChange = () => {
|
||||||
queryParams.areaId = undefined
|
queryParams.areaId = undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 是否展示库区搜索项 */
|
||||||
|
const isAreaQueryVisible = computed(() => {
|
||||||
|
return AREA_ENABLE && queryParams.type !== INVENTORY_DIMENSION.WAREHOUSE
|
||||||
|
})
|
||||||
|
|
||||||
/** 合并库存统计的维度单元格 */
|
/** 合并库存统计的维度单元格 */
|
||||||
const spanMethod = ({ column, rowIndex }: SpanMethodProps) => {
|
const spanMethod = ({ column, rowIndex }: SpanMethodProps) => {
|
||||||
const property = column.property
|
const property = column.property
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue