1
This commit is contained in:
commit
9913eba441
@ -578,6 +578,7 @@ export function stockCheckList(
|
|||||||
|
|
||||||
// ============ stock.check.addDetail ============
|
// ============ stock.check.addDetail ============
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
/**
|
/**
|
||||||
* stock.check.addDetail 请求参数(与任务 type 对齐:商品类传 stock_ids,库位类传 locations / location_ids)
|
* stock.check.addDetail 请求参数(与任务 type 对齐:商品类传 stock_ids,库位类传 locations / location_ids)
|
||||||
*
|
*
|
||||||
@ -590,11 +591,15 @@ export function stockCheckList(
|
|||||||
* 兼容:type=all 且已存在商品明细行(改造前创建的旧任务)时,继续按商品模式接受 stock_ids。
|
* 兼容:type=all 且已存在商品明细行(改造前创建的旧任务)时,继续按商品模式接受 stock_ids。
|
||||||
* 幂等:已存在同盘点项(商品行 stock_id / 库位行 location_code)自动跳过(计入 skipped)。
|
* 幂等:已存在同盘点项(商品行 stock_id / 库位行 location_code)自动跳过(计入 skipped)。
|
||||||
*/
|
*/
|
||||||
|
=======
|
||||||
|
/** stock.check.addDetail 请求参数(与任务 type 对齐:商品类传 stock_ids,库位类传 location_ids/locations) */
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
export type StockCheckAddDetailParams = {
|
export type StockCheckAddDetailParams = {
|
||||||
/** 盘点任务ID */
|
/** 盘点任务ID */
|
||||||
id: number
|
id: number
|
||||||
/**
|
/**
|
||||||
* 商品库存ID列表(wms_stock_warehouse.id):type=store/goods 按商品盘点时使用,
|
* 商品库存ID列表(wms_stock_warehouse.id):type=store/goods 按商品盘点时使用,
|
||||||
|
<<<<<<< HEAD
|
||||||
* 与 locations / location_ids 按任务类型二选一
|
* 与 locations / location_ids 按任务类型二选一
|
||||||
*/
|
*/
|
||||||
stock_ids?: number[]
|
stock_ids?: number[]
|
||||||
@ -602,6 +607,23 @@ export type StockCheckAddDetailParams = {
|
|||||||
* 库位编码列表(wms_location_space.space_code):type=all/location 按库位盘点时使用,
|
* 库位编码列表(wms_location_space.space_code):type=all/location 按库位盘点时使用,
|
||||||
* 与 stock_ids 按任务类型二选一;**与 location_ids 同时传入时被忽略(location_ids 优先)**;
|
* 与 stock_ids 按任务类型二选一;**与 location_ids 同时传入时被忽略(location_ids 优先)**;
|
||||||
* **type=all 未传库位且未传 location_ids 时由后端自动拉取全仓库启用库位生成盘点范围**
|
* **type=all 未传库位且未传 location_ids 时由后端自动拉取全仓库启用库位生成盘点范围**
|
||||||
|
=======
|
||||||
|
* 与 location_ids/locations 按任务类型二选一
|
||||||
|
*/
|
||||||
|
stock_ids?: number[]
|
||||||
|
/**
|
||||||
|
* 库位ID列表(wms_location_space.id):type=all/location 按库位盘点时使用,
|
||||||
|
* **优先于 locations**(与 locations 同时传时 locations 被忽略),
|
||||||
|
* 服务端直接按 id + warehouse_id 查库校验,不再按编码二次解析;
|
||||||
|
* 查不到的 ID 记入 invalid_location_ids(不报错)
|
||||||
|
*/
|
||||||
|
location_ids?: number[]
|
||||||
|
/** 库位ID列表(驼峰别名,兼容写法;location_ids 优先) */
|
||||||
|
locationIds?: number[]
|
||||||
|
/**
|
||||||
|
* 库位编码列表(wms_location_space.space_code):仅传编码时按 warehouse_id + space_code 匹配,
|
||||||
|
* 不存在的编码记入 invalid_locations;**type=all 未传库位且未传库位ID时由后端自动拉取全仓库启用库位**
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
*/
|
*/
|
||||||
locations?: string[]
|
locations?: string[]
|
||||||
/** 库位编码列表(兼容别名;locations 优先,两者都传时以 locations 为准) */
|
/** 库位编码列表(兼容别名;locations 优先,两者都传时以 locations 为准) */
|
||||||
@ -632,7 +654,20 @@ export type StockCheckAddDetailResponse = {
|
|||||||
total_items: number
|
total_items: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
/** stock.check.addDetail:添加盘点明细(仅 created/rejected 允许;同盘点项幂等跳过) */
|
/** stock.check.addDetail:添加盘点明细(仅 created/rejected 允许;同盘点项幂等跳过) */
|
||||||
|
=======
|
||||||
|
/**
|
||||||
|
* stock.check.addDetail:添加盘点明细(商品或库位,按任务盘点类型决定)
|
||||||
|
*
|
||||||
|
* - 仅 created/rejected 允许;stock_ids 与 location_ids/locations 按任务类型二选一
|
||||||
|
* (传错维度后端报 400:按库位盘点传 stock_ids / 按商品盘点传 locations 或 location_ids)
|
||||||
|
* - 已存在同盘点项(商品行 stock_id / 库位行 location_code)自动跳过(幂等)
|
||||||
|
* - 完成后重算主表 total_items
|
||||||
|
*
|
||||||
|
* 注:兼容入口 stock.check.addLocationDetail 是 addDetail 库位ID路径的薄封装,前端无需单独接入。
|
||||||
|
*/
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
export function stockCheckAddDetail(
|
export function stockCheckAddDetail(
|
||||||
data: StockCheckAddDetailParams
|
data: StockCheckAddDetailParams
|
||||||
): Promise<StockCheckEnvelope<StockCheckAddDetailResponse>> {
|
): Promise<StockCheckEnvelope<StockCheckAddDetailResponse>> {
|
||||||
@ -709,6 +744,7 @@ export function stockCheckAddLocationDetail(
|
|||||||
|
|
||||||
// ============ stock.check.detailDelete ============
|
// ============ stock.check.detailDelete ============
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
/** stock.check.detailDelete 请求参数(**批量删除**,单次上限 200) */
|
/** stock.check.detailDelete 请求参数(**批量删除**,单次上限 200) */
|
||||||
export type StockCheckDetailDeleteParams = {
|
export type StockCheckDetailDeleteParams = {
|
||||||
/** 盘点任务ID */
|
/** 盘点任务ID */
|
||||||
@ -723,6 +759,17 @@ export type StockCheckDetailDeleteParams = {
|
|||||||
/** 盘点明细ID数组(驼峰别名,兼容写法,单值自动转数组;detail_ids 优先) */
|
/** 盘点明细ID数组(驼峰别名,兼容写法,单值自动转数组;detail_ids 优先) */
|
||||||
detailIds?: number[] | number
|
detailIds?: number[] | number
|
||||||
/** 盘点明细ID(旧版单值写法,自动转数组;detail_ids / detailIds 优先) */
|
/** 盘点明细ID(旧版单值写法,自动转数组;detail_ids / detailIds 优先) */
|
||||||
|
=======
|
||||||
|
/** stock.check.detailDelete 请求参数(批量;单次上限 200) */
|
||||||
|
export type StockCheckDetailDeleteParams = {
|
||||||
|
/** 盘点任务ID */
|
||||||
|
id: number
|
||||||
|
/** 盘点明细ID数组(单次上限 200;优先级 detail_ids > detailIds > detail_id) */
|
||||||
|
detail_ids?: number[]
|
||||||
|
/** 盘点明细ID数组(驼峰别名,兼容写法) */
|
||||||
|
detailIds?: number[]
|
||||||
|
/** 旧版单值写法(自动转数组;detail_ids/detailIds 优先) */
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
detail_id?: number
|
detail_id?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -739,12 +786,20 @@ export type StockCheckDetailDeleteResponse = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
<<<<<<< HEAD
|
||||||
* stock.check.detailDelete:**批量删除盘点明细**(从任务中移除若干商品 / 库位行)
|
* stock.check.detailDelete:**批量删除盘点明细**(从任务中移除若干商品 / 库位行)
|
||||||
*
|
*
|
||||||
* - 仅主表状态 created/rejected 允许删除
|
* - 仅主表状态 created/rejected 允许删除
|
||||||
* - 未命中的明细ID(不存在或不属于当前仓库)计入 `skipped_ids`,不报错
|
* - 未命中的明细ID(不存在或不属于当前仓库)计入 `skipped_ids`,不报错
|
||||||
* - 命中明细若存在作业记录(wms_stock_check_record)会防御性一并删除
|
* - 命中明细若存在作业记录(wms_stock_check_record)会防御性一并删除
|
||||||
* (正常流程 created/rejected 状态不应有记录)
|
* (正常流程 created/rejected 状态不应有记录)
|
||||||
|
=======
|
||||||
|
* stock.check.detailDelete:**批量**删除盘点明细(从任务中移除商品/库位行)
|
||||||
|
*
|
||||||
|
* - 仅主表状态 created/rejected 允许删除(非该状态报错)
|
||||||
|
* - 单次最多 200 条;未命中的明细ID计入 skipped_ids(不报错)
|
||||||
|
* - 命中明细批量删除,并防御性清理 wms_stock_check_record(正常流程该状态不应有记录)
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
* - 删除后服务端重算主表 total_items
|
* - 删除后服务端重算主表 total_items
|
||||||
*/
|
*/
|
||||||
export function stockCheckDetailDelete(
|
export function stockCheckDetailDelete(
|
||||||
|
|||||||
564
src/views/storage/stockcheck/components/LocationPicker.vue
Normal file
564
src/views/storage/stockcheck/components/LocationPicker.vue
Normal file
@ -0,0 +1,564 @@
|
|||||||
|
<!--
|
||||||
|
LocationPicker — 盘点库位选择(逐层下拉:仓库 → 库区 → 货架 → 库位)
|
||||||
|
|
||||||
|
数据来源(/system 网关,均限当前登录主体可见范围):
|
||||||
|
- warehouse.getWarehouseZones → 仓库列表(wms_location_zone 中 zone_type=warehouse)
|
||||||
|
- warehouse.getWarehouseTree → 仓库下的库区(area)/ 通道(aisle)/ 货架(rack)树
|
||||||
|
- warehouse.getSpacesByRack → 货架下的库位(wms_location_space)
|
||||||
|
|
||||||
|
v-model 为**库位ID数组**(wms_location_space.id),即 stock.check.addDetail 的 location_ids
|
||||||
|
(新契约:location_ids 直查 id+warehouse_id 校验,优先于 locations 编码,前端默认走 ID 路径)。
|
||||||
|
allowEmpty=true(type=all)时允许不选:不选库位ID = 由后端拉取全仓启用库位。
|
||||||
|
「手工输入」为兔底通道:粘贴的**编码**会经 index.searchSpaces 反查精确匹配为库位ID 后并入已选。
|
||||||
|
-->
|
||||||
|
<template>
|
||||||
|
<div class="location-picker">
|
||||||
|
<!-- 逐层下拉:仓库 → 库区 → 货架;最右为库位筛选 -->
|
||||||
|
<div class="cascade-row">
|
||||||
|
<el-select
|
||||||
|
v-model="warehouseId"
|
||||||
|
class="cascade-item"
|
||||||
|
placeholder="仓库"
|
||||||
|
filterable
|
||||||
|
clearable
|
||||||
|
:disabled="disabled"
|
||||||
|
:loading="warehouseLoading"
|
||||||
|
@change="handleWarehouseChange"
|
||||||
|
>
|
||||||
|
<el-option v-for="w in warehouses" :key="w.id" :label="w.label" :value="w.id" />
|
||||||
|
<template #empty>暂无仓库</template>
|
||||||
|
</el-select>
|
||||||
|
|
||||||
|
<el-select
|
||||||
|
v-model="areaId"
|
||||||
|
class="cascade-item"
|
||||||
|
placeholder="库区"
|
||||||
|
filterable
|
||||||
|
clearable
|
||||||
|
:disabled="disabled || !warehouseId || treeLoading"
|
||||||
|
:loading="treeLoading"
|
||||||
|
@change="handleAreaChange"
|
||||||
|
>
|
||||||
|
<el-option v-for="a in areas" :key="a.id" :label="a.label" :value="a.id" />
|
||||||
|
<template #empty>该仓库暂无库区</template>
|
||||||
|
</el-select>
|
||||||
|
|
||||||
|
<el-select
|
||||||
|
v-model="rackId"
|
||||||
|
class="cascade-item"
|
||||||
|
placeholder="货架"
|
||||||
|
filterable
|
||||||
|
clearable
|
||||||
|
:disabled="disabled || !areaId || spaceLoading"
|
||||||
|
:loading="spaceLoading"
|
||||||
|
@change="handleRackChange"
|
||||||
|
>
|
||||||
|
<el-option v-for="r in racks" :key="r.id" :label="r.label" :value="r.id" />
|
||||||
|
<template #empty>该库区暂无货架</template>
|
||||||
|
</el-select>
|
||||||
|
|
||||||
|
<el-input
|
||||||
|
v-model="keyword"
|
||||||
|
class="cascade-item"
|
||||||
|
placeholder="库位编码/名称筛选"
|
||||||
|
clearable
|
||||||
|
:disabled="disabled"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 操作行 -->
|
||||||
|
<div class="space-toolbar">
|
||||||
|
<el-button
|
||||||
|
size="small"
|
||||||
|
:disabled="disabled || !filteredSpaces.length"
|
||||||
|
@click="selectAllVisible"
|
||||||
|
>
|
||||||
|
全选当前列表
|
||||||
|
</el-button>
|
||||||
|
<el-button size="small" :disabled="disabled || !selected.length" @click="clearSelected">
|
||||||
|
清空已选
|
||||||
|
</el-button> <span class="stat-text">
|
||||||
|
当前列表 {{ filteredSpaces.length }} 个库位 · 已选 {{ selected.length }} 个
|
||||||
|
</span>
|
||||||
|
<el-link type="primary" :underline="false" @click="manualVisible = !manualVisible">
|
||||||
|
{{ manualVisible ? '收起手工输入' : '手工输入编码' }}
|
||||||
|
</el-link>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 手工输入(可折叠):失焦时把编码反查为库位ID 并入已选 -->
|
||||||
|
<el-input
|
||||||
|
v-if="manualVisible"
|
||||||
|
v-model="manualText"
|
||||||
|
type="textarea"
|
||||||
|
:rows="3"
|
||||||
|
resize="none"
|
||||||
|
:disabled="manualLoading"
|
||||||
|
placeholder="每行一个库位编码,也可用逗号 / 空格分隔,如:A-01-01;输入完点击其他处(失焦)即识别编码并并入已选"
|
||||||
|
@blur="flushManualText"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 库位多选列表(分页渲染,避免上千库位一次性上屏) -->
|
||||||
|
<div v-loading="spaceLoading" class="space-list">
|
||||||
|
<el-checkbox-group v-if="visibleSpaces.length" v-model="selected" :disabled="disabled">
|
||||||
|
<el-checkbox
|
||||||
|
v-for="space in visibleSpaces"
|
||||||
|
:key="space.id"
|
||||||
|
:value="space.id"
|
||||||
|
class="space-item"
|
||||||
|
>
|
||||||
|
{{ space.space_code }}
|
||||||
|
<span v-if="space.custom_name" class="space-name">({{ space.custom_name }})</span>
|
||||||
|
</el-checkbox>
|
||||||
|
</el-checkbox-group>
|
||||||
|
<div v-else class="empty-tip">{{ emptyText }}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="filteredSpaces.length > spacePageSize" class="space-pager">
|
||||||
|
<el-pagination
|
||||||
|
v-model:current-page="spacePage"
|
||||||
|
v-model:page-size="spacePageSize"
|
||||||
|
:page-sizes="[100, 200, 500]"
|
||||||
|
:total="filteredSpaces.length"
|
||||||
|
layout="total, sizes, prev, pager, next"
|
||||||
|
background
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 已选预览 -->
|
||||||
|
<div class="selected-preview">
|
||||||
|
<span class="hint-text">
|
||||||
|
已选 {{ selected.length }} 个
|
||||||
|
<template v-if="!selected.length && allowEmpty">(不选 = 后端自动拉取全仓启用库位)</template>
|
||||||
|
</span>
|
||||||
|
<el-tag
|
||||||
|
v-for="id in selected.slice(0, 60)"
|
||||||
|
:key="id"
|
||||||
|
size="small"
|
||||||
|
closable
|
||||||
|
class="location-tag"
|
||||||
|
@close="removeSelected(id)"
|
||||||
|
>
|
||||||
|
{{ labelOf(id) }}
|
||||||
|
</el-tag>
|
||||||
|
<span v-if="selected.length > 60" class="hint-text">
|
||||||
|
…等共 {{ selected.length }} 个
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||||
|
import { ElMessage } from 'element-plus'
|
||||||
|
import { searchSpaces } from '@/api/index/index'
|
||||||
|
import {
|
||||||
|
getSpacesByRack,
|
||||||
|
getWarehouseTree,
|
||||||
|
getWarehouseZones
|
||||||
|
} from '@/api/warehouse/warehouse'
|
||||||
|
|
||||||
|
defineOptions({ name: 'LocationPicker' })
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
/** 已选库位ID数组(wms_location_space.id) */
|
||||||
|
modelValue: number[]
|
||||||
|
/** 允许不选(type=all:不选 = 后端拉取全仓启用库位) */
|
||||||
|
allowEmpty?: boolean
|
||||||
|
/** 只读 */
|
||||||
|
disabled?: boolean
|
||||||
|
}>(),
|
||||||
|
{ modelValue: () => [], allowEmpty: false, disabled: false }
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'update:modelValue', value: number[]): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
/** 已选库位ID(与父组件 v-model 双向同步) */
|
||||||
|
const selected = computed<number[]>({
|
||||||
|
get: () => props.modelValue ?? [],
|
||||||
|
set: (value) => {
|
||||||
|
const ids = (Array.isArray(value) ? value : [])
|
||||||
|
.map((id) => Number(id))
|
||||||
|
.filter((id) => Number.isFinite(id) && id > 0)
|
||||||
|
emit('update:modelValue', [...new Set(ids)])
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 库位ID → 展示文案缓存(切货架后已选项仍能显示编码) */
|
||||||
|
const spaceLabelById = reactive<Record<number, string>>({})
|
||||||
|
|
||||||
|
function rememberSpaces(list: SpaceOption[]) {
|
||||||
|
for (const space of list) {
|
||||||
|
spaceLabelById[space.id] = space.custom_name
|
||||||
|
? `${space.space_code}(${space.custom_name})`
|
||||||
|
: space.space_code
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function labelOf(id: number): string {
|
||||||
|
return spaceLabelById[id] ?? `#${id}`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Option = { id: number; label: string }
|
||||||
|
type SpaceOption = { id: number; space_code: string; custom_name?: string }
|
||||||
|
|
||||||
|
// ===== 逐层下拉 =====
|
||||||
|
const warehouses = ref<Option[]>([])
|
||||||
|
const areas = ref<Option[]>([])
|
||||||
|
const racks = ref<Option[]>([])
|
||||||
|
|
||||||
|
const warehouseId = ref<number | undefined>(undefined)
|
||||||
|
const areaId = ref<number | undefined>(undefined)
|
||||||
|
const rackId = ref<number | undefined>(undefined)
|
||||||
|
|
||||||
|
const warehouseLoading = ref(false)
|
||||||
|
const treeLoading = ref(false)
|
||||||
|
const spaceLoading = ref(false)
|
||||||
|
|
||||||
|
const spaces = ref<SpaceOption[]>([])
|
||||||
|
const keyword = ref('')
|
||||||
|
const manualVisible = ref(false)
|
||||||
|
const manualText = ref('')
|
||||||
|
const manualLoading = ref(false)
|
||||||
|
/** 上一次已识别的手工输入(避免同一段文本重复请求) */
|
||||||
|
const lastManualText = ref('')
|
||||||
|
/** 库位列表分页(单个货架可能有上千库位) */
|
||||||
|
const spacePage = ref(1)
|
||||||
|
const spacePageSize = ref(200)
|
||||||
|
/** 当前仓库的库区树children(缓存,切换库区时复用,不再多拉一次) */
|
||||||
|
const treeChildren = ref<any[]>([])
|
||||||
|
|
||||||
|
/** 从树节点中按类型递归收集(库区下可能隔着 aisle 通道层) */
|
||||||
|
function collectByType(nodes: any[], type: string, out: any[] = []): any[] {
|
||||||
|
for (const node of Array.isArray(nodes) ? nodes : []) {
|
||||||
|
if (node?.type === type) out.push(node)
|
||||||
|
if (node?.children?.length) collectByType(node.children, type, out)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
function toOption(node: any): Option {
|
||||||
|
return {
|
||||||
|
id: Number(node?.id) || 0,
|
||||||
|
label: String(node?.label ?? node?.name ?? node?.code ?? node?.id ?? '')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 库位列表(本地按编码/名称筛选) */
|
||||||
|
const filteredSpaces = computed<SpaceOption[]>(() => {
|
||||||
|
const kw = keyword.value.trim().toLowerCase()
|
||||||
|
if (!kw) return spaces.value
|
||||||
|
return spaces.value.filter(
|
||||||
|
(s) =>
|
||||||
|
String(s.space_code).toLowerCase().includes(kw) ||
|
||||||
|
String(s.custom_name ?? '').toLowerCase().includes(kw)
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 当前页库位 */
|
||||||
|
const visibleSpaces = computed<SpaceOption[]>(() => {
|
||||||
|
const start = (spacePage.value - 1) * spacePageSize.value
|
||||||
|
return filteredSpaces.value.slice(start, start + spacePageSize.value)
|
||||||
|
})
|
||||||
|
|
||||||
|
// 筛选/切货架时回到第一页,避免停在空白页
|
||||||
|
watch([keyword, rackId], () => {
|
||||||
|
spacePage.value = 1
|
||||||
|
})
|
||||||
|
|
||||||
|
// 已选被外部清空时同步清掉手工输入,避免下次失焦又把旧编码加回来
|
||||||
|
watch(
|
||||||
|
() => props.modelValue,
|
||||||
|
(value) => {
|
||||||
|
if (!value?.length) {
|
||||||
|
manualText.value = ''
|
||||||
|
lastManualText.value = ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emptyText = computed(() => {
|
||||||
|
if (!warehouseId.value) return '请先选择仓库'
|
||||||
|
if (!areaId.value) return '请选择库区'
|
||||||
|
if (!rackId.value) return '请选择货架'
|
||||||
|
if (!spaces.value.length) return '该货架下暂无启用库位'
|
||||||
|
return '没有匹配的库位'
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 加载仓库列表(默认选中唯一仓库) */
|
||||||
|
async function loadWarehouses() {
|
||||||
|
warehouseLoading.value = true
|
||||||
|
try {
|
||||||
|
const res: any = await getWarehouseZones({})
|
||||||
|
const list = Array.isArray(res?.zones)
|
||||||
|
? res.zones
|
||||||
|
: Array.isArray(res?.data?.zones)
|
||||||
|
? res.data.zones
|
||||||
|
: []
|
||||||
|
warehouses.value = list.map((z: any) => toOption(z)).filter((z: Option) => z.id > 0)
|
||||||
|
const first = warehouses.value[0]
|
||||||
|
if (!warehouseId.value && warehouses.value.length === 1 && first) {
|
||||||
|
warehouseId.value = first.id
|
||||||
|
await loadTree()
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[stockcheck] 加载仓库列表失败', e)
|
||||||
|
ElMessage.error('加载仓库列表失败')
|
||||||
|
} finally {
|
||||||
|
warehouseLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 加载仓库下的库区/货架树(缓存 children 供库区切换复用) */
|
||||||
|
async function loadTree() {
|
||||||
|
areas.value = []
|
||||||
|
racks.value = []
|
||||||
|
treeChildren.value = []
|
||||||
|
if (!warehouseId.value) return
|
||||||
|
treeLoading.value = true
|
||||||
|
try {
|
||||||
|
const res: any = await getWarehouseTree(warehouseId.value)
|
||||||
|
const root = res?.warehouseRoot ?? res?.data?.warehouseRoot
|
||||||
|
const children = Array.isArray(root?.children) ? root.children : []
|
||||||
|
treeChildren.value = children
|
||||||
|
areas.value = children
|
||||||
|
.filter((node: any) => node?.type === 'area')
|
||||||
|
.map((node: any) => toOption(node))
|
||||||
|
.filter((node: Option) => node.id > 0)
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[stockcheck] 加载库区失败', e)
|
||||||
|
ElMessage.error('加载库区失败')
|
||||||
|
} finally {
|
||||||
|
treeLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 库区变化 → 收集库区下的货架(含通道层下的货架) */
|
||||||
|
function handleAreaChange() {
|
||||||
|
racks.value = []
|
||||||
|
spaces.value = []
|
||||||
|
rackId.value = undefined
|
||||||
|
if (!areaId.value) return
|
||||||
|
const areaNode = treeChildren.value.find(
|
||||||
|
(node: any) => Number(node?.id) === Number(areaId.value)
|
||||||
|
)
|
||||||
|
racks.value = collectByType(areaNode?.children ?? [], 'rack')
|
||||||
|
.map((node: any) => toOption(node))
|
||||||
|
.filter((node: Option) => node.id > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleWarehouseChange() {
|
||||||
|
areaId.value = undefined
|
||||||
|
rackId.value = undefined
|
||||||
|
spaces.value = []
|
||||||
|
keyword.value = ''
|
||||||
|
spacePage.value = 1
|
||||||
|
await loadTree()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 货架变化 → 拉取库位 */
|
||||||
|
async function handleRackChange() {
|
||||||
|
spaces.value = []
|
||||||
|
keyword.value = ''
|
||||||
|
spacePage.value = 1
|
||||||
|
if (!rackId.value) return
|
||||||
|
spaceLoading.value = true
|
||||||
|
try {
|
||||||
|
const res: any = await getSpacesByRack(rackId.value)
|
||||||
|
const list = Array.isArray(res?.spaces)
|
||||||
|
? res.spaces
|
||||||
|
: Array.isArray(res?.data?.spaces)
|
||||||
|
? res.data.spaces
|
||||||
|
: []
|
||||||
|
spaces.value = list
|
||||||
|
.filter((space: any) => space?.is_enabled !== false && Number(space?.is_enabled) !== 0)
|
||||||
|
.map((space: any) => ({
|
||||||
|
id: Number(space?.id) || 0,
|
||||||
|
space_code: String(space?.space_code ?? ''),
|
||||||
|
custom_name: space?.custom_name ? String(space.custom_name) : ''
|
||||||
|
}))
|
||||||
|
.filter((space: SpaceOption) => space.id > 0 && space.space_code !== '')
|
||||||
|
rememberSpaces(spaces.value)
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[stockcheck] 加载库位失败', e)
|
||||||
|
ElMessage.error('加载库位失败')
|
||||||
|
} finally {
|
||||||
|
spaceLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 已选维护 =====
|
||||||
|
/** 全选当前筛选结果(含跨页) */
|
||||||
|
function selectAllVisible() {
|
||||||
|
const ids = filteredSpaces.value.map((s) => s.id)
|
||||||
|
selected.value = [...new Set([...selected.value, ...ids])]
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearSelected() {
|
||||||
|
selected.value = []
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeSelected(id: number) {
|
||||||
|
selected.value = selected.value.filter((item) => item !== id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 手工输入的**库位编码**经验证后并入已选
|
||||||
|
*
|
||||||
|
* 走 index.searchSpaces(每个编码一次查询,最多 50 条)后按 space_code 精确匹配,
|
||||||
|
* 命中转成库位ID(提交走 addDetail 的 location_ids);未命中的编码提示且不并入。
|
||||||
|
*/
|
||||||
|
async function flushManualText() {
|
||||||
|
const text = manualText.value.trim()
|
||||||
|
if (!text || text === lastManualText.value) return
|
||||||
|
const codes = [
|
||||||
|
...new Set(
|
||||||
|
text
|
||||||
|
.split(/[\s,,、;;]+/)
|
||||||
|
.map((s) => s.trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
)
|
||||||
|
]
|
||||||
|
if (!codes.length) return
|
||||||
|
lastManualText.value = text
|
||||||
|
manualLoading.value = true
|
||||||
|
try {
|
||||||
|
const res: any = await searchSpaces({ keywords: codes })
|
||||||
|
const groups: any[] = Array.isArray(res?.data) ? res.data : []
|
||||||
|
const ids: number[] = []
|
||||||
|
const missing: string[] = []
|
||||||
|
codes.forEach((code, index) => {
|
||||||
|
const list = Array.isArray(groups[index]) ? groups[index] : []
|
||||||
|
const hit = list.find(
|
||||||
|
(space: any) => String(space?.space_code ?? '').toUpperCase() === code.toUpperCase()
|
||||||
|
)
|
||||||
|
const hitId = Number(hit?.id) || 0
|
||||||
|
if (hitId > 0) {
|
||||||
|
ids.push(hitId)
|
||||||
|
spaceLabelById[hitId] = hit?.custom_name
|
||||||
|
? `${hit.space_code}(${hit.custom_name})`
|
||||||
|
: String(hit?.space_code ?? code)
|
||||||
|
} else {
|
||||||
|
missing.push(code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if (ids.length) selected.value = [...new Set([...selected.value, ...ids])]
|
||||||
|
if (missing.length) {
|
||||||
|
ElMessage.warning(
|
||||||
|
`未识别库位编码:${missing.slice(0, 5).join('、')}${missing.length > 5 ? ' 等' : ''}`
|
||||||
|
)
|
||||||
|
} else if (ids.length) {
|
||||||
|
ElMessage.success(`已并入 ${ids.length} 个库位`)
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[stockcheck] 库位编码识别失败', e)
|
||||||
|
ElMessage.error('库位编码识别失败')
|
||||||
|
} finally {
|
||||||
|
manualLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
void loadWarehouses()
|
||||||
|
})
|
||||||
|
|
||||||
|
defineExpose({ reload: loadWarehouses })
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.location-picker {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cascade-row {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
|
||||||
|
.cascade-item {
|
||||||
|
width: 190px;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.space-toolbar {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
|
||||||
|
:deep(.el-button) {
|
||||||
|
margin-left: 0;
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-text {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #909399;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-link {
|
||||||
|
margin-left: auto;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.space-list {
|
||||||
|
min-height: 120px;
|
||||||
|
max-height: 260px;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 6px 8px;
|
||||||
|
border: 1px solid #ebeef5;
|
||||||
|
border-radius: 4px;
|
||||||
|
|
||||||
|
:deep(.el-checkbox-group) {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 2px 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.space-item {
|
||||||
|
margin-right: 0;
|
||||||
|
min-width: 150px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.space-name {
|
||||||
|
color: #909399;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.space-pager {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.selected-preview {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
min-height: 24px;
|
||||||
|
|
||||||
|
.hint-text {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #909399;
|
||||||
|
}
|
||||||
|
|
||||||
|
.location-tag {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty-tip {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 100px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: #c0c4cc;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@ -12,6 +12,7 @@
|
|||||||
行级聚合(checked_quantity/diff_quantity)**已含未知商品**,故不再平铺 unknown_items,
|
行级聚合(checked_quantity/diff_quantity)**已含未知商品**,故不再平铺 unknown_items,
|
||||||
改为在「商品名称」列提示「含未知商品 N 项」,避免合计重复展示
|
改为在「商品名称」列提示「含未知商品 N 项」,避免合计重复展示
|
||||||
- 库位行(scope_type=location,type=all/location):一行一个库位 + 行内商品各一行
|
- 库位行(scope_type=location,type=all/location):一行一个库位 + 行内商品各一行
|
||||||
|
<<<<<<< HEAD
|
||||||
(result 的 stocks[] 平铺)+ **未知商品各一行**(unknown_items 平铺,带「未知」标记);
|
(result 的 stocks[] 平铺)+ **未知商品各一行**(unknown_items 平铺,带「未知」标记);
|
||||||
行级合计不单独展示(只展示明细),所以平铺不会重复
|
行级合计不单独展示(只展示明细),所以平铺不会重复
|
||||||
2. 盘点作业:行内上报(stock.check.report,**覆盖式**:同明细+同商品+同库位重复上报为更新)
|
2. 盘点作业:行内上报(stock.check.report,**覆盖式**:同明细+同商品+同库位重复上报为更新)
|
||||||
@ -25,6 +26,17 @@
|
|||||||
未盘商品明细按实盘 0 计入盘亏与差异行数,未盘库位明细不计差异)
|
未盘商品明细按实盘 0 计入盘亏与差异行数,未盘库位明细不计差异)
|
||||||
4. 「添加商品 / 添加库位」交给宿主 index.vue 打开 CheckStockPickerDialog(emit add-items)
|
4. 「添加商品 / 添加库位」交给宿主 index.vue 打开 CheckStockPickerDialog(emit add-items)
|
||||||
5. 作业图片列:result 的 records[].images(RecordImages 缩略图 + 点击放大)
|
5. 作业图片列:result 的 records[].images(RecordImages 缩略图 + 点击放大)
|
||||||
|
=======
|
||||||
|
(result 的 stocks[] 平铺;无商品时保留库位行本身、商品列为 —)
|
||||||
|
上报需带 stock_id → 商品行直接上报;同明细的「明细类型 / 库位」单元格合并显示
|
||||||
|
2. 盘点作业:行内或批量上报(stock.check.report,**覆盖式**:
|
||||||
|
商品行=同明细+同库位;库位行=同明细+同商品+同库位,均重复上报为更新)
|
||||||
|
3. 批量删除明细(stock.check.detailDelete,仅 created/rejected):勾选行按**明细ID**去重提交,
|
||||||
|
单次上限 200 条;未命中的明细ID由服务端计入 skipped_ids(不报错)
|
||||||
|
4. 完成盘点(stock.check.finish,允许部分未盘完成:
|
||||||
|
未盘商品明细按实盘 0 计入盘亏与差异行数,未盘库位明细不计差异)
|
||||||
|
5. 「添加商品 / 添加库位」交给宿主 index.vue 打开 CheckStockPickerDialog(emit add-items)
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
|
|
||||||
状态约束(与后端一致):
|
状态约束(与后端一致):
|
||||||
- created/rejected → 可添加明细(商品类 addDetail / 库位类 addLocationDetail)
|
- created/rejected → 可添加明细(商品类 addDetail / 库位类 addLocationDetail)
|
||||||
@ -41,6 +53,17 @@
|
|||||||
<el-button v-if="canAddItems" size="small" type="primary" plain @click="emit('add-items')">
|
<el-button v-if="canAddItems" size="small" type="primary" plain @click="emit('add-items')">
|
||||||
{{ isLocationTask ? '添加库位' : '添加商品' }}
|
{{ isLocationTask ? '添加库位' : '添加商品' }}
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
v-if="canAddItems"
|
||||||
|
size="small"
|
||||||
|
type="danger"
|
||||||
|
plain
|
||||||
|
:disabled="!selectedDetailIds.length"
|
||||||
|
:loading="deleting"
|
||||||
|
@click="deleteSelected"
|
||||||
|
>
|
||||||
|
批量删除明细{{ selectedDetailIds.length ? `(${selectedDetailIds.length})` : '' }}
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="canReport && !isLocationTask"
|
v-if="canReport && !isLocationTask"
|
||||||
size="small"
|
size="small"
|
||||||
@ -83,7 +106,10 @@
|
|||||||
size="small"
|
size="small"
|
||||||
:height="tableHeight"
|
:height="tableHeight"
|
||||||
:span-method="spanMethod"
|
:span-method="spanMethod"
|
||||||
|
@selection-change="handleSelectionChange"
|
||||||
>
|
>
|
||||||
|
<!-- 批量删除:仅 created/rejected(可增删明细)时提供勾选,按明细ID去重提交 -->
|
||||||
|
<el-table-column v-if="canAddItems" type="selection" width="45" :reserve-selection="true" />
|
||||||
<el-table-column type="index" label="#" width="56" align="center" :index="indexMethod" />
|
<el-table-column type="index" label="#" width="56" align="center" :index="indexMethod" />
|
||||||
<!-- 明细类型:商品行 / 库位行(同一单内由任务 type 决定,显式标注便于核对) -->
|
<!-- 明细类型:商品行 / 库位行(同一单内由任务 type 决定,显式标注便于核对) -->
|
||||||
<el-table-column label="明细类型" width="90" align="center">
|
<el-table-column label="明细类型" width="90" align="center">
|
||||||
@ -249,6 +275,7 @@ import RecordImages from './RecordImages.vue'
|
|||||||
import CheckReportDialog from './CheckReportDialog.vue'
|
import CheckReportDialog from './CheckReportDialog.vue'
|
||||||
import {
|
import {
|
||||||
stockCheckDetail,
|
stockCheckDetail,
|
||||||
|
stockCheckDetailDelete,
|
||||||
stockCheckFinish,
|
stockCheckFinish,
|
||||||
stockCheckMarkEmpty,
|
stockCheckMarkEmpty,
|
||||||
stockCheckReport,
|
stockCheckReport,
|
||||||
@ -559,6 +586,8 @@ async function loadItems() {
|
|||||||
stats.checked = Number(check.checked_items ?? 0) || 0
|
stats.checked = Number(check.checked_items ?? 0) || 0
|
||||||
stats.diff = Number(check.diff_items ?? 0) || 0
|
stats.diff = Number(check.diff_items ?? 0) || 0
|
||||||
resetInputs()
|
resetInputs()
|
||||||
|
selectedRows.value = []
|
||||||
|
nextTick(() => tableRef.value?.clearSelection?.())
|
||||||
page.value = 1
|
page.value = 1
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
console.error('[stockcheck] 加载盘点明细失败', e)
|
console.error('[stockcheck] 加载盘点明细失败', e)
|
||||||
@ -639,6 +668,72 @@ function resetInputs() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ============================================================
|
||||||
|
// 批量删除明细(stock.check.detailDelete,仅 created/rejected)
|
||||||
|
// ============================================================
|
||||||
|
const selectedRows = ref<Record<string, any>[]>([])
|
||||||
|
const deleting = ref(false)
|
||||||
|
|
||||||
|
/** 选中行对应的明细ID(按明细去重:库位行平铺后同一明细可能对应多行) */
|
||||||
|
const selectedDetailIds = computed<number[]>(() => {
|
||||||
|
const ids = selectedRows.value.map((row) =>
|
||||||
|
Number(row?.detail_id ?? row?.item?.id ?? row?.id)
|
||||||
|
)
|
||||||
|
return [...new Set(ids.filter((id) => Number.isFinite(id) && id > 0))]
|
||||||
|
})
|
||||||
|
|
||||||
|
function handleSelectionChange(rows: Record<string, any>[]) {
|
||||||
|
selectedRows.value = Array.isArray(rows) ? rows : []
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 批量删除选中的盘点明细(单次上限 200,与后端一致) */
|
||||||
|
async function deleteSelected() {
|
||||||
|
const ids = selectedDetailIds.value
|
||||||
|
if (!ids.length) {
|
||||||
|
ElMessage.warning('请先勾选要删除的盘点明细')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (ids.length > 200) {
|
||||||
|
ElMessage.warning(`单次最多删除 200 条明细(已选 ${ids.length} 条),请分批删除`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await ElMessageBox.confirm(
|
||||||
|
`确定删除选中的 ${ids.length} 个盘点明细?删除后需重新添加。`,
|
||||||
|
'批量删除盘点明细',
|
||||||
|
{ confirmButtonText: '确定删除', cancelButtonText: '取消', type: 'warning' }
|
||||||
|
)
|
||||||
|
} catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
deleting.value = true
|
||||||
|
try {
|
||||||
|
const res: any = await stockCheckDetailDelete({ id: taskId.value, detail_ids: ids })
|
||||||
|
if (!isCheckApiSuccess(res)) {
|
||||||
|
throw new Error(res?.message || '删除盘点明细失败')
|
||||||
|
}
|
||||||
|
const data = res.data ?? res
|
||||||
|
const deletedCount = Number(data.deleted_count ?? 0)
|
||||||
|
const skippedIds: number[] = Array.isArray(data.skipped_ids) ? data.skipped_ids : []
|
||||||
|
if (skippedIds.length) {
|
||||||
|
ElMessage.warning(
|
||||||
|
`已删除 ${deletedCount} 条明细,跳过 ${skippedIds.length} 条(不存在或不属于当前仓库)`
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
ElMessage.success(`已删除 ${deletedCount} 条盘点明细`)
|
||||||
|
}
|
||||||
|
// loadItems 内部会重置页码与勾选
|
||||||
|
await loadItems()
|
||||||
|
emit('changed')
|
||||||
|
} catch (e: any) {
|
||||||
|
console.error('[stockcheck] 删除盘点明细失败', e)
|
||||||
|
ElMessage.error(e?.message || '删除盘点明细失败')
|
||||||
|
} finally {
|
||||||
|
deleting.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ============================================================
|
// ============================================================
|
||||||
// 上报实盘(stock.check.report)
|
// 上报实盘(stock.check.report)
|
||||||
// ============================================================
|
// ============================================================
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
CheckStockPickerDialog — 添加盘点明细
|
CheckStockPickerDialog — 添加盘点明细
|
||||||
|
|
||||||
两种模式(由来源盘点单的 type 决定):
|
两种模式(由来源盘点单的 type 决定):
|
||||||
|
<<<<<<< HEAD
|
||||||
- 商品类(type=store/goods):从 storage.inventory.list 选商品 → stock.check.addDetail 传 stock_ids
|
- 商品类(type=store/goods):从 storage.inventory.list 选商品 → stock.check.addDetail 传 stock_ids
|
||||||
- 库位类(type=all/location):从库位列表(index.searchSpace)勾选库位 →
|
- 库位类(type=all/location):从库位列表(index.searchSpace)勾选库位 →
|
||||||
· 已勾选库位 → stock.check.addLocationDetail 传 location_ids(库位ID直查,不解析编码)
|
· 已勾选库位 → stock.check.addLocationDetail 传 location_ids(库位ID直查,不解析编码)
|
||||||
@ -10,6 +11,16 @@
|
|||||||
|
|
||||||
无效项提示:addLocationDetail → invalid_location_ids;addDetail → invalid_stock_ids / invalid_locations。
|
无效项提示:addLocationDetail → invalid_location_ids;addDetail → invalid_stock_ids / invalid_locations。
|
||||||
仅 created(新建)/ rejected(驳回)状态可添加,后端会校验。
|
仅 created(新建)/ rejected(驳回)状态可添加,后端会校验。
|
||||||
|
=======
|
||||||
|
- 商品类(type=store/goods):从 storage.inventory.list 选商品 → 传 stock_ids
|
||||||
|
- 库位类(type=all/location):LocationPicker 逐层下拉(仓库 → 库区 → 货架 → 库位)选择
|
||||||
|
→ 传 **location_ids**(wms_location_space.id,服务端按 id + warehouse_id 直查校验,
|
||||||
|
优先于 locations 编码;新契约下不再走编码二次解析)
|
||||||
|
· type=all 不选库位 = 不传库位/库位ID,由后端自动拉取全仓启用库位
|
||||||
|
|
||||||
|
响应含 invalid_stock_ids(商品)/ invalid_locations(无效编码)/ invalid_location_ids(无效库位ID)三类无效项,
|
||||||
|
均需在提示中体现。仅 created(新建)/ rejected(驳回)状态可添加,后端会校验。
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
@ -93,7 +104,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<!-- ===== 库位类任务:勾选库位(location_ids)→ addLocationDetail ===== -->
|
<!-- ===== 库位类任务:勾选库位(location_ids)→ addLocationDetail ===== -->
|
||||||
|
=======
|
||||||
|
<!-- ===== 库位类任务:逐层下拉(仓库 → 库区 → 货架 → 库位)选择 → locations ===== -->
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<el-alert
|
<el-alert
|
||||||
type="info"
|
type="info"
|
||||||
@ -101,6 +116,7 @@
|
|||||||
show-icon
|
show-icon
|
||||||
:title="locationAlertText"
|
:title="locationAlertText"
|
||||||
/>
|
/>
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
<!-- 库位筛选 -->
|
<!-- 库位筛选 -->
|
||||||
<div class="picker-filters">
|
<div class="picker-filters">
|
||||||
@ -201,12 +217,23 @@
|
|||||||
<div class="stat-text">已识别 {{ locationCodes.length }} 个库位编码</div>
|
<div class="stat-text">已识别 {{ locationCodes.length }} 个库位编码</div>
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
</el-collapse>
|
</el-collapse>
|
||||||
|
=======
|
||||||
|
<LocationPicker v-model="locationIds" :allow-empty="taskType === 'all'" />
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
|
<<<<<<< HEAD
|
||||||
<span class="selected-tip">{{ submitChannelTip }}</span>
|
<span class="selected-tip">{{ submitChannelTip }}</span>
|
||||||
|
=======
|
||||||
|
<span class="selected-tip">
|
||||||
|
{{ isLocationMode
|
||||||
|
? `已选 ${locationIds.length} 个库位`
|
||||||
|
: `已选 ${selectedRows.length} 行 · 去重后 ${selectedStockIds.length} 个商品` }}
|
||||||
|
</span>
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
<div class="footer-buttons">
|
<div class="footer-buttons">
|
||||||
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
@ -235,6 +262,7 @@ import {
|
|||||||
stockCheckAddLocationDetail,
|
stockCheckAddLocationDetail,
|
||||||
type StockCheckAddDetailParams
|
type StockCheckAddDetailParams
|
||||||
} from '@/api/stock.check/stock.check'
|
} from '@/api/stock.check/stock.check'
|
||||||
|
import LocationPicker from '../components/LocationPicker.vue'
|
||||||
import { isCheckApiSuccess, isLocationScopeType } from '../config/template-config'
|
import { isCheckApiSuccess, isLocationScopeType } from '../config/template-config'
|
||||||
|
|
||||||
defineOptions({ name: 'CheckStockPickerDialog' })
|
defineOptions({ name: 'CheckStockPickerDialog' })
|
||||||
@ -263,6 +291,7 @@ const dialogTitle = computed(() => {
|
|||||||
return isLocationMode.value ? `添加盘点库位${suffix}` : `添加盘点商品${suffix}`
|
return isLocationMode.value ? `添加盘点库位${suffix}` : `添加盘点商品${suffix}`
|
||||||
})
|
})
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
// ===== 库位模式:库位选择(多选,主通道) =====
|
// ===== 库位模式:库位选择(多选,主通道) =====
|
||||||
const spaceFilters = reactive({ keyword: '' })
|
const spaceFilters = reactive({ keyword: '' })
|
||||||
const spaceRows = ref<Record<string, any>[]>([])
|
const spaceRows = ref<Record<string, any>[]>([])
|
||||||
@ -313,6 +342,21 @@ const canSubmit = computed(() => {
|
|||||||
selectedLocationIds.value.length > 0 || locationCodes.value.length > 0 || props.taskType === 'all'
|
selectedLocationIds.value.length > 0 || locationCodes.value.length > 0 || props.taskType === 'all'
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
// ===== 库位模式 =====
|
||||||
|
/** 已选库位ID(wms_location_space.id,由 LocationPicker 逐层选择维护;type=all 可留空) */
|
||||||
|
const locationIds = ref<number[]>([])
|
||||||
|
|
||||||
|
const locationAlertText = computed(() =>
|
||||||
|
props.taskType === 'all'
|
||||||
|
? '按库位盘点(默认全仓):逐层选择库位,不选时由后端自动拉取全仓库启用库位生成盘点范围。'
|
||||||
|
: '按库位盘点:请逐层(仓库 → 库区 → 货架)选择要盘点的库位;不存在的库位会被后端列入无效库位。'
|
||||||
|
)
|
||||||
|
|
||||||
|
/** 库位模式:选了库位,或 all 类型(允许不选=全仓) */
|
||||||
|
const canSubmit = computed(() => {
|
||||||
|
if (isLocationMode.value) return locationIds.value.length > 0 || props.taskType === 'all'
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
return selectedStockIds.value.length > 0
|
return selectedStockIds.value.length > 0
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -373,11 +417,15 @@ function handleClosed() {
|
|||||||
selectedRows.value = []
|
selectedRows.value = []
|
||||||
selectedSpaceRows.value = []
|
selectedSpaceRows.value = []
|
||||||
rows.value = []
|
rows.value = []
|
||||||
|
<<<<<<< HEAD
|
||||||
spaceRows.value = []
|
spaceRows.value = []
|
||||||
spacePagination.page = 1
|
spacePagination.page = 1
|
||||||
spacePagination.total = 0
|
spacePagination.total = 0
|
||||||
spaceFilters.keyword = ''
|
spaceFilters.keyword = ''
|
||||||
locationText.value = ''
|
locationText.value = ''
|
||||||
|
=======
|
||||||
|
locationIds.value = []
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
submitting.value = false
|
submitting.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -610,6 +658,7 @@ async function submitLocationRows(taskId: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const payload: StockCheckAddDetailParams = { id: taskId }
|
const payload: StockCheckAddDetailParams = { id: taskId }
|
||||||
|
<<<<<<< HEAD
|
||||||
if (locationCodes.value.length > 0) {
|
if (locationCodes.value.length > 0) {
|
||||||
payload.locations = locationCodes.value
|
payload.locations = locationCodes.value
|
||||||
} else if (props.taskType === 'all') {
|
} else if (props.taskType === 'all') {
|
||||||
@ -621,6 +670,33 @@ async function submitLocationRows(taskId: number) {
|
|||||||
{ confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning' }
|
{ confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning' }
|
||||||
)
|
)
|
||||||
} catch {
|
} catch {
|
||||||
|
=======
|
||||||
|
if (isLocationMode.value) {
|
||||||
|
const ids = locationIds.value
|
||||||
|
if (!ids.length) {
|
||||||
|
if (props.taskType !== 'all') {
|
||||||
|
ElMessage.warning('请至少选择一个库位')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// type=all:不传库位(也不传库位ID),由后端自动拉取全仓启用库位
|
||||||
|
try {
|
||||||
|
await ElMessageBox.confirm(
|
||||||
|
'未选择库位,将由后端自动拉取全仓库启用库位生成盘点范围,确定继续?',
|
||||||
|
'添加盘点库位',
|
||||||
|
{ confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning' }
|
||||||
|
)
|
||||||
|
} catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 新契约:库位ID直查(id + warehouse_id 校验,不再按编码二次解析),优先于 locations
|
||||||
|
payload.location_ids = ids
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const stockIds = selectedStockIds.value
|
||||||
|
if (!stockIds.length) {
|
||||||
|
ElMessage.warning('请先勾选要盘点的商品')
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -631,12 +707,36 @@ async function submitLocationRows(taskId: number) {
|
|||||||
submitting.value = true
|
submitting.value = true
|
||||||
try {
|
try {
|
||||||
const res: any = await stockCheckAddDetail(payload)
|
const res: any = await stockCheckAddDetail(payload)
|
||||||
|
<<<<<<< HEAD
|
||||||
const data = res?.data ?? res
|
const data = res?.data ?? res
|
||||||
const result = resolveAddResult(res, {
|
const result = resolveAddResult(res, {
|
||||||
codes: toStringList(data?.invalid_locations),
|
codes: toStringList(data?.invalid_locations),
|
||||||
// 编码通道一般不会返回库位ID无效项,兜底提示(addDetail 响应的新增字段)
|
// 编码通道一般不会返回库位ID无效项,兜底提示(addDetail 响应的新增字段)
|
||||||
ids: toNumberList(data?.invalid_location_ids)
|
ids: toNumberList(data?.invalid_location_ids)
|
||||||
})
|
})
|
||||||
|
=======
|
||||||
|
if (!isCheckApiSuccess(res)) {
|
||||||
|
throw new Error(res?.message || '添加盘点明细失败')
|
||||||
|
}
|
||||||
|
const data = res.data ?? res
|
||||||
|
const added = Number(data.added ?? 0)
|
||||||
|
const skipped = Number(data.skipped ?? 0)
|
||||||
|
const invalidStocks: number[] = Array.isArray(data.invalid_stock_ids) ? data.invalid_stock_ids : []
|
||||||
|
const invalidLocations: string[] = Array.isArray(data.invalid_locations) ? data.invalid_locations : []
|
||||||
|
const invalidLocationIds: number[] = Array.isArray(data.invalid_location_ids)
|
||||||
|
? data.invalid_location_ids
|
||||||
|
: []
|
||||||
|
const parts = [`新增 ${added} 项`]
|
||||||
|
if (skipped) parts.push(`跳过已存在 ${skipped} 项`)
|
||||||
|
if (invalidStocks.length) parts.push(`无效商品 ${invalidStocks.length} 个`)
|
||||||
|
if (invalidLocations.length) parts.push(`无效库位编码 ${invalidLocations.length} 个`)
|
||||||
|
if (invalidLocationIds.length) parts.push(`无效库位 ${invalidLocationIds.length} 个`)
|
||||||
|
if (invalidStocks.length || invalidLocations.length || invalidLocationIds.length) {
|
||||||
|
ElMessage.warning(parts.join(','))
|
||||||
|
} else {
|
||||||
|
ElMessage.success(parts.join(','))
|
||||||
|
}
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
emit('update:visible', false)
|
emit('update:visible', false)
|
||||||
emit('success', result)
|
emit('success', result)
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
@ -680,6 +780,7 @@ watch(
|
|||||||
pagination.total = 0
|
pagination.total = 0
|
||||||
selectedRows.value = []
|
selectedRows.value = []
|
||||||
rows.value = []
|
rows.value = []
|
||||||
|
<<<<<<< HEAD
|
||||||
locationText.value = ''
|
locationText.value = ''
|
||||||
spaceFilters.keyword = ''
|
spaceFilters.keyword = ''
|
||||||
spacePagination.page = 1
|
spacePagination.page = 1
|
||||||
@ -693,6 +794,12 @@ watch(
|
|||||||
// 两种模式各自拉数据:商品模式拉库存列表,库位模式拉库位列表
|
// 两种模式各自拉数据:商品模式拉库存列表,库位模式拉库位列表
|
||||||
if (isLocationMode.value) void loadSpaceRows()
|
if (isLocationMode.value) void loadSpaceRows()
|
||||||
else void loadRows()
|
else void loadRows()
|
||||||
|
=======
|
||||||
|
locationIds.value = []
|
||||||
|
nextTick(() => tableRef.value?.clearSelection?.())
|
||||||
|
// 库位模式不需要拉库存列表
|
||||||
|
if (!isLocationMode.value) void loadRows()
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
</script>
|
</script>
|
||||||
@ -733,6 +840,7 @@ watch(
|
|||||||
color: #909399;
|
color: #909399;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
/* 库位模式:预览已识别的库位编码 */
|
/* 库位模式:预览已识别的库位编码 */
|
||||||
.location-preview {
|
.location-preview {
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -768,6 +876,9 @@ watch(
|
|||||||
.location-tag {
|
.location-tag {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
/* 库位模式:已选的库位编码由 LocationPicker 内部展示预览 */
|
||||||
|
>>>>>>> eb305306eb361e3daf832ac0dc9afa2ed0a35415
|
||||||
|
|
||||||
.stat-text {
|
.stat-text {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
|||||||
@ -1,131 +0,0 @@
|
|||||||
storageQuantityMap,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* å°†å<E280A0>•æ<E280A2>¡ç›˜ç‚¹æ˜Žç»†æ ¼å¼<C3A5>化为è<C2BA>šå<C5A1>ˆè¾“出行ã€?
|
|
||||||
* 商å“<C3A5>行:è<C5A1>šå<C5A1>ˆä½œä¸šè®°å½•输出已盘数é‡<C3A9>/差异/库ä½<C3A4>列表ç‰ï¼›
|
|
||||||
* 库ä½<C3A4>行:按商å“<C3A5>è<EFBFBD>šå<C5A1>ˆä½œä¸šè®°å½•输å‡?stocks 列表(å<CB86>« wms_storage è´¦é<C2A6>¢ä¸Žå·®å¼‚)ã€?
|
|
||||||
*
|
|
||||||
* @param {Object} params æ ¼å¼<C3A5>化å<E28093>‚æ•°ã€?
|
|
||||||
* @param {Object} params.detailRow 明细原始行�
|
|
||||||
* @param {Map<number, Array<Object>>} params.recordsByDetail 按明细ID分组的作业记录�
|
|
||||||
* @param {Map<number, Object>} params.stockMap 商å“<C3A5>å¿«ç…§æ˜ å°„ã€?
|
|
||||||
* @param {Map<string, number>} params.storageQuantityMap 库ä½<C3A4>商å“<C3A5>è´¦é<C2A6>¢æ•°é‡<C3A9>æ˜ å°„ï¼ˆé”® `${space_id}_${stock_id}`)ã€?
|
|
||||||
* @return {Object} æ ¼å¼<C3A5>化å<E28093>Žçš„æ˜Žç»†è¡Œã€?
|
|
||||||
*/
|
|
||||||
_formatDetailAggregationRow(params = {}) {
|
|
||||||
const { detailRow, recordsByDetail, stockMap, storageQuantityMap } = params;
|
|
||||||
const detailRowId = Number(detailRow.id);
|
|
||||||
const scopeType = (detailRow.scope_type || 'goods') === 'location' ? 'location' : 'goods';
|
|
||||||
const detailRecords = recordsByDetail.get(detailRowId) || [];
|
|
||||||
|
|
||||||
const locationCodes = [ ...new Set(detailRecords
|
|
||||||
.map(record => String(record.location_code || '').trim())
|
|
||||||
.filter(Boolean)) ];
|
|
||||||
const checkers = [ ...new Set(detailRecords
|
|
||||||
.map(record => String(record.checker_name || '').trim())
|
|
||||||
.filter(Boolean)) ];
|
|
||||||
const lastCheckedAt = detailRecords.length > 0
|
|
||||||
? detailRecords[detailRecords.length - 1].checked_at
|
|
||||||
: null;
|
|
||||||
|
|
||||||
// 按库ä½<C3A4>è<EFBFBD>šå<C5A1>ˆä½œä¸šè®°å½•(库ä½<C3A4>为空归入"æ— åº“ä½?分组,location_code ä¸?null),按首æ<E28093>¡è®°å½?id å<>‡åº<C3A5>
|
|
||||||
const locationGroups = new Map();
|
|
||||||
for (const record of detailRecords) {
|
|
||||||
const recordLocationCode = record.location_code !== null && record.location_code !== undefined
|
|
||||||
? String(record.location_code).trim()
|
|
||||||
: '';
|
|
||||||
if (!locationGroups.has(recordLocationCode)) {
|
|
||||||
locationGroups.set(recordLocationCode, {
|
|
||||||
location_id: recordLocationCode ? (Number(record.location_id) || null) : null,
|
|
||||||
location_code: recordLocationCode || null,
|
|
||||||
quantity: 0,
|
|
||||||
first_record_id: Number(record.id) || 0,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const locationGroup = locationGroups.get(recordLocationCode);
|
|
||||||
locationGroup.quantity += Number(record.quantity) || 0;
|
|
||||||
}
|
|
||||||
const locations = [ ...locationGroups.values() ]
|
|
||||||
.sort((left, right) => left.first_record_id - right.first_record_id)
|
|
||||||
.map(locationGroup => ({
|
|
||||||
location_id: locationGroup.location_id,
|
|
||||||
location_code: locationGroup.location_code,
|
|
||||||
quantity: locationGroup.quantity,
|
|
||||||
}));
|
|
||||||
|
|
||||||
const base = {
|
|
||||||
...detailRow,
|
|
||||||
scope_type: scopeType,
|
|
||||||
location_codes: locationCodes,
|
|
||||||
checkers,
|
|
||||||
last_checked_at: lastCheckedAt,
|
|
||||||
records: detailRecords,
|
|
||||||
locations,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (scopeType === 'goods') {
|
|
||||||
const checkedQuantity = detailRecords.reduce((sum, record) => sum + (Number(record.quantity) || 0), 0);
|
|
||||||
const diffQuantity = checkedQuantity - Number(detailRow.system_quantity || 0);
|
|
||||||
return {
|
|
||||||
...base,
|
|
||||||
checked_quantity: detailRecords.length > 0 ? checkedQuantity : null,
|
|
||||||
diff_quantity: detailRecords.length > 0 ? diffQuantity : null,
|
|
||||||
is_diff: detailRecords.length > 0 && diffQuantity !== 0 ? 1 : 0,
|
|
||||||
status: detailRecords.length > 0 ? 'checked' : 'unchecked',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// 库ä½<C3A4>行:按商å“<C3A5>è<EFBFBD>šå<C5A1>ˆè®°å½•,账é<C2A6>¢ä»?wms_storage å<>–(location_id 为空时账é<C2A6>¢æŒ‰ 0ï¼?
|
|
||||||
const quantityByStock = new Map();
|
|
||||||
for (const record of detailRecords) {
|
|
||||||
const stockId = Number(record.stock_id);
|
|
||||||
if (!Number.isInteger(stockId) || stockId <= 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const agg = quantityByStock.get(stockId) || { checked: 0 };
|
|
||||||
agg.checked += Number(record.quantity) || 0;
|
|
||||||
quantityByStock.set(stockId, agg);
|
|
||||||
}
|
|
||||||
const locationId = detailRow.location_id !== null && detailRow.location_id !== undefined
|
|
||||||
? Number(detailRow.location_id)
|
|
||||||
: 0;
|
|
||||||
let checkedQuantity = 0;
|
|
||||||
let diffQuantitySum = 0;
|
|
||||||
let hasDiff = false;
|
|
||||||
const stocks = [ ...quantityByStock.keys() ]
|
|
||||||
.sort((left, right) => left - right)
|
|
||||||
.map(stockId => {
|
|
||||||
const agg = quantityByStock.get(stockId);
|
|
||||||
const stock = stockMap.get(stockId) || {};
|
|
||||||
const systemQuantity = locationId > 0
|
|
||||||
? (storageQuantityMap.get(`${locationId}_${stockId}`) || 0)
|
|
||||||
: 0;
|
|
||||||
const diffQuantity = agg.checked - systemQuantity;
|
|
||||||
checkedQuantity += agg.checked;
|
|
||||||
diffQuantitySum += diffQuantity;
|
|
||||||
if (diffQuantity !== 0) {
|
|
||||||
hasDiff = true;
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
stock_id: stockId,
|
|
||||||
item_code: stock.item_code || null,
|
|
||||||
item_name: stock.item_name || null,
|
|
||||||
system_quantity: systemQuantity,
|
|
||||||
checked_quantity: agg.checked,
|
|
||||||
diff_quantity: diffQuantity,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
...base,
|
|
||||||
stocks,
|
|
||||||
checked_quantity: detailRecords.length > 0 ? checkedQuantity : null,
|
|
||||||
diff_quantity: detailRecords.length > 0 ? diffQuantitySum : null,
|
|
||||||
is_diff: hasDiff ? 1 : 0,
|
|
||||||
status: detailRecords.length > 0 ? 'checked' : 'unchecked',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
Loading…
x
Reference in New Issue
Block a user