1
This commit is contained in:
parent
4d89cd31d0
commit
72127ac45e
File diff suppressed because it is too large
Load Diff
@ -31,7 +31,7 @@
|
||||
:disabled="isDisabled(btn)"
|
||||
@click.stop="handleActionClick(btn)"
|
||||
>
|
||||
{{ btn.label }}
|
||||
{{ resolveLabel(btn) }}
|
||||
</el-button>
|
||||
|
||||
<!-- form 按钮:打开表单弹窗 -->
|
||||
@ -43,7 +43,7 @@
|
||||
:disabled="isDisabled(btn)"
|
||||
@click.stop="openForm(btn)"
|
||||
>
|
||||
{{ btn.label }}
|
||||
{{ resolveLabel(btn) }}
|
||||
</el-button>
|
||||
|
||||
<!-- 表单弹窗 -->
|
||||
@ -168,6 +168,19 @@ function isVisible(btn: OperationButtonConfig): boolean {
|
||||
}
|
||||
}
|
||||
|
||||
/** 按钮文案:labelWhen(row) 优先,返回空则回退静态 label */
|
||||
function resolveLabel(btn: OperationButtonConfig): string {
|
||||
if (typeof btn.labelWhen === 'function') {
|
||||
try {
|
||||
const dynamic = btn.labelWhen(props.row)
|
||||
if (dynamic) return dynamic
|
||||
} catch {
|
||||
/* 忽略,回退静态 label */
|
||||
}
|
||||
}
|
||||
return btn.label
|
||||
}
|
||||
|
||||
function isDisabled(btn: OperationButtonConfig): boolean {
|
||||
if (btn.disabledOnField) {
|
||||
const val = props.row[btn.disabledOnField]
|
||||
|
||||
@ -8,18 +8,26 @@
|
||||
- 尚未开始作业的阶段(created/rejected/submitted,必然无作业记录)→ **stock.check.detail**
|
||||
(纯范围行,不含聚合;此时作业类列不渲染,无需多发一次聚合查询)
|
||||
明细行形态由任务 type 决定,表格统一「平铺」展示(不用展开行):
|
||||
- 商品行(scope_type=goods,type=store/goods):一行一个库存商品(商品快照 + 已盘聚合)
|
||||
- 商品行(scope_type=goods,type=store/goods):一行一个库存商品(商品快照 + 已盘聚合);
|
||||
行级聚合(checked_quantity/diff_quantity)**已含未知商品**,故不再平铺 unknown_items,
|
||||
改为在「商品名称」列提示「含未知商品 N 项」,避免合计重复展示
|
||||
- 库位行(scope_type=location,type=all/location):一行一个库位 + 行内商品各一行
|
||||
(result 的 stocks[] 平铺;无商品时保留库位行本身、商品列为 —)
|
||||
上报需带 stock_id → 商品行直接上报;同明细的「明细类型 / 库位」单元格合并显示
|
||||
2. 盘点作业:行内或批量上报(stock.check.report,**覆盖式**:
|
||||
商品行=同明细+同库位;库位行=同明细+同商品+同库位,均重复上报为更新)
|
||||
3. 完成盘点(stock.check.finish,允许部分未盘完成:
|
||||
(result 的 stocks[] 平铺)+ **未知商品各一行**(unknown_items 平铺,带「未知」标记);
|
||||
行级合计不单独展示(只展示明细),所以平铺不会重复
|
||||
2. 盘点作业:行内上报(stock.check.report,**覆盖式**:同明细+同商品+同库位重复上报为更新)
|
||||
· 行内「上报」→ CheckReportDialog 弹窗(可填实盘数量与「未匹配条码」):
|
||||
填了条码 → 后端按条码匹配系统商品,命中=已知商品;未命中记**未知商品**(无账面,实盘>0 即盘盈)
|
||||
· 批量上报(仅商品类,行内数量列):逐行串行提交,不走弹窗
|
||||
2b. 标记库位为空(stock.check.markEmpty,仅库位类任务的**无商品库位行**):
|
||||
写空标记记录(quantity=0、is_empty=1)并清除该库位下商品记录;空标记计入已盘,
|
||||
库位账面有库存时计入盘亏;已标记空的行展示「空库位」 tag。
|
||||
3. 完成盘点(stock.check.finish,允许部分未盘完成:
|
||||
未盘商品明细按实盘 0 计入盘亏与差异行数,未盘库位明细不计差异)
|
||||
4. 「添加商品 / 添加库位」交给宿主 index.vue 打开 CheckStockPickerDialog(emit add-items)
|
||||
4. 「添加商品 / 添加库位」交给宿主 index.vue 打开 CheckStockPickerDialog(emit add-items)
|
||||
5. 作业图片列:result 的 records[].images(RecordImages 缩略图 + 点击放大)
|
||||
|
||||
状态约束(与后端一致):
|
||||
- created/rejected → 可添加明细(addDetail)
|
||||
- created/rejected → 可添加明细(商品类 addDetail / 库位类 addLocationDetail)
|
||||
- approved/checking → 可上报(report)、可完成(finish)
|
||||
- mode=blind 盲盘 → 账面数量/差异在前端不可见
|
||||
- 明细 status:checked=有作业记录 / unchecked=未盘
|
||||
@ -86,7 +94,13 @@
|
||||
<template #default="{ row }">{{ row.item_code || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="!isLocationTask" label="商品名称" min-width="160" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.item_name || '—' }}</template>
|
||||
<template #default="{ row }">
|
||||
<span>{{ row.item_name || '—' }}</span>
|
||||
<!-- 商品行的聚合值已含未知商品(result 的 unknown_items),此处仅提示数量,不再平铺(避免重复) -->
|
||||
<el-tag v-if="row.unknown_count" type="warning" size="small" class="unknown-tag">
|
||||
含未知商品 {{ row.unknown_count }} 项
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="!isLocationTask" label="规格" min-width="110" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.spec || '—' }}</template>
|
||||
@ -107,7 +121,19 @@
|
||||
<span v-else>{{ formatLocationCodes(row) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 账面/实盘输入列:仅商品类任务(库位类任务不在此面板上报) -->
|
||||
<!-- 库位类任务:商品 / 条码(已知商品取 result 的 stocks 快照;未知商品行显示条码) -->
|
||||
<el-table-column v-if="isLocationTask" label="商品 / 条码" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.item?.is_empty" type="info" size="small" class="unknown-tag">空库位</el-tag>
|
||||
<el-tag v-else-if="row.is_unknown" type="warning" size="small" class="unknown-tag">未知</el-tag>
|
||||
<template v-if="row.item_name || row.item_code">
|
||||
{{ row.item_name || '—' }}
|
||||
<span v-if="row.item_code" class="hint-text">{{ row.item_code }}</span>
|
||||
</template>
|
||||
<span v-else-if="!row.item?.is_empty" class="hint-text">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 账面/实盘输入列:仅商品类任务(库位类任务的实盘数量在「上报」弹窗里填) -->
|
||||
<el-table-column v-if="!isLocationTask" label="账面数量" width="100" align="center">
|
||||
<template #default="{ row }">{{ maskQuantity(row.system_quantity) }}</template>
|
||||
</el-table-column>
|
||||
@ -149,19 +175,34 @@
|
||||
<el-table-column v-if="useResultSource" label="最近上报" width="160">
|
||||
<template #default="{ row }">{{ formatTime(row.last_checked_at) }}</template>
|
||||
</el-table-column>
|
||||
<!-- 操作列:仅商品类任务(库位类任务的上报在「作业明细」侧处理) -->
|
||||
<el-table-column v-if="!isLocationTask" label="操作" width="100" align="center" fixed="right">
|
||||
<!-- 作业图片:result 的 records[].images(业务类型 stock_check_record) -->
|
||||
<el-table-column v-if="useResultSource" label="作业图片" width="110" align="center">
|
||||
<template #default="{ row }">
|
||||
<RecordImages :images="rowImages(row)" :max="2" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 操作列:商品行/库位行的商品 → 上报;**无商品的库位行 → 标记为空** -->
|
||||
<el-table-column label="操作" width="110" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
v-if="isReportableRow(row)"
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
:loading="reportingId === Number(row.item.id)"
|
||||
@click="reportFlatRow(row)"
|
||||
@click="openReportDialog(row)"
|
||||
>
|
||||
上报
|
||||
</el-button>
|
||||
<el-button
|
||||
v-else-if="canMarkEmpty(row)"
|
||||
link
|
||||
type="warning"
|
||||
size="small"
|
||||
:loading="markingEmptyId === Number(row.item?.id)"
|
||||
@click="handleMarkEmpty(row)"
|
||||
>
|
||||
标记为空
|
||||
</el-button>
|
||||
<span v-else class="hint-text">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -184,6 +225,17 @@
|
||||
@current-change="handlePageChange"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- 上报弹窗(stock.check.report,支持「未匹配条码」→ 未知商品) -->
|
||||
<CheckReportDialog
|
||||
v-model:visible="reportDialogVisible"
|
||||
:task-id="taskId"
|
||||
:detail="reportTarget?.item ?? null"
|
||||
:stock="reportTarget?.stock ?? null"
|
||||
:location="reportTarget?.location ?? ''"
|
||||
:default-quantity="reportTarget?.quantity ?? null"
|
||||
@success="handleReportSuccess"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -193,9 +245,12 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { useResizeObserver } from '@vueuse/core'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { formatTime, isCheckApiSuccess, isLocationScopeType, translate } from '../template-config'
|
||||
import RecordImages from './RecordImages.vue'
|
||||
import CheckReportDialog from './CheckReportDialog.vue'
|
||||
import {
|
||||
stockCheckDetail,
|
||||
stockCheckFinish,
|
||||
stockCheckMarkEmpty,
|
||||
stockCheckReport,
|
||||
stockCheckResult,
|
||||
type StockCheckReportParams
|
||||
@ -220,7 +275,11 @@ const emit = defineEmits<{
|
||||
// ============================================================
|
||||
const taskId = computed(() => Number(props.row?.id) || 0)
|
||||
const taskStatus = computed(() => String(props.row?.status ?? ''))
|
||||
/** created/rejected:可添加明细(addDetail:商品类传 stock_ids / 库位类传 locations) */
|
||||
/**
|
||||
* created/rejected:可添加明细
|
||||
* - 商品类:addDetail 传 stock_ids
|
||||
* - 库位类:勾选库位走 addLocationDetail(location_ids)/ 手填编码走 addDetail(locations)
|
||||
*/
|
||||
const canAddItems = computed(() => ['created', 'rejected'].includes(taskStatus.value))
|
||||
/** approved/checking:可上报实盘、可完成 */
|
||||
const canReport = computed(() => ['approved', 'checking'].includes(taskStatus.value))
|
||||
@ -275,6 +334,37 @@ function rowStocks(item: Record<string, any>): Record<string, any>[] {
|
||||
return Array.isArray(item?.stocks) ? item.stocks : []
|
||||
}
|
||||
|
||||
/**
|
||||
* 行内未知商品聚合(result 的 unknown_items:stock_id 为空、按条码归组)
|
||||
*
|
||||
* 口径:无账面数量,差异 = 实盘 - 0(实盘 >0 即盘盈),已计入行级 checked_quantity/diff_quantity。
|
||||
* 商品行与库位行都可能有。
|
||||
*/
|
||||
function rowUnknowns(item: Record<string, any>): Record<string, any>[] {
|
||||
return Array.isArray(item?.unknown_items) ? item.unknown_items : []
|
||||
}
|
||||
|
||||
/**
|
||||
* 平铺行对应的作业图片(result 的 records[].images)
|
||||
*
|
||||
* - 库位行的商品行:该明细下同 stock_id 的记录
|
||||
* - 未知商品行:同条码且 stock_id 为空的记录
|
||||
* - 商品行:该明细全部记录
|
||||
*/
|
||||
function rowImages(row: Record<string, any>): any[] {
|
||||
const records: Record<string, any>[] = Array.isArray(row?.item?.records) ? row.item.records : []
|
||||
let matched = records
|
||||
if (row?.stock) {
|
||||
matched = records.filter((r) => Number(r?.stock_id) === Number(row.stock?.stock_id))
|
||||
} else if (row?.unknown) {
|
||||
const barcode = String(row.unknown?.barcode ?? '')
|
||||
matched = records.filter(
|
||||
(r) => (r?.stock_id === null || r?.stock_id === undefined) && String(r?.barcode ?? '') === barcode
|
||||
)
|
||||
}
|
||||
return matched.flatMap((r) => (Array.isArray(r?.images) ? r.images : []))
|
||||
}
|
||||
|
||||
/**
|
||||
* 平铺行(表格数据源)
|
||||
*
|
||||
@ -282,35 +372,60 @@ function rowStocks(item: Record<string, any>): Record<string, any>[] {
|
||||
* - 库位行(scope_type=location):将行内商品(result 的 stocks[])平铺为多行,
|
||||
* 一行一个商品,商品快照/账面数量/已盘/差异取商品(stock)的值;
|
||||
* 无商品时保留库位行本身(商品列显示 —,不可上报)
|
||||
* - 未知商品(result 的 unknown_items)**仅库位类任务平铺为独立行**:
|
||||
* 该行级合计不单独展示(库位类只展示 stocks 明细),所以平铺不会重复;
|
||||
* 商品类行级聚合(checked_quantity 等)已含未知商品,故不额外平铺,
|
||||
* 改为在商品名称列提示「含未知商品 N 项」,避免合计重复展示
|
||||
* 每行带 `flat_key`(行 key)与 `item`(明细行,上报/库位等仍以明细为准)
|
||||
*/
|
||||
const flatRows = computed<Record<string, any>[]>(() => {
|
||||
const list: Record<string, any>[] = []
|
||||
for (const item of items.value) {
|
||||
const detailId = Number(item.id) || 0
|
||||
const unknowns = rowUnknowns(item)
|
||||
if (!isLocationTask.value) {
|
||||
list.push({ ...item, flat_key: `d${detailId}`, detail_id: detailId, item })
|
||||
list.push({ ...item, flat_key: `d${detailId}`, detail_id: detailId, item, unknown_count: unknowns.length })
|
||||
continue
|
||||
}
|
||||
const stocks = rowStocks(item)
|
||||
if (!stocks.length) {
|
||||
list.push({ ...item, flat_key: `d${detailId}`, detail_id: detailId, item })
|
||||
continue
|
||||
} else {
|
||||
for (const stock of stocks) {
|
||||
list.push({
|
||||
...item,
|
||||
flat_key: `d${detailId}:s${stock.stock_id}`,
|
||||
detail_id: detailId,
|
||||
item,
|
||||
stock,
|
||||
item_code: stock.item_code ?? null,
|
||||
item_name: stock.item_name ?? null,
|
||||
spec: stock.spec ?? null,
|
||||
batch_no: stock.batch_no ?? null,
|
||||
system_quantity: stock.system_quantity ?? null,
|
||||
checked_quantity: stock.checked_quantity ?? null,
|
||||
diff_quantity: stock.diff_quantity ?? null
|
||||
})
|
||||
}
|
||||
}
|
||||
for (const stock of stocks) {
|
||||
// 未知商品行(无账面,差异 = 实盘 - 0 = 盘盈)
|
||||
for (const unknown of unknowns) {
|
||||
const quantity = unknown?.checked_quantity ?? null
|
||||
list.push({
|
||||
...item,
|
||||
flat_key: `d${detailId}:s${stock.stock_id}`,
|
||||
flat_key: `d${detailId}:u${unknown?.barcode ?? ''}`,
|
||||
detail_id: detailId,
|
||||
item,
|
||||
stock,
|
||||
item_code: stock.item_code ?? null,
|
||||
item_name: stock.item_name ?? null,
|
||||
spec: stock.spec ?? null,
|
||||
batch_no: stock.batch_no ?? null,
|
||||
system_quantity: stock.system_quantity ?? null,
|
||||
checked_quantity: stock.checked_quantity ?? null,
|
||||
diff_quantity: stock.diff_quantity ?? null
|
||||
unknown,
|
||||
is_unknown: true,
|
||||
item_code: unknown?.barcode ?? null,
|
||||
item_name: unknown?.item_name ?? unknown?.barcode ?? null,
|
||||
spec: null,
|
||||
batch_no: null,
|
||||
system_quantity: 0,
|
||||
checked_quantity: quantity,
|
||||
diff_quantity: quantity,
|
||||
status: 'checked'
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -335,6 +450,8 @@ const emptyText = computed(() =>
|
||||
const dirtyRows = computed<ReportTarget[]>(() => {
|
||||
const list: ReportTarget[] = []
|
||||
for (const row of flatRows.value) {
|
||||
// 未知商品行是「已产生的作业记录」,不作为上报目标
|
||||
if (row.is_unknown) continue
|
||||
if (row.stock) {
|
||||
if (hasQuantity(stockQuantityMap[stockKey(row.item.id, row.stock.stock_id)])) {
|
||||
list.push({ item: row.item, stock: row.stock })
|
||||
@ -394,9 +511,11 @@ function handlePageChange() {
|
||||
nextTick(() => tableRef.value?.setScrollTop?.(0))
|
||||
}
|
||||
|
||||
/** 该行是否可填实盘数量并上报(库位行需有对应商品库存;商品行直接可填) */
|
||||
/** 该行是否可上报(库位行需有对应商品库存且非未知商品行;商品行直接可报) */
|
||||
function isReportableRow(row: Record<string, any>): boolean {
|
||||
if (!canReport.value) return false
|
||||
// 未知商品行已是作业记录,不是盘点范围行
|
||||
if (row?.is_unknown) return false
|
||||
return isLocationTask.value ? Boolean(row?.stock) : true
|
||||
}
|
||||
|
||||
@ -586,27 +705,110 @@ async function doReport(target: ReportTarget, silent = false): Promise<boolean>
|
||||
}
|
||||
}
|
||||
|
||||
/** 行内上报(商品行) */
|
||||
async function reportRow(item: Record<string, any>) {
|
||||
const ok = await doReport({ item })
|
||||
if (!ok) return
|
||||
// 覆盖式上报可能更新已有记录,明细行上的聚合字段需重拉
|
||||
// ============================================================
|
||||
// 行内上报弹窗(stock.check.report,支持「未匹配条码」→ 未知商品)
|
||||
// ============================================================
|
||||
const reportDialogVisible = ref(false)
|
||||
/** 「标记为空」进行中的明细ID(按钮 loading) */
|
||||
const markingEmptyId = ref<number | null>(null)
|
||||
/** 弹窗目标快照(打开时定格,避免表格重渲染后引用漂移) */
|
||||
const reportTarget = ref<{
|
||||
item: Record<string, any>
|
||||
stock: Record<string, any> | null
|
||||
location: string
|
||||
quantity: number | null
|
||||
} | null>(null)
|
||||
|
||||
/**
|
||||
* 打开上报弹窗(行内「上报」)
|
||||
*
|
||||
* - 库位行:需带 stock_id + 明细库位,数量取该行已填值
|
||||
* - 商品行:按明细商品上报,库位取行内填写值
|
||||
* - 两者均可另填「未匹配条码」,由后端按条码解析(命中=已知商品 / 未命中=未知商品)
|
||||
*/
|
||||
function openReportDialog(row: Record<string, any>) {
|
||||
const item = row?.item
|
||||
if (!item) return
|
||||
const stock = row?.stock ?? null
|
||||
const location = stock
|
||||
? (resolveLocationCodes(item)[0] ?? '')
|
||||
: String(locationMap[String(item.id)] ?? '').trim()
|
||||
const rawQuantity = stock
|
||||
? stockQuantityMap[stockKey(item.id, stock.stock_id)]
|
||||
: quantityMap[String(item.id)]
|
||||
const quantity =
|
||||
rawQuantity === undefined || rawQuantity === null || (rawQuantity as any) === ''
|
||||
? null
|
||||
: Number(rawQuantity)
|
||||
reportTarget.value = {
|
||||
item,
|
||||
stock,
|
||||
location,
|
||||
quantity: Number.isFinite(Number(quantity)) ? Number(quantity) : null
|
||||
}
|
||||
reportDialogVisible.value = true
|
||||
}
|
||||
|
||||
/** 上报成功:覆盖式上报可能更新已有记录,明细聚合字段需重拉 */
|
||||
async function handleReportSuccess() {
|
||||
// 不复位 reportTarget:弹窗关闭动画期间保留内容,下次打开会整体覆盖
|
||||
await loadItems()
|
||||
emit('changed')
|
||||
}
|
||||
|
||||
/** 行内上报(库位行的某个商品;report 需要 stock_id) */
|
||||
async function reportStock(item: Record<string, any>, stock: Record<string, any>) {
|
||||
const ok = await doReport({ item, stock })
|
||||
if (!ok) return
|
||||
await loadItems()
|
||||
emit('changed')
|
||||
// ============================================================
|
||||
// 标记库位为空(stock.check.markEmpty,库位盘点专用)
|
||||
// ============================================================
|
||||
/**
|
||||
* 该行是否可「标记为空」
|
||||
*
|
||||
* 仅库位类任务 + 可上报状态(approved/checking),且该行是**没有商品记录的库位明细行**
|
||||
* (有商品/未知商品的行走「上报」);已标记为空的不重复提供。
|
||||
*/
|
||||
function canMarkEmpty(row: Record<string, any>): boolean {
|
||||
if (!canReport.value || !isLocationTask.value) return false
|
||||
if (row?.is_unknown || row?.stock) return false
|
||||
if (row?.item?.is_empty) return false
|
||||
const scope = row?.item?.scope_type
|
||||
return scope === undefined || scope === null || scope === '' || scope === 'location'
|
||||
}
|
||||
|
||||
/** 平铺行上报:有商品按商品上报,商品行直接按明细上报 */
|
||||
async function reportFlatRow(row: Record<string, any>) {
|
||||
if (row?.stock) await reportStock(row.item, row.stock)
|
||||
else await reportRow(row.item)
|
||||
/**
|
||||
* 标记库位为空(stock.check.markEmpty)
|
||||
*
|
||||
* 等价于 report(is_empty=true):写空标记记录(quantity=0、is_empty=1),并**清除该库位下的商品记录**;
|
||||
* 空标记计入已盘;库位账面有库存时计入盘亏差异。
|
||||
*/
|
||||
async function handleMarkEmpty(row: Record<string, any>) {
|
||||
const detailId = Number(row?.item?.id)
|
||||
if (!taskId.value || !Number.isFinite(detailId) || detailId <= 0) return
|
||||
const location = formatLocationCodes(row?.item ?? row)
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认库位「${location}」为空?\n标记后该库位下的商品记录将被清除;若库位账面还有库存,会按盘亏计入差异。`,
|
||||
'标记库位为空',
|
||||
{ confirmButtonText: '确认标记', cancelButtonText: '取消', type: 'warning' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
|
||||
markingEmptyId.value = detailId
|
||||
try {
|
||||
const res: any = await stockCheckMarkEmpty({ id: taskId.value, detail_id: detailId })
|
||||
if (!isCheckApiSuccess(res)) {
|
||||
throw new Error(res?.message || '标记库位为空失败')
|
||||
}
|
||||
ElMessage.success('已将库位标记为空')
|
||||
// 主表进度/差异由后端重算 → 重拉明细 + 通知宿主刷新列表
|
||||
await loadItems()
|
||||
emit('changed')
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 标记库位为空失败', e)
|
||||
ElMessage.error(e?.message || '标记库位为空失败')
|
||||
} finally {
|
||||
markingEmptyId.value = null
|
||||
}
|
||||
}
|
||||
|
||||
/** 批量上报:逐行串行提交,避免并发写同一盘点单 */
|
||||
@ -761,6 +963,11 @@ watch(
|
||||
color: #c0c4cc;
|
||||
}
|
||||
|
||||
/* 未知商品标记(result 的 unknown_items:条码匹配不到系统商品) */
|
||||
.unknown-tag {
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.table-host {
|
||||
flex: 1;
|
||||
min-height: 120px;
|
||||
|
||||
@ -1,88 +1,314 @@
|
||||
<!--
|
||||
CheckRecordsPanel — 盘点作业记录面板(库存盘点 stock.check)
|
||||
CheckRecordsPanel — 盘点作业数据面板(库存盘点 stock.check)
|
||||
|
||||
职责(使用本次新增的两个接口):
|
||||
1. stock.check.recordList:按盘点任务拉取作业记录(服务端分页,记录 id 倒序)
|
||||
—— rows 为 wms_stock_check_record 全字段 + 商品快照列(item_code/item_name)
|
||||
2. stock.check.recordDelete:删除单条作业记录(**仅主表 approved/checking 允许**;
|
||||
记录删光后该明细回到未盘口径;主表状态不回退)
|
||||
职责(使用 stock.check.workData —— 单接口三视图,由「任务范围 + is_goods」解析):
|
||||
1. **location(库位结构)**:库位任务固定此视图 —— 一行一个库位范围行,展开看该库位的作业记录——
|
||||
goods(已知商品:record_id/stock_id/item_code/item_name/barcode/images/quantity/checker_name)
|
||||
+ unknown(未知商品:record_id/barcode/item_name/images/quantity/checker_name)
|
||||
2. **space(聚合库位,按拣货路径)**:商品任务的**默认**视图 —— 一行一个库位
|
||||
(后端按 pick_sequence→pick_priority→id 排序),
|
||||
库位集合 = **当前库存库位 ∪ 作业记录库位**(盘点前库存已出空但有作业记录的库位也会出现);
|
||||
行字段对齐 index.searchSpace:`id` / `space_code` / `custom_name` / `custom_barcode`
|
||||
(**不是** location_id/location_code,与 location 视图不同);
|
||||
展开看该库位下的任务商品(含该商品在该库位是否已盘;明盘另含账面/实盘)
|
||||
3. **goods(商品结构)**:商品任务传 `is_goods=true` 时 —— 一行一个商品范围行,
|
||||
展开看按库位聚合的 locations 作业记录;
|
||||
**明盘**行上直接带 账面/已盘/差异,**盲盘**接口不返回任何数量字段(前端也不渲染数量列)
|
||||
|
||||
说明:一个「明细 + 库位」一条记录;重复上报同库位是覆盖更新(不新增),
|
||||
所以这里一条记录 = 某明细在某库位的一次实盘结果。
|
||||
**服务端分页**:入参 `pagination: { page, pageSize }`(pageSize 上限 200),
|
||||
响应 `rows` 为当前页、`total` 为全量行数、`page/pageSize` 回显 → 翻页/改页长均重新请求。
|
||||
|
||||
⚠️ **视图不是自由入参**(`view` 已废弃,传了也被忽略),由「任务范围 + `is_goods`」解析:
|
||||
- 库位任务(type=all/location)→ **固定 location**(库位结构),页面不提供切换
|
||||
- 商品任务(type=store/goods)→ 默认 **space**(聚合库位,按拣货路径);
|
||||
切「商品结构」时传 `is_goods: true` 得 goods 视图
|
||||
|
||||
⚠️ **状态限制**:workData 仅任务 `approved`(待盘点)/ `checking`(盘点中)可拉取,
|
||||
其他状态(created/submitted/rejected/completed/cancelled)后端返回 400,
|
||||
故前端在非这两种状态时**不发请求**,直接展示空态提示。
|
||||
|
||||
删除作业记录:stock.check.recordDelete,用 workData 给出的 record_id;
|
||||
**仅主表 approved/checking 允许**,记录删光后该明细回到未盘口径,主表状态不回退。
|
||||
|
||||
重盘清除库位:stock.check.recheckClearLocation(`{ id, location_id }`)——**库位盘点专用**,
|
||||
清除该库位范围内明细(scope_type=location)的**全部作业记录(含空库位标记)**,该库位回到未盘;
|
||||
仅任务范围为库位(type=location/all)且 approved/checking 允许(与本面板 canLoad 的状态限制一致),
|
||||
故入口只在 location 视图(库位结构)提供,一行一库位只出现一次。
|
||||
-->
|
||||
<template>
|
||||
<div class="check-records-panel">
|
||||
<!-- 按钮行(间距 6px 对齐 toolbar) -->
|
||||
<div class="header-actions">
|
||||
<div class="left-actions">
|
||||
<el-button size="small" type="primary" :loading="loading" @click="loadRecords">
|
||||
<el-button
|
||||
size="small"
|
||||
type="primary"
|
||||
:loading="loading"
|
||||
:disabled="!canLoad"
|
||||
@click="loadRecords"
|
||||
>
|
||||
刷新
|
||||
</el-button>
|
||||
<el-radio-group
|
||||
v-if="viewOptions.length > 1"
|
||||
v-model="view"
|
||||
size="small"
|
||||
@change="handleViewChange"
|
||||
>
|
||||
<el-radio-button v-for="item in viewOptions" :key="item.value" :value="item.value">
|
||||
{{ item.label }}
|
||||
</el-radio-button>
|
||||
</el-radio-group>
|
||||
<span v-else class="hint-text">{{ viewOptions[0]?.label }}(库位盘点固定视图)</span>
|
||||
</div>
|
||||
<div class="right-actions">
|
||||
<span v-if="!canDelete" class="hint-text">仅「待盘点 / 盘点中」可删除作业记录</span>
|
||||
<span v-if="!canLoad" class="hint-text">
|
||||
仅「待盘点 / 盘点中」可查看作业数据(当前:{{ translate('status', taskStatus) }})
|
||||
</span>
|
||||
<span v-else-if="!canDelete" class="hint-text">仅「待盘点 / 盘点中」可删除作业记录</span>
|
||||
<span v-if="canLoad && isBlind" class="hint-text">盲盘:接口不返回数量</span>
|
||||
<span class="stat-text">
|
||||
记录 {{ pagination.total }} 条 · 已盘 {{ stats.checked }} / 明细 {{ stats.total }}
|
||||
{{ pagination.total }} 个{{ viewUnit }} · 已盘 {{ stats.checked }} / 明细 {{ stats.total }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ref="tableHostRef" class="table-host">
|
||||
<!-- ===== 库位结构(view=location):一行一个库位,展开看已知/未知商品作业记录 ===== -->
|
||||
<el-table
|
||||
v-if="view === 'location'"
|
||||
ref="tableRef"
|
||||
v-loading="loading"
|
||||
:data="records"
|
||||
row-key="id"
|
||||
:data="rows"
|
||||
row-key="detail_id"
|
||||
border
|
||||
stripe
|
||||
size="small"
|
||||
:height="tableHeight"
|
||||
>
|
||||
<el-table-column prop="id" label="记录ID" width="90" align="center" />
|
||||
<el-table-column prop="detail_id" label="明细ID" width="90" align="center" />
|
||||
<el-table-column prop="item_code" label="商品编码" min-width="130" show-overflow-tooltip />
|
||||
<el-table-column prop="item_name" label="商品名称" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column label="库位" min-width="120" show-overflow-tooltip>
|
||||
<el-table-column type="expand">
|
||||
<template #default="{ row }">
|
||||
<!-- 「无库位」分组:库中存空串,recordList 返回时归一为 null,故按 falsy 判断 -->
|
||||
<span v-if="row.location_code">{{ row.location_code }}</span>
|
||||
<span v-else class="hint-text">无库位</span>
|
||||
<div class="sub-list">
|
||||
<div v-if="!row.goods?.length && !row.unknown?.length" class="hint-text sub-empty">
|
||||
该库位暂无作业记录
|
||||
</div>
|
||||
<div v-for="item in row.goods || []" :key="`g${item.record_id}`" class="sub-item">
|
||||
<span class="sub-name">{{ item.item_name || item.item_code || '—' }}</span>
|
||||
<span class="sub-code">{{ item.item_code }}</span>
|
||||
<span class="sub-qty">×{{ item.quantity }}</span>
|
||||
<span class="sub-meta">
|
||||
{{ item.checker_name || '—' }} · {{ formatTime(item.checked_at) }}
|
||||
</span>
|
||||
<RecordImages :images="item.images" :max="2" />
|
||||
<el-button
|
||||
v-if="canDelete"
|
||||
link
|
||||
type="danger"
|
||||
size="small"
|
||||
:loading="deletingId === item.record_id"
|
||||
@click="handleDeleteRecord(item)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-for="item in row.unknown || []" :key="`u${item.record_id}`" class="sub-item">
|
||||
<el-tag type="warning" size="small" class="unknown-tag">未知</el-tag>
|
||||
<span class="sub-name">{{ item.item_name || item.barcode || '—' }}</span>
|
||||
<span class="sub-code">{{ item.barcode }}</span>
|
||||
<span class="sub-qty">×{{ item.quantity }}</span>
|
||||
<span class="sub-meta">
|
||||
{{ item.checker_name || '—' }} · {{ formatTime(item.checked_at) }}
|
||||
</span>
|
||||
<RecordImages :images="item.images" :max="2" />
|
||||
<el-button
|
||||
v-if="canDelete"
|
||||
link
|
||||
type="danger"
|
||||
size="small"
|
||||
:loading="deletingId === item.record_id"
|
||||
@click="handleDeleteRecord(item)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="quantity" label="数量" width="90" align="center" />
|
||||
<el-table-column prop="checker_name" label="盘点人" width="110" show-overflow-tooltip />
|
||||
<el-table-column label="上报时间" width="160">
|
||||
<el-table-column prop="detail_id" label="明细ID" width="90" align="center" />
|
||||
<el-table-column label="库位" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ locationLabel(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="盘点状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<span :class="getStatusTextClass(itemStatusTag(row.status))">
|
||||
{{ translate('check_item_status', row.status) }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="作业记录" width="120" align="center">
|
||||
<template #default="{ row }">
|
||||
<span>{{ recordCount(row) }}</span>
|
||||
<el-tag v-if="row.has_unknown" type="warning" size="small" class="unknown-tag">含未知</el-tag>
|
||||
<el-tag v-if="row.is_empty" type="info" size="small" class="unknown-tag">空库位</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="盘点人" width="130" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ (row.checkers || []).join('、') || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="最近上报" width="160">
|
||||
<template #default="{ row }">{{ formatTime(row.checked_at) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" min-width="140" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.remark">{{ row.remark }}</span>
|
||||
<span v-else class="hint-text">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="80" align="center" fixed="right">
|
||||
<!--
|
||||
操作列:库位维度「重盘清库位」——清除该库位全部作业记录(含空库位标记),库位回到未盘
|
||||
(stock.check.recheckClearLocation;与展开行里的逐条「删除」是同一族操作,这里是整体重来)
|
||||
-->
|
||||
<el-table-column label="操作" width="120" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
v-if="canDelete"
|
||||
v-if="canClearLocation(row)"
|
||||
link
|
||||
type="danger"
|
||||
size="small"
|
||||
:loading="deletingId === row.id"
|
||||
@click="handleDelete(row)"
|
||||
:loading="clearingLocationId === Number(row.location_id)"
|
||||
@click="handleClearLocation(row)"
|
||||
>
|
||||
删除
|
||||
重盘清库位
|
||||
</el-button>
|
||||
<span v-else class="hint-text">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">暂无盘点作业记录</div>
|
||||
<div class="empty-tip">{{ emptyText }}</div>
|
||||
</template>
|
||||
</el-table>
|
||||
|
||||
<!-- ===== 商品结构(view=goods):一行一个商品,展开看按库位聚合的作业记录 ===== -->
|
||||
<el-table
|
||||
v-else-if="view === 'goods'"
|
||||
ref="tableRef"
|
||||
v-loading="loading"
|
||||
:data="rows"
|
||||
row-key="detail_id"
|
||||
border
|
||||
stripe
|
||||
size="small"
|
||||
:height="tableHeight"
|
||||
>
|
||||
<el-table-column type="expand">
|
||||
<template #default="{ row }">
|
||||
<div class="sub-list">
|
||||
<div v-if="!row.locations?.length" class="hint-text sub-empty">该商品暂无作业记录</div>
|
||||
<div
|
||||
v-for="(loc, index) in row.locations || []"
|
||||
:key="`l${index}-${loc.location_code || 'blank'}`"
|
||||
class="sub-item"
|
||||
>
|
||||
<span class="sub-name">{{ loc.location_code || '无库位' }}</span>
|
||||
<span v-if="loc.quantity !== undefined && loc.quantity !== null" class="sub-qty">
|
||||
×{{ loc.quantity }}
|
||||
</span>
|
||||
<span class="sub-meta">
|
||||
{{ loc.checker_name || '—' }} · {{ formatTime(loc.checked_at) }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="detail_id" label="明细ID" width="90" align="center" />
|
||||
<el-table-column label="商品编码" min-width="130" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.item_code || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="商品名称" min-width="160" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.item_name || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" min-width="110" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.spec || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="货主" min-width="120" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.store_name || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="库位" min-width="150" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ locationCodes(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="!isBlind" label="账面数量" width="100" align="center">
|
||||
<template #default="{ row }">{{ row.system_quantity ?? '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="!isBlind" label="已盘合计" width="100" align="center">
|
||||
<template #default="{ row }">{{ row.checked_quantity ?? '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="!isBlind" label="差异" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<span :class="diffClass(row.diff_quantity)">{{ formatDiff(row.diff_quantity) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图片" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<RecordImages :images="row.images" :max="2" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">{{ emptyText }}</div>
|
||||
</template>
|
||||
</el-table>
|
||||
|
||||
<!-- ===== 按拣货路径(view=space):一行一个库位,展开看该库位的任务商品 ===== -->
|
||||
<el-table
|
||||
v-else
|
||||
ref="tableRef"
|
||||
v-loading="loading"
|
||||
:data="rows"
|
||||
row-key="id"
|
||||
border
|
||||
stripe
|
||||
size="small"
|
||||
:height="tableHeight"
|
||||
>
|
||||
<el-table-column type="expand">
|
||||
<template #default="{ row }">
|
||||
<div class="sub-list">
|
||||
<div v-if="!row.goods?.length" class="hint-text sub-empty">该库位无任务商品</div>
|
||||
<div
|
||||
v-for="item in row.goods || []"
|
||||
:key="`s${item.detail_id}-${item.stock_id}`"
|
||||
class="sub-item"
|
||||
>
|
||||
<span :class="item.status === 'checked' ? 'status-checked' : 'hint-text'">
|
||||
{{ translate('check_item_status', item.status) }}
|
||||
</span>
|
||||
<span class="sub-name">{{ item.item_name || item.item_code || '—' }}</span>
|
||||
<span class="sub-code">{{ item.item_code }}</span>
|
||||
<span class="sub-meta">{{ item.spec || '' }}</span>
|
||||
<span v-if="!isBlind" class="sub-meta">
|
||||
账面 {{ item.system_quantity ?? '—' }} / 已盘 {{ item.checked_quantity ?? '—' }}
|
||||
</span>
|
||||
<RecordImages :images="item.images" :max="2" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="id" label="库位ID" width="90" align="center" />
|
||||
<el-table-column label="库位" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ spaceLocationLabel(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="自定义条码" min-width="130" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.custom_barcode || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务商品" width="100" align="center">
|
||||
<template #default="{ row }">{{ (row.goods || []).length }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已盘商品" width="100" align="center">
|
||||
<template #default="{ row }">{{ checkedGoodsCount(row) }}</template>
|
||||
</el-table-column>
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">{{ emptyText }}</div>
|
||||
</template>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<div class="pagination-container">
|
||||
<div v-if="pagination.total > pagination.pageSize" class="pagination-container">
|
||||
<el-pagination
|
||||
v-model:current-page="pagination.page"
|
||||
v-model:page-size="pagination.pageSize"
|
||||
@ -102,16 +328,21 @@
|
||||
import { computed, nextTick, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { useResizeObserver } from '@vueuse/core'
|
||||
import { formatTime, isCheckApiSuccess } from '../template-config'
|
||||
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import { formatTime, isCheckApiSuccess, isLocationScopeType, translate } from '../template-config'
|
||||
import RecordImages from './RecordImages.vue'
|
||||
import {
|
||||
stockCheckRecheckClearLocation,
|
||||
stockCheckRecordDelete,
|
||||
stockCheckRecordList
|
||||
stockCheckWorkData,
|
||||
type StockCheckWorkDataParams,
|
||||
type StockCheckWorkDataView
|
||||
} from '@/api/stock.check/stock.check'
|
||||
|
||||
defineOptions({ name: 'CheckRecordsPanel' })
|
||||
|
||||
const props = defineProps<{
|
||||
/** 当前选中的盘点单(列表行数据,含 id/status/checked_items/total_items) */
|
||||
/** 当前选中的盘点单(列表行数据,含 id/type/mode/status/checked_items/total_items) */
|
||||
row: Record<string, any> | null
|
||||
}>()
|
||||
|
||||
@ -124,12 +355,47 @@ const taskId = computed(() => Number(props.row?.id) || 0)
|
||||
const taskStatus = computed(() => String(props.row?.status ?? ''))
|
||||
/** 文档:recordDelete 仅主表 approved/checking 允许 */
|
||||
const canDelete = computed(() => ['approved', 'checking'].includes(taskStatus.value))
|
||||
/** 盲盘:workData 的 goods / space 视图不返回任何数量字段 */
|
||||
const isBlind = computed(() => String(props.row?.mode ?? '') === 'blind')
|
||||
/**
|
||||
* 文档:workData 仅 approved(待盘点)/ checking(盘点中)可拉取,
|
||||
* 其他状态(created/submitted/rejected/completed/cancelled)后端直接返 400
|
||||
* → 非这两种状态时不发请求,改为空态提示
|
||||
*/
|
||||
const canLoad = computed(() => ['approved', 'checking'].includes(taskStatus.value))
|
||||
|
||||
const records = ref<Record<string, any>[]>([])
|
||||
/** 库位类任务(type=all/location):视图固定 location,后端无视 is_goods */
|
||||
const isLocationTask = computed(() => isLocationScopeType(props.row?.type))
|
||||
|
||||
/**
|
||||
* 可切换的视图(**由后端规则推导**,不是自由选择):
|
||||
* - 库位任务 → 固定 `location`(库位结构),无参数可切
|
||||
* - 商品任务 → 默认 `space`(聚合库位,按拣货路径);切到 `goods` 需传 `is_goods=true`
|
||||
*/
|
||||
const VIEW_OPTION_MAP: Record<StockCheckWorkDataView, { label: string; unit: string }> = {
|
||||
location: { label: '库位结构', unit: '个库位' },
|
||||
goods: { label: '商品结构', unit: '个商品' },
|
||||
space: { label: '聚合库位(按拣货路径)', unit: '个库位' }
|
||||
}
|
||||
const viewOptions = computed(() => {
|
||||
const values: StockCheckWorkDataView[] = isLocationTask.value ? ['location'] : ['space', 'goods']
|
||||
return values.map((value) => ({ value, ...VIEW_OPTION_MAP[value] }))
|
||||
})
|
||||
/** 默认视图:库位任务 → location;商品任务 → space(后端默认口径) */
|
||||
const defaultView = computed<StockCheckWorkDataView>(() =>
|
||||
isLocationTask.value ? 'location' : 'space'
|
||||
)
|
||||
|
||||
const view = ref<StockCheckWorkDataView>('location')
|
||||
const viewUnit = computed(() => VIEW_OPTION_MAP[view.value]?.unit ?? '行')
|
||||
|
||||
const rows = ref<Record<string, any>[]>([])
|
||||
const loading = ref(false)
|
||||
const deletingId = ref<number | null>(null)
|
||||
/** 「重盘清库位」进行中的库位ID(按钮 loading) */
|
||||
const clearingLocationId = ref<number | null>(null)
|
||||
|
||||
/** 头部分母/分子取自列表行(删除后由宿主刷新列表同步) */
|
||||
/** 头部统计取自 workData 的 check(删除后随重新拉取同步) */
|
||||
const stats = reactive({ total: 0, checked: 0 })
|
||||
|
||||
const pagination = reactive({ page: 1, pageSize: 20, total: 0 })
|
||||
@ -143,69 +409,155 @@ useResizeObserver(tableHostRef, (entries) => {
|
||||
if (h >= 120) tableHeight.value = Math.floor(h)
|
||||
})
|
||||
|
||||
const emptyText = computed(() => {
|
||||
if (!canLoad.value) {
|
||||
return `当前状态(${translate('status', taskStatus.value)})不可查看作业数据:仅「待盘点 / 盘点中」可拉取`
|
||||
}
|
||||
if (view.value === 'goods') return '该盘点单暂无商品明细'
|
||||
if (view.value === 'space') return '任务商品暂无所在库位(可能尚未入库)'
|
||||
return isLocationScopeType(props.row?.type) ? '该盘点单暂无库位明细' : '商品盘点无库位范围行'
|
||||
})
|
||||
|
||||
// ============================================================
|
||||
// 拉取作业记录(stock.check.recordList)
|
||||
// 拉取盘点作业数据(stock.check.workData,单接口三视图)
|
||||
// ============================================================
|
||||
async function loadRecords() {
|
||||
if (!taskId.value) {
|
||||
records.value = []
|
||||
pagination.total = 0
|
||||
rows.value = []
|
||||
stats.total = 0
|
||||
stats.checked = 0
|
||||
return
|
||||
}
|
||||
// 非 approved/checking:接口会返 400,前端直接不发请求(统计仍取列表行)
|
||||
if (!canLoad.value) {
|
||||
rows.value = []
|
||||
stats.total = Number(props.row?.total_items ?? 0) || 0
|
||||
stats.checked = Number(props.row?.checked_items ?? 0) || 0
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
const res: any = await stockCheckRecordList({
|
||||
const payload: StockCheckWorkDataParams = {
|
||||
id: taskId.value,
|
||||
// 服务端分页(pageSize 上限 200);rows 为当前页、total 为全量行数
|
||||
pagination: { page: pagination.page, pageSize: pagination.pageSize }
|
||||
})
|
||||
}
|
||||
// 视图由「任务范围 + is_goods」解析:仅商品任务可切 goods,space 是商品任务默认、库位任务不带
|
||||
if (!isLocationTask.value && view.value === 'goods') payload.is_goods = true
|
||||
const res: any = await stockCheckWorkData(payload)
|
||||
if (!isCheckApiSuccess(res)) {
|
||||
throw new Error(res?.message || '获取作业记录失败')
|
||||
throw new Error(res?.message || '获取盘点作业数据失败')
|
||||
}
|
||||
const data = res.data ?? res
|
||||
records.value = Array.isArray(data.rows) ? data.rows : []
|
||||
const total = Number(data.total ?? records.value.length)
|
||||
pagination.total = Number.isFinite(total) ? total : records.value.length
|
||||
// 文档响应含 page/pageSize,> 0 才采纳,避免被回显 0 覆盖
|
||||
rows.value = Array.isArray(data.rows) ? data.rows : []
|
||||
const total = Number(data.total ?? rows.value.length)
|
||||
pagination.total = Number.isFinite(total) ? total : rows.value.length
|
||||
// 响应回带 page/pageSize,> 0 才采纳,避免被回显 0 覆盖
|
||||
if (Number(data.page) > 0) pagination.page = Number(data.page)
|
||||
if (Number(data.pageSize) > 0) pagination.pageSize = Number(data.pageSize)
|
||||
syncStats()
|
||||
const check = data.check ?? {}
|
||||
stats.total = Number(check.total_items ?? pagination.total) || 0
|
||||
stats.checked = Number(check.checked_items ?? 0) || 0
|
||||
nextTick(() => tableRef.value?.setScrollTop?.(0))
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 加载作业记录失败', e)
|
||||
ElMessage.error(e?.message || '获取作业记录失败')
|
||||
records.value = []
|
||||
console.error('[stockcheck] 加载盘点作业数据失败', e)
|
||||
ElMessage.error(e?.message || '获取盘点作业数据失败')
|
||||
rows.value = []
|
||||
pagination.total = 0
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 头部统计随列表重新拉取而更新 */
|
||||
function syncStats() {
|
||||
stats.total = Number(props.row?.total_items ?? 0) || 0
|
||||
stats.checked = Number(props.row?.checked_items ?? 0) || 0
|
||||
function handleViewChange() {
|
||||
pagination.page = 1
|
||||
void loadRecords()
|
||||
}
|
||||
|
||||
/** 翻页:服务端分页,需重新请求 */
|
||||
function handlePageChange() {
|
||||
nextTick(() => tableRef.value?.setScrollTop?.(0))
|
||||
void loadRecords()
|
||||
}
|
||||
|
||||
function handlePageSizeChange() {
|
||||
pagination.page = 1
|
||||
nextTick(() => tableRef.value?.setScrollTop?.(0))
|
||||
void loadRecords()
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 删除作业记录(stock.check.recordDelete)
|
||||
// 单元格渲染辅助
|
||||
// ============================================================
|
||||
async function handleDelete(record: Record<string, any>) {
|
||||
const recordId = Number(record?.id)
|
||||
/** 库位展示(location 视图):名称(编码);缺失一侧时只显示另一侧 */
|
||||
function locationLabel(row: Record<string, any>): string {
|
||||
const code = row?.location_code ? String(row.location_code) : ''
|
||||
const name = row?.location_name ? String(row.location_name) : ''
|
||||
if (!code && !name) return '无库位'
|
||||
if (name && code && name !== code) return `${name}(${code})`
|
||||
return name || code
|
||||
}
|
||||
|
||||
/**
|
||||
* 库位展示(space 视图):自定义名称(库位编码)
|
||||
*
|
||||
* ⚠️ space 视图的库位字段对齐 index.searchSpace:id / space_code / custom_name / custom_barcode,
|
||||
* 与 location 视图的 location_code / location_name 不是同一套字段。
|
||||
*/
|
||||
function spaceLocationLabel(row: Record<string, any>): string {
|
||||
const code = row?.space_code ? String(row.space_code) : ''
|
||||
const name = row?.custom_name ? String(row.custom_name) : ''
|
||||
if (!code && !name) return '—'
|
||||
if (name && code && name !== code) return `${name}(${code})`
|
||||
return name || code
|
||||
}
|
||||
|
||||
/** 库位结构:该库位的作业记录条数(已知 + 未知) */
|
||||
function recordCount(row: Record<string, any>): number {
|
||||
return (row?.goods?.length ?? 0) + (row?.unknown?.length ?? 0)
|
||||
}
|
||||
|
||||
/** 商品结构:该商品的上报库位(含「无库位」分组) */
|
||||
function locationCodes(row: Record<string, any>): string {
|
||||
const list: string[] = Array.isArray(row?.locations)
|
||||
? row.locations.map((loc: any) => (loc?.location_code ? String(loc.location_code) : '无库位'))
|
||||
: []
|
||||
const unique = [...new Set(list)]
|
||||
return unique.length ? unique.join('、') : '—'
|
||||
}
|
||||
|
||||
/** 按拣货路径:该库位已盘的商品数 */
|
||||
function checkedGoodsCount(row: Record<string, any>): number {
|
||||
return Array.isArray(row?.goods)
|
||||
? row.goods.filter((item: any) => String(item?.status ?? '') === 'checked').length
|
||||
: 0
|
||||
}
|
||||
|
||||
function itemStatusTag(status: any) {
|
||||
return String(status ?? '') === 'checked' ? 'success' : 'info'
|
||||
}
|
||||
|
||||
function formatDiff(value: any) {
|
||||
if (value === undefined || value === null || value === '') return '—'
|
||||
const n = Number(value)
|
||||
if (!Number.isFinite(n)) return String(value)
|
||||
return n > 0 ? `+${n}` : String(n)
|
||||
}
|
||||
|
||||
function diffClass(value: any) {
|
||||
const n = Number(value)
|
||||
if (!Number.isFinite(n) || n === 0) return 'diff-text'
|
||||
return n > 0 ? 'diff-text diff-text--profit' : 'diff-text diff-text--loss'
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 删除作业记录(stock.check.recordDelete,用 workData 的 record_id)
|
||||
// ============================================================
|
||||
async function handleDeleteRecord(record: Record<string, any>) {
|
||||
const recordId = Number(record?.record_id)
|
||||
if (!Number.isFinite(recordId) || recordId <= 0) return
|
||||
const locationText = record?.location_code ? String(record.location_code) : '无库位'
|
||||
const name = record?.item_name || record?.item_code || record?.barcode || '—'
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确定删除该作业记录?\n库位:${locationText},数量:${record?.quantity ?? '—'}\n删除后该明细按剩余记录重新汇总,盘点单状态不变。`,
|
||||
`确定删除该作业记录?\n商品:${name},数量:${record?.quantity ?? '—'}\n删除后该明细按剩余记录重新汇总,盘点单状态不变。`,
|
||||
'删除作业记录',
|
||||
{ confirmButtonText: '确定删除', cancelButtonText: '取消', type: 'warning' }
|
||||
)
|
||||
@ -215,13 +567,14 @@ async function handleDelete(record: Record<string, any>) {
|
||||
|
||||
deletingId.value = recordId
|
||||
try {
|
||||
const res: any = await stockCheckRecordDelete({ id: taskId.value, record_id: recordId })
|
||||
// 批量接口(单条也走数组):record_ids 为新的必填入参
|
||||
const res: any = await stockCheckRecordDelete({ id: taskId.value, record_ids: [recordId] })
|
||||
if (!isCheckApiSuccess(res)) {
|
||||
throw new Error(res?.message || '删除作业记录失败')
|
||||
}
|
||||
ElMessage.success('作业记录已删除')
|
||||
// 删除当前页最后一条时回退页码,避免停留在空页
|
||||
if (records.value.length === 1 && pagination.page > 1) pagination.page -= 1
|
||||
if (rows.value.length === 1 && pagination.page > 1) pagination.page -= 1
|
||||
await loadRecords()
|
||||
emit('changed')
|
||||
} catch (e: any) {
|
||||
@ -233,13 +586,78 @@ async function handleDelete(record: Record<string, any>) {
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 联动:切换盘点单 / 主表状态变化时重新拉取
|
||||
// 重盘清除库位(stock.check.recheckClearLocation,库位盘点专用)
|
||||
// ============================================================
|
||||
/**
|
||||
* 该库位行是否可「重盘清库位」
|
||||
*
|
||||
* 限制(与文档一致):
|
||||
* - 任务范围为库位(type=location/all)→ location 视图本身只对库位类任务出现,双重保险再判一次
|
||||
* - 状态 approved/checking(与本面板 canLoad 相同,非该状态本就拉不到数据)
|
||||
* - 该库位**存在盘点内容**(作业记录或空库位标记):没有内容可清,不提供入口
|
||||
*/
|
||||
function canClearLocation(row: Record<string, any>): boolean {
|
||||
if (!canLoad.value || !isLocationTask.value) return false
|
||||
const locationId = Number(row?.location_id)
|
||||
if (!Number.isFinite(locationId) || locationId <= 0) return false
|
||||
return recordCount(row) > 0 || !!row?.is_empty
|
||||
}
|
||||
|
||||
/**
|
||||
* 重盘清除库位(stock.check.recheckClearLocation)
|
||||
*
|
||||
* 清除该库位范围内明细(scope_type=location)的**全部作业记录(含空库位标记)**,库位回到未盘;
|
||||
* 主表状态不回退,明细进度/差异由后端重算 → 成功后重拉本页 + 通知宿主刷新列表。
|
||||
*/
|
||||
async function handleClearLocation(row: Record<string, any>) {
|
||||
const locationId = Number(row?.location_id)
|
||||
if (!taskId.value || !Number.isFinite(locationId) || locationId <= 0) return
|
||||
const count = recordCount(row)
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确定清除库位「${locationLabel(row)}」的盘点信息?\n` +
|
||||
`将删除该库位全部作业记录${row?.is_empty ? '与空库位标记' : ''}(当前 ${count} 条),` +
|
||||
'该库位回到未盘;盘点单状态不变。',
|
||||
'重盘清除库位',
|
||||
{ confirmButtonText: '确定清除', cancelButtonText: '取消', type: 'warning' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
|
||||
clearingLocationId.value = locationId
|
||||
try {
|
||||
const res: any = await stockCheckRecheckClearLocation({
|
||||
id: taskId.value,
|
||||
location_id: locationId
|
||||
})
|
||||
if (!isCheckApiSuccess(res)) {
|
||||
throw new Error(res?.message || '清除库位盘点信息失败')
|
||||
}
|
||||
// 文档未细化 response.data 字段 → 宽松读取清除条数,取不到就给通用文案
|
||||
const data: any = res.data ?? {}
|
||||
const deleted = Number(data.deleted_count ?? data.deleted_ids?.length)
|
||||
ElMessage.success(
|
||||
Number.isFinite(deleted) && deleted > 0 ? `已清除 ${deleted} 条盘点信息` : '库位盘点信息已清除'
|
||||
)
|
||||
await loadRecords()
|
||||
emit('changed')
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 清除库位盘点信息失败', e)
|
||||
ElMessage.error(e?.message || '清除库位盘点信息失败')
|
||||
} finally {
|
||||
clearingLocationId.value = null
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 联动:切换盘点单 / 主表状态变化时重置为默认视图并重新拉取
|
||||
// ============================================================
|
||||
watch(
|
||||
() => [props.row?.id, props.row?.status],
|
||||
() => {
|
||||
view.value = defaultView.value
|
||||
pagination.page = 1
|
||||
syncStats()
|
||||
void loadRecords()
|
||||
},
|
||||
{ immediate: true }
|
||||
@ -308,6 +726,65 @@ watch(
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* ===== workData 展开区:作业记录 / 库位聚合 / 库位商品 三层子列表 ===== */
|
||||
.sub-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
padding: 4px 8px 4px 48px;
|
||||
}
|
||||
|
||||
.sub-empty {
|
||||
padding: 2px 0;
|
||||
}
|
||||
|
||||
.sub-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
font-size: 12px;
|
||||
line-height: 22px;
|
||||
}
|
||||
|
||||
.sub-name {
|
||||
color: #303133;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.sub-code {
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.sub-qty {
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.sub-meta {
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* 未知商品标记(stock_id 为空) */
|
||||
.unknown-tag {
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
.status-checked {
|
||||
color: #67c23a;
|
||||
}
|
||||
|
||||
.diff-text {
|
||||
color: #606266;
|
||||
|
||||
&--profit {
|
||||
color: #67c23a;
|
||||
}
|
||||
|
||||
&--loss {
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
/* 分页器:右对齐 + 「每页条数」下拉与 UpperTable 同宽 80px */
|
||||
.pagination-container {
|
||||
flex-shrink: 0;
|
||||
|
||||
@ -0,0 +1,245 @@
|
||||
<!--
|
||||
CheckReportDialog — 盘点实盘上报弹窗(stock.check.report,覆盖式)
|
||||
|
||||
入口:CheckItemsPanel 行内「上报」按钮(商品行 / 库位行的某个商品均可)
|
||||
|
||||
字段:
|
||||
- 实盘数量(必填,预填行内已填数量)
|
||||
- 未匹配条码(可选,本次变更新增的能力):填了则交给后端按条码解析 ——
|
||||
· 命中系统商品(wms_stock_barcodes 按 barcode + 本仓库)→ 回填 stock_id,按已知商品覆盖上报
|
||||
· 未命中 → 记为**未知商品**(stock_id=NULL + barcode + item_name),无账面、实盘 >0 即盘盈
|
||||
未填条码时走原有逻辑(商品行按明细商品;库位行按所选商品 stock_id)
|
||||
|
||||
覆盖式口径:同明细 + 同商品 + 同库位重复上报=更新已有记录(不新增)。
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
title="上报实盘"
|
||||
width="min(520px, 92vw)"
|
||||
align-center
|
||||
:close-on-click-modal="false"
|
||||
@update:model-value="handleVisibleChange"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<el-form label-width="96px" size="small">
|
||||
<el-form-item label="明细">
|
||||
<span class="value-text">{{ detailLabel }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="本次商品">
|
||||
<span class="value-text">{{ stockLabel }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="库位">
|
||||
<span class="value-text">{{ location || '无库位' }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="实盘数量" required>
|
||||
<el-input-number
|
||||
v-model="form.quantity"
|
||||
:min="0"
|
||||
:step="1"
|
||||
step-strictly
|
||||
controls-position="right"
|
||||
class="quantity-input"
|
||||
placeholder="请输入实盘数量"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="未匹配条码">
|
||||
<el-input
|
||||
v-model="form.barcode"
|
||||
clearable
|
||||
placeholder="扫到系统里没有的商品时填写(留空=按明细商品上报)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.barcode.trim()" label="商品名称">
|
||||
<el-input v-model="form.item_name" clearable placeholder="未知商品名称,留空则用条码" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-alert
|
||||
v-if="form.barcode.trim()"
|
||||
type="warning"
|
||||
:closable="false"
|
||||
show-icon
|
||||
title="已填未匹配条码:后端先按条码匹配系统商品,命中则按该商品覆盖上报;未命中则记为未知商品(无账面,实盘大于 0 即盘盈)。"
|
||||
/>
|
||||
<div v-else class="tip-text">
|
||||
覆盖式上报:同一「明细 + 商品 + 库位」重复上报会更新原记录(不新增)。
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">
|
||||
确认上报
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { isCheckApiSuccess } from '../template-config'
|
||||
import { stockCheckReport, type StockCheckReportParams } from '@/api/stock.check/stock.check'
|
||||
|
||||
defineOptions({ name: 'CheckReportDialog' })
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
visible: boolean
|
||||
/** 目标盘点单ID */
|
||||
taskId?: number
|
||||
/** 目标明细行(含 id/scope_type/location_code/item_code/item_name) */
|
||||
detail?: Record<string, any> | null
|
||||
/** 库位行的目标商品聚合(商品行为 null) */
|
||||
stock?: Record<string, any> | null
|
||||
/** 上报库位(库位行=明细库位;商品行=行内填写值) */
|
||||
location?: string
|
||||
/** 实盘数量默认值(行内已填数量) */
|
||||
defaultQuantity?: number | null
|
||||
}>(),
|
||||
{
|
||||
taskId: 0,
|
||||
detail: null,
|
||||
stock: null,
|
||||
location: '',
|
||||
defaultQuantity: null
|
||||
}
|
||||
)
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:visible', value: boolean): void
|
||||
/** 上报成功(宿主需重拉明细 + 刷新列表) */
|
||||
(e: 'success'): void
|
||||
}>()
|
||||
|
||||
const submitting = ref(false)
|
||||
const form = reactive({ quantity: undefined as number | undefined, barcode: '', item_name: '' })
|
||||
|
||||
/** 明细展示:单号信息在标题栏已足够,这里给「明细ID + 商品/库位」 */
|
||||
const detailLabel = computed(() => {
|
||||
const id = Number(props.detail?.id) || 0
|
||||
if (!id) return '—'
|
||||
const isLocation = String(props.detail?.scope_type ?? '') === 'location'
|
||||
if (!isLocation) {
|
||||
const code = props.detail?.item_code ? String(props.detail.item_code) : ''
|
||||
const name = props.detail?.item_name ? String(props.detail.item_name) : ''
|
||||
const text = [code, name].filter(Boolean).join(' · ')
|
||||
return `#${id}${text ? ` ${text}` : ''}`
|
||||
}
|
||||
const code = props.detail?.location_code ? String(props.detail.location_code) : '无库位'
|
||||
return `#${id} 库位 ${code}`
|
||||
})
|
||||
|
||||
/** 本次上报商品(库位行=行内商品;商品行=明细自身商品) */
|
||||
const stockLabel = computed(() => {
|
||||
const source = props.stock ?? props.detail
|
||||
const code = source?.item_code ? String(source.item_code) : ''
|
||||
const name = source?.item_name ? String(source.item_name) : ''
|
||||
const text = [code, name].filter(Boolean).join(' · ')
|
||||
return text || '—'
|
||||
})
|
||||
|
||||
/** 目标商品库存ID(库位行取行内商品;商品行取明细商品) */
|
||||
const stockId = computed(() => {
|
||||
const raw = props.stock ? props.stock?.stock_id : props.detail?.stock_id
|
||||
const id = Number(raw)
|
||||
return Number.isFinite(id) && id > 0 ? id : 0
|
||||
})
|
||||
|
||||
function handleVisibleChange(value: boolean) {
|
||||
emit('update:visible', value)
|
||||
}
|
||||
|
||||
function handleClosed() {
|
||||
submitting.value = false
|
||||
}
|
||||
|
||||
/** 打开时回填:数量取行内已填值;条码/名称每次打开都清空 */
|
||||
watch(
|
||||
() => props.visible,
|
||||
(visible) => {
|
||||
if (!visible) return
|
||||
form.quantity =
|
||||
props.defaultQuantity === null || props.defaultQuantity === undefined
|
||||
? undefined
|
||||
: Number(props.defaultQuantity)
|
||||
form.barcode = ''
|
||||
form.item_name = ''
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
async function handleSubmit() {
|
||||
const taskId = Number(props.taskId)
|
||||
const detailId = Number(props.detail?.id)
|
||||
if (!Number.isFinite(taskId) || taskId <= 0 || !Number.isFinite(detailId) || detailId <= 0) {
|
||||
ElMessage.error('缺少盘点单ID / 明细ID,无法上报')
|
||||
return
|
||||
}
|
||||
const quantity = Number(form.quantity)
|
||||
if (!Number.isFinite(quantity) || quantity < 0) {
|
||||
ElMessage.warning('请输入不小于 0 的实盘数量')
|
||||
return
|
||||
}
|
||||
|
||||
const barcode = form.barcode.trim()
|
||||
const payload: StockCheckReportParams = {
|
||||
id: taskId,
|
||||
detail_id: detailId,
|
||||
quantity: Math.trunc(quantity)
|
||||
}
|
||||
if (barcode) {
|
||||
// 填了条码 → 交给后端按条码解析(命中=已知商品;未命中=未知商品),不传 stock_id
|
||||
payload.barcode = barcode
|
||||
const itemName = form.item_name.trim()
|
||||
if (itemName) payload.item_name = itemName
|
||||
} else if (stockId.value > 0) {
|
||||
payload.stock_id = stockId.value
|
||||
}
|
||||
const location = String(props.location ?? '').trim()
|
||||
if (location) payload.location = location
|
||||
|
||||
submitting.value = true
|
||||
try {
|
||||
const res: any = await stockCheckReport(payload)
|
||||
if (!isCheckApiSuccess(res)) {
|
||||
throw new Error(res?.message || '上报失败')
|
||||
}
|
||||
const data = res?.data ?? res
|
||||
ElMessage.success(String(data?.mode ?? '') === 'updated' ? '已覆盖上报' : '上报成功')
|
||||
emit('update:visible', false)
|
||||
emit('success')
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 上报实盘失败', e)
|
||||
ElMessage.error(e?.message || '上报失败')
|
||||
} finally {
|
||||
submitting.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.value-text {
|
||||
font-size: 13px;
|
||||
color: #303133;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.quantity-input {
|
||||
width: 160px;
|
||||
}
|
||||
|
||||
.tip-text {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.dialog-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
</style>
|
||||
110
src/views/storage/stockcheck/config/components/RecordImages.vue
Normal file
110
src/views/storage/stockcheck/config/components/RecordImages.vue
Normal file
@ -0,0 +1,110 @@
|
||||
<!--
|
||||
RecordImages — 盘点作业图片缩略图(点击放大预览)
|
||||
|
||||
数据源(两者同构,均为 `[{ id: file_id, url }]`,FileReference business_type=stock_check_record):
|
||||
- stock.check.result 的 rows[].records[].images
|
||||
- stock.check.recordList 的 rows[].images
|
||||
|
||||
用法:<RecordImages :images="row.images" :max="2" />
|
||||
-->
|
||||
<template>
|
||||
<div v-if="urls.length" class="record-images">
|
||||
<el-image
|
||||
v-for="(url, index) in visibleUrls"
|
||||
:key="`${index}-${url}`"
|
||||
:src="url"
|
||||
:preview-src-list="urls"
|
||||
:initial-index="index"
|
||||
fit="cover"
|
||||
preview-teleported
|
||||
class="record-image"
|
||||
>
|
||||
<template #error>
|
||||
<div class="image-error">加载失败</div>
|
||||
</template>
|
||||
</el-image>
|
||||
<span v-if="urls.length > visibleUrls.length" class="more-text">
|
||||
+{{ urls.length - visibleUrls.length }}
|
||||
</span>
|
||||
</div>
|
||||
<span v-else class="hint-text">—</span>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
/**
|
||||
* 图片列表:`[{ id, url }]`(接口口径)或纯 url 字符串数组均可;
|
||||
* 非数组 / 空值按「无图片」处理
|
||||
*/
|
||||
images?: unknown
|
||||
/** 最多平铺几张缩略图,多余折叠为「+N」 */
|
||||
max?: number
|
||||
}>(),
|
||||
{
|
||||
images: () => [],
|
||||
max: 2
|
||||
}
|
||||
)
|
||||
|
||||
/** 全量 url 列表(缩略图只渲染前 N 张,预览图组传全量以便左右翻看) */
|
||||
const urls = computed<string[]>(() => {
|
||||
const raw = Array.isArray(props.images) ? props.images : []
|
||||
const list: string[] = []
|
||||
for (const item of raw) {
|
||||
const url = typeof item === 'string' ? item : (item as any)?.url
|
||||
if (typeof url === 'string' && url.trim() !== '') list.push(url)
|
||||
}
|
||||
return list
|
||||
})
|
||||
|
||||
const visibleUrls = computed(() => {
|
||||
const limit = Number(props.max) > 0 ? Number(props.max) : 2
|
||||
return urls.value.slice(0, limit)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.record-images {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.record-image {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border-radius: 3px;
|
||||
border: 1px solid #ebeef5;
|
||||
cursor: pointer;
|
||||
flex-shrink: 0;
|
||||
|
||||
:deep(img) {
|
||||
object-fit: cover;
|
||||
}
|
||||
}
|
||||
|
||||
.image-error {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
font-size: 10px;
|
||||
color: #c0c4cc;
|
||||
background: #f5f7fa;
|
||||
}
|
||||
|
||||
.more-text {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.hint-text {
|
||||
font-size: 12px;
|
||||
color: #c0c4cc;
|
||||
}
|
||||
</style>
|
||||
@ -10,10 +10,12 @@
|
||||
* 新建 stock.check.create → pages/CheckFormDialog.vue
|
||||
* 定式清单 stock.check.patternList → pages/CheckPatternDialog.vue(快速创建)
|
||||
* 快速创建 stock.check.patternCreate → pages/CheckPatternDialog.vue(按定式创建,免填日期)
|
||||
* 加明细 stock.check.addDetail → pages/CheckStockPickerDialog.vue
|
||||
* 加明细 stock.check.addDetail → pages/CheckStockPickerDialog.vue(商品:stock_ids;库位编码:locations)
|
||||
* 加库位 stock.check.addLocationDetail → pages/CheckStockPickerDialog.vue(勾选库位:location_ids,库位ID直查)
|
||||
* 上报 stock.check.report → CheckItemsPanel(行内 / 批量上报,覆盖式)
|
||||
* 记录列表 stock.check.recordList → CheckRecordsPanel(作业记录页签)
|
||||
* 记录删除 stock.check.recordDelete → CheckRecordsPanel(仅 approved/checking 可删)
|
||||
* 标空库位 stock.check.markEmpty → CheckItemsPanel(库位类无商品行「标记为空」)
|
||||
* 作业数据 stock.check.workData → CheckRecordsPanel(「作业明细」页签,location/goods/space 三视图)
|
||||
* 记录删除 stock.check.recordDelete → CheckRecordsPanel(展开行内删除,仅 approved/checking 可删)
|
||||
* 提交 stock.check.submit → index.vue 操作列
|
||||
* 审核 stock.check.audit → index.vue 操作列(通过 / 驳回)
|
||||
* 完成 stock.check.finish → index.vue 操作列
|
||||
@ -241,7 +243,10 @@ export function getOptions(field: string): { label: string; value: string }[] {
|
||||
* 是否为「库位类」盘点范围(all / location)
|
||||
*
|
||||
* 决定明细行形态与添加明细的入参:
|
||||
* - true → 明细为「库位行」(scope_type=location),addDetail 传 locations(库位编码)
|
||||
* - true → 明细为「库位行」(scope_type=location),三条通道:
|
||||
* ① 勾选库位 → addLocationDetail 传 location_ids(库位ID直查)
|
||||
* ② 手填编码 → addDetail 传 locations(库位编码,兼容通道)
|
||||
* ③ type=all 且都不传 → addDetail 不传库位,后端自动生成全仓盘点范围
|
||||
* - false → 明细为「商品行」(scope_type=goods),addDetail 传 stock_ids
|
||||
*/
|
||||
export function isLocationScopeType(type: unknown): boolean {
|
||||
@ -563,6 +568,11 @@ export interface OperationButtonConfig {
|
||||
disabledOnField?: string
|
||||
/** 按行数据决定是否渲染该按钮(返回 false 隐藏;用于按 status 显示可用动作) */
|
||||
visibleWhen?: (row: Record<string, any>) => boolean
|
||||
/**
|
||||
* 按行数据动态覆盖按钮文案(返回空串/undefined 时回退 label)
|
||||
* 例:加明细按钮在库位类任务上显示「添加库位」、商品类显示「添加商品」
|
||||
*/
|
||||
labelWhen?: (row: Record<string, any>) => string
|
||||
confirmMessage?: string
|
||||
confirmTitle?: string
|
||||
confirmType?: 'warning' | 'danger' | 'info'
|
||||
@ -1132,6 +1142,8 @@ const OPERATION_BUTTONS: OperationButtonConfig[] = [
|
||||
{
|
||||
key: 'addItems',
|
||||
label: '添加商品',
|
||||
// 库位类任务(all/location)明细为库位行 → 文案换成「添加库位」
|
||||
labelWhen: (row) => (isLocationScopeType(row?.type) ? '添加库位' : '添加商品'),
|
||||
actionType: 'action',
|
||||
type: 'primary',
|
||||
visibleWhen: (row) => EDITABLE_STATUSES.includes(row?.status)
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
<!--
|
||||
CheckStockPickerDialog — 添加盘点明细(stock.check.addDetail)
|
||||
CheckStockPickerDialog — 添加盘点明细
|
||||
|
||||
两种模式(由来源盘点单的 type 决定):
|
||||
- 商品类(type=store/goods):从 storage.inventory.list 选商品 → 传 stock_ids
|
||||
- 库位类(type=all/location):填写/粘贴库位编码(wms_location_space.space_code)→ 传 locations
|
||||
· type=all 不填库位 = 不传 locations,由后端自动拉取全仓启用库位
|
||||
- 商品类(type=store/goods):从 storage.inventory.list 选商品 → stock.check.addDetail 传 stock_ids
|
||||
- 库位类(type=all/location):从库位列表(index.searchSpace)勾选库位 →
|
||||
· 已勾选库位 → stock.check.addLocationDetail 传 location_ids(库位ID直查,不解析编码)
|
||||
· 未勾选但手填了库位编码 → stock.check.addDetail 传 locations(兼容通道)
|
||||
· 未勾选且未填且 type=all → stock.check.addDetail 不传库位,由后端自动拉取全仓启用库位
|
||||
|
||||
响应含 invalid_stock_ids(商品)与 invalid_locations(库位)两类无效项,均需在提示中体现。
|
||||
无效项提示:addLocationDetail → invalid_location_ids;addDetail → invalid_stock_ids / invalid_locations。
|
||||
仅 created(新建)/ rejected(驳回)状态可添加,后端会校验。
|
||||
-->
|
||||
<template>
|
||||
@ -91,7 +93,7 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- ===== 库位类任务:填写/粘贴库位编码 → locations ===== -->
|
||||
<!-- ===== 库位类任务:勾选库位(location_ids)→ addLocationDetail ===== -->
|
||||
<template v-else>
|
||||
<el-alert
|
||||
type="info"
|
||||
@ -99,37 +101,112 @@
|
||||
show-icon
|
||||
:title="locationAlertText"
|
||||
/>
|
||||
<el-input
|
||||
v-model="locationText"
|
||||
type="textarea"
|
||||
:rows="8"
|
||||
resize="none"
|
||||
placeholder="每行一个库位编码,也可用逗号 / 空格分隔,如:A-01-01"
|
||||
/>
|
||||
<div class="location-preview">
|
||||
<span class="stat-text">已识别 {{ locationCodes.length }} 个库位</span>
|
||||
<el-tag
|
||||
v-for="code in locationCodes.slice(0, 50)"
|
||||
:key="code"
|
||||
|
||||
<!-- 库位筛选 -->
|
||||
<div class="picker-filters">
|
||||
<el-input
|
||||
v-model="spaceFilters.keyword"
|
||||
size="small"
|
||||
class="location-tag"
|
||||
clearable
|
||||
placeholder="库位编码 / 自定义名称 / 自定义编码"
|
||||
class="filter-item filter-item--keyword"
|
||||
@keyup.enter="handleSpaceSearch"
|
||||
/>
|
||||
<el-button size="small" type="primary" :loading="spaceLoading" @click="handleSpaceSearch">
|
||||
查询
|
||||
</el-button>
|
||||
<el-button size="small" @click="handleSpaceReset">重置</el-button>
|
||||
</div>
|
||||
|
||||
<!-- 库位列表(多选,跨页保留勾选) -->
|
||||
<div ref="spaceTableHostRef" class="table-host">
|
||||
<el-table
|
||||
ref="spaceTableRef"
|
||||
v-loading="spaceLoading"
|
||||
:data="spaceRows"
|
||||
:row-key="(row: any) => row.id"
|
||||
border
|
||||
stripe
|
||||
size="small"
|
||||
:height="tableHeight"
|
||||
@selection-change="handleSpaceSelectionChange"
|
||||
>
|
||||
{{ code }}
|
||||
<el-table-column type="selection" width="45" :reserve-selection="true" />
|
||||
<el-table-column prop="id" label="库位ID" width="90" align="center" />
|
||||
<el-table-column prop="custom_name" label="自定义名称" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="custom_code" label="自定义编码" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="space_code" label="库位编码" min-width="150" show-overflow-tooltip />
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">暂无库位数据</div>
|
||||
</template>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<!-- 分页 -->
|
||||
<div class="pagination-container">
|
||||
<el-pagination
|
||||
v-model:current-page="spacePagination.page"
|
||||
v-model:page-size="spacePagination.pageSize"
|
||||
:page-sizes="[10, 20, 50, 100]"
|
||||
:total="spacePagination.total"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
background
|
||||
size="small"
|
||||
@current-change="loadSpaceRows"
|
||||
@size-change="handleSpaceSizeChange"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- 已勾选库位 -->
|
||||
<div class="location-preview">
|
||||
<span class="stat-text">已选 {{ selectedLocationIds.length }} 个库位</span>
|
||||
<el-tag
|
||||
v-for="row in selectedSpaceRows.slice(0, 50)"
|
||||
:key="row.id"
|
||||
size="small"
|
||||
closable
|
||||
class="location-tag"
|
||||
@close="removeSpaceRow(row)"
|
||||
>
|
||||
{{ spaceLabel(row) }}
|
||||
</el-tag>
|
||||
<span v-if="locationCodes.length > 50" class="stat-text">
|
||||
…等共 {{ locationCodes.length }} 个
|
||||
<el-button
|
||||
v-if="selectedSpaceRows.length"
|
||||
link
|
||||
size="small"
|
||||
type="danger"
|
||||
@click="clearSpaceSelection"
|
||||
>
|
||||
清空
|
||||
</el-button>
|
||||
<span v-if="selectedSpaceRows.length > 50" class="stat-text">
|
||||
…等共 {{ selectedSpaceRows.length }} 个
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- 兼容通道:手动输入库位编码(走 addDetail 的 locations) -->
|
||||
<el-collapse class="location-manual">
|
||||
<el-collapse-item name="manual">
|
||||
<template #title>
|
||||
<span class="collapse-title">手动输入库位编码(可选 · 未勾选库位时生效)</span>
|
||||
</template>
|
||||
<el-input
|
||||
v-model="locationText"
|
||||
type="textarea"
|
||||
:rows="4"
|
||||
resize="none"
|
||||
placeholder="每行一个库位编码,也可用逗号 / 空格分隔,如:A-01-01"
|
||||
/>
|
||||
<div class="stat-text">已识别 {{ locationCodes.length }} 个库位编码</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<span class="selected-tip">
|
||||
{{ isLocationMode
|
||||
? `已填 ${locationCodes.length} 个库位`
|
||||
: `已选 ${selectedRows.length} 行 · 去重后 ${selectedStockIds.length} 个商品` }}
|
||||
</span>
|
||||
<span class="selected-tip">{{ submitChannelTip }}</span>
|
||||
<div class="footer-buttons">
|
||||
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
||||
<el-button
|
||||
@ -152,8 +229,10 @@ import { computed, nextTick, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { useResizeObserver } from '@vueuse/core'
|
||||
import { getInventoryList } from '@/api/storage.inventory/inventory'
|
||||
import * as indexApi from '@/api/index/index'
|
||||
import {
|
||||
stockCheckAddDetail,
|
||||
stockCheckAddLocationDetail,
|
||||
type StockCheckAddDetailParams
|
||||
} from '@/api/stock.check/stock.check'
|
||||
import { isCheckApiSuccess, isLocationScopeType } from '../config/template-config'
|
||||
@ -184,7 +263,34 @@ const dialogTitle = computed(() => {
|
||||
return isLocationMode.value ? `添加盘点库位${suffix}` : `添加盘点商品${suffix}`
|
||||
})
|
||||
|
||||
// ===== 库位模式 =====
|
||||
// ===== 库位模式:库位选择(多选,主通道) =====
|
||||
const spaceFilters = reactive({ keyword: '' })
|
||||
const spaceRows = ref<Record<string, any>[]>([])
|
||||
const spaceLoading = ref(false)
|
||||
const spaceTableRef = ref<any>(null)
|
||||
const spaceTableHostRef = ref<HTMLElement | null>(null)
|
||||
const selectedSpaceRows = ref<Record<string, any>[]>([])
|
||||
const spacePagination = reactive({ page: 1, pageSize: 20, total: 0 })
|
||||
|
||||
/** 已勾选库位ID(去重,>0) */
|
||||
const selectedLocationIds = computed<number[]>(() => {
|
||||
const ids = selectedSpaceRows.value
|
||||
.map((row) => Number(row.id ?? row.space_id))
|
||||
.filter((id) => Number.isFinite(id) && id > 0)
|
||||
return [...new Set(ids)]
|
||||
})
|
||||
|
||||
/** 库位展示名:自定义名称 → 自定义编码 → 库位编码 → ID */
|
||||
function spaceLabel(row: Record<string, any>): string {
|
||||
return (
|
||||
toText(row?.custom_name) ||
|
||||
toText(row?.custom_code) ||
|
||||
toText(row?.space_code) ||
|
||||
`ID ${row?.id ?? ''}`
|
||||
)
|
||||
}
|
||||
|
||||
// ===== 库位模式:手动输入库位编码(次选,走 addDetail 的 locations) =====
|
||||
/** 库位编码输入(每行一个,或逗号/空格/顿号分隔) */
|
||||
const locationText = ref('')
|
||||
|
||||
@ -196,16 +302,36 @@ const locationCodes = computed<string[]>(() => {
|
||||
|
||||
const locationAlertText = computed(() =>
|
||||
props.taskType === 'all'
|
||||
? '按库位盘点(默认全仓):不填库位时,由后端自动拉取全仓库启用库位生成盘点范围。'
|
||||
: '按库位盘点:请填写要盘点的库位编码(不存在的库位会被后端列入无效库位)。'
|
||||
? '按库位盘点(默认全仓):勾选库位则按库位添加;一个都不勾选时,由后端自动拉取全仓库启用库位生成盘点范围。'
|
||||
: '按库位盘点:请从下方列表勾选要盘点的库位(后端按库位ID直接入库,无需担心编码写错)。'
|
||||
)
|
||||
|
||||
/** 库位模式:填了库位,或 all 类型(允许不填=全仓) */
|
||||
/** 库位模式:勾了库位 / 填了库位编码 / all 类型(允许不选=全仓) */
|
||||
const canSubmit = computed(() => {
|
||||
if (isLocationMode.value) return locationCodes.value.length > 0 || props.taskType === 'all'
|
||||
if (isLocationMode.value) {
|
||||
return (
|
||||
selectedLocationIds.value.length > 0 || locationCodes.value.length > 0 || props.taskType === 'all'
|
||||
)
|
||||
}
|
||||
return selectedStockIds.value.length > 0
|
||||
})
|
||||
|
||||
/** 底部提示:当前会走哪条提交通道 */
|
||||
const submitChannelTip = computed(() => {
|
||||
if (!isLocationMode.value) {
|
||||
return `已选 ${selectedRows.value.length} 行 · 去重后 ${selectedStockIds.value.length} 个商品`
|
||||
}
|
||||
if (selectedLocationIds.value.length > 0) {
|
||||
return `已选 ${selectedLocationIds.value.length} 个库位 · 按库位ID添加`
|
||||
}
|
||||
if (locationCodes.value.length > 0) {
|
||||
return `未勾选库位 · 将按手动输入的 ${locationCodes.value.length} 个库位编码添加`
|
||||
}
|
||||
return props.taskType === 'all'
|
||||
? '未选库位 · 将由后端生成全仓库盘点范围'
|
||||
: '请至少勾选一个库位'
|
||||
})
|
||||
|
||||
const filters = reactive({ keyword: '', batch_no: '' })
|
||||
const rows = ref<Record<string, any>[]>([])
|
||||
const loading = ref(false)
|
||||
@ -223,6 +349,12 @@ useResizeObserver(tableHostRef, (entries) => {
|
||||
if (h >= 120) tableHeight.value = Math.floor(h)
|
||||
})
|
||||
|
||||
// 库位列表与商品列表共用同一个自适应高度(同一时刻只渲染一个)
|
||||
useResizeObserver(spaceTableHostRef, (entries) => {
|
||||
const h = entries[0]?.contentRect.height ?? 0
|
||||
if (h >= 120) tableHeight.value = Math.floor(h)
|
||||
})
|
||||
|
||||
/** 提交前按 stock_id 去重 */
|
||||
const selectedStockIds = computed(() => {
|
||||
const ids = selectedRows.value
|
||||
@ -237,8 +369,14 @@ function handleVisibleChange(value: boolean) {
|
||||
|
||||
function handleClosed() {
|
||||
tableRef.value?.clearSelection?.()
|
||||
spaceTableRef.value?.clearSelection?.()
|
||||
selectedRows.value = []
|
||||
selectedSpaceRows.value = []
|
||||
rows.value = []
|
||||
spaceRows.value = []
|
||||
spacePagination.page = 1
|
||||
spacePagination.total = 0
|
||||
spaceFilters.keyword = ''
|
||||
locationText.value = ''
|
||||
submitting.value = false
|
||||
}
|
||||
@ -328,62 +466,202 @@ function handleSelectionChange(selection: Record<string, any>[]) {
|
||||
selectedRows.value = selection
|
||||
}
|
||||
|
||||
// ===== 库位列表(index.searchSpace,仅取库位ID/编码/名称) =====
|
||||
async function loadSpaceRows() {
|
||||
spaceLoading.value = true
|
||||
try {
|
||||
const res: any = await indexApi.searchSpace({
|
||||
keyword: spaceFilters.keyword.trim(),
|
||||
page: spacePagination.page,
|
||||
pageSize: spacePagination.pageSize
|
||||
})
|
||||
const data = res?.data ?? res
|
||||
const rawList: any[] = Array.isArray(data?.list) ? data.list : Array.isArray(data) ? data : []
|
||||
spaceRows.value = rawList
|
||||
.map((item) => ({
|
||||
...item,
|
||||
id: Number(item?.id ?? item?.space_id),
|
||||
custom_name: toText(item?.custom_name ?? item?.customName),
|
||||
custom_code: toText(item?.custom_code ?? item?.customCode ?? item?.custom_barcode),
|
||||
space_code: toText(item?.space_code)
|
||||
}))
|
||||
.filter((row) => Number.isFinite(row.id) && row.id > 0)
|
||||
spacePagination.total =
|
||||
Number(data?.pagination?.total ?? data?.total ?? spaceRows.value.length) || 0
|
||||
nextTick(() => spaceTableRef.value?.setScrollTop?.(0))
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 查询库位失败', e)
|
||||
ElMessage.error(e?.message || '查询库位失败')
|
||||
spaceRows.value = []
|
||||
spacePagination.total = 0
|
||||
} finally {
|
||||
spaceLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function handleSpaceSearch() {
|
||||
spacePagination.page = 1
|
||||
loadSpaceRows()
|
||||
}
|
||||
|
||||
function handleSpaceReset() {
|
||||
spaceFilters.keyword = ''
|
||||
spacePagination.page = 1
|
||||
loadSpaceRows()
|
||||
}
|
||||
|
||||
function handleSpaceSizeChange() {
|
||||
spacePagination.page = 1
|
||||
loadSpaceRows()
|
||||
}
|
||||
|
||||
function handleSpaceSelectionChange(selection: Record<string, any>[]) {
|
||||
selectedSpaceRows.value = selection
|
||||
}
|
||||
|
||||
/** 移除单个已选库位(同时取消表格勾选,避免与 reserve-selection 不一致) */
|
||||
function removeSpaceRow(row: Record<string, any>) {
|
||||
spaceTableRef.value?.toggleRowSelection?.(row, false)
|
||||
selectedSpaceRows.value = selectedSpaceRows.value.filter(
|
||||
(item) => String(item.id) !== String(row.id)
|
||||
)
|
||||
}
|
||||
|
||||
function clearSpaceSelection() {
|
||||
spaceTableRef.value?.clearSelection?.()
|
||||
selectedSpaceRows.value = []
|
||||
}
|
||||
|
||||
/** 数组 → 去重后的有效数字列表 */
|
||||
function toNumberList(value: unknown): number[] {
|
||||
if (!Array.isArray(value)) return []
|
||||
return value.map((v) => Number(v)).filter((v) => Number.isFinite(v))
|
||||
}
|
||||
|
||||
/** 数组 → 去空后的字符串列表 */
|
||||
function toStringList(value: unknown): string[] {
|
||||
if (!Array.isArray(value)) return []
|
||||
return value.filter((v) => v !== undefined && v !== null && v !== '').map((v) => String(v))
|
||||
}
|
||||
|
||||
/**
|
||||
* 统一处理「添加明细」响应:校验成功码、提取 added/skipped、汇总无效项提示。
|
||||
* 失败时抛错(由调用方 catch 提示)。
|
||||
*/
|
||||
function resolveAddResult(
|
||||
res: any,
|
||||
invalid: { ids?: number[]; codes?: string[]; stocks?: number[] } = {}
|
||||
): { added: number; skipped: number } {
|
||||
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 parts = [`新增 ${added} 项`]
|
||||
if (skipped) parts.push(`跳过已存在 ${skipped} 项`)
|
||||
if (invalid.ids?.length) parts.push(`无效库位 ${invalid.ids.length} 个`)
|
||||
if (invalid.codes?.length) parts.push(`无效库位编码 ${invalid.codes.length} 个`)
|
||||
if (invalid.stocks?.length) parts.push(`无效商品 ${invalid.stocks.length} 个`)
|
||||
if (invalid.ids?.length || invalid.codes?.length || invalid.stocks?.length) {
|
||||
ElMessage.warning(parts.join(','))
|
||||
} else {
|
||||
ElMessage.success(parts.join(','))
|
||||
}
|
||||
return { added, skipped }
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
const taskId = Number(props.taskId)
|
||||
if (!Number.isFinite(taskId) || taskId <= 0) {
|
||||
ElMessage.error('缺少盘点单ID,无法添加明细')
|
||||
return
|
||||
}
|
||||
if (isLocationMode.value) {
|
||||
await submitLocationRows(taskId)
|
||||
return
|
||||
}
|
||||
await submitGoodsRows(taskId)
|
||||
}
|
||||
|
||||
/**
|
||||
* 库位类任务:三条通道(优先级从高到低)
|
||||
* ① 已勾选库位 → stock.check.addLocationDetail(库位ID直查,不解析编码)
|
||||
* ② 未勾选但填了库位编码 → stock.check.addDetail(locations 兼容通道)
|
||||
* ③ type=all 且都未填 → stock.check.addDetail 不传库位,后端自动生成全仓盘点范围
|
||||
*/
|
||||
async function submitLocationRows(taskId: number) {
|
||||
const locationIds = selectedLocationIds.value
|
||||
if (locationIds.length > 0) {
|
||||
submitting.value = true
|
||||
try {
|
||||
const res: any = await stockCheckAddLocationDetail({ id: taskId, location_ids: locationIds })
|
||||
const data = res?.data ?? res
|
||||
const result = resolveAddResult(res, { ids: toNumberList(data?.invalid_location_ids) })
|
||||
emit('update:visible', false)
|
||||
emit('success', result)
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 添加盘点库位失败', e)
|
||||
ElMessage.error(e?.message || '添加盘点库位失败')
|
||||
} finally {
|
||||
submitting.value = false
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const payload: StockCheckAddDetailParams = { id: taskId }
|
||||
if (isLocationMode.value) {
|
||||
const codes = locationCodes.value
|
||||
if (!codes.length) {
|
||||
if (props.taskType !== 'all') {
|
||||
ElMessage.warning('请填写至少一个库位编码')
|
||||
return
|
||||
}
|
||||
// type=all:不传 locations,由后端自动拉取全仓启用库位
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'未填写库位编码,将由后端自动拉取全仓库启用库位生成盘点范围,确定继续?',
|
||||
'添加盘点库位',
|
||||
{ confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
payload.locations = codes
|
||||
}
|
||||
} else {
|
||||
const stockIds = selectedStockIds.value
|
||||
if (!stockIds.length) {
|
||||
ElMessage.warning('请先勾选要盘点的商品')
|
||||
if (locationCodes.value.length > 0) {
|
||||
payload.locations = locationCodes.value
|
||||
} else if (props.taskType === 'all') {
|
||||
// type=all:不传库位,由后端自动拉取全仓启用库位
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'未选择库位,将由后端自动拉取全仓库启用库位生成盘点范围,确定继续?',
|
||||
'添加盘点库位',
|
||||
{ confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
payload.stock_ids = stockIds
|
||||
} else {
|
||||
ElMessage.warning('请至少选择一个库位')
|
||||
return
|
||||
}
|
||||
|
||||
submitting.value = true
|
||||
try {
|
||||
const res: any = await stockCheckAddDetail(payload)
|
||||
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 parts = [`新增 ${added} 项`]
|
||||
if (skipped) parts.push(`跳过已存在 ${skipped} 项`)
|
||||
if (invalidStocks.length) parts.push(`无效商品 ${invalidStocks.length} 个`)
|
||||
if (invalidLocations.length) parts.push(`无效库位 ${invalidLocations.length} 个`)
|
||||
if (invalidStocks.length || invalidLocations.length) ElMessage.warning(parts.join(','))
|
||||
else ElMessage.success(parts.join(','))
|
||||
const data = res?.data ?? res
|
||||
const result = resolveAddResult(res, {
|
||||
codes: toStringList(data?.invalid_locations),
|
||||
// 编码通道一般不会返回库位ID无效项,兜底提示(addDetail 响应的新增字段)
|
||||
ids: toNumberList(data?.invalid_location_ids)
|
||||
})
|
||||
emit('update:visible', false)
|
||||
emit('success', { added, skipped })
|
||||
emit('success', result)
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 添加盘点明细失败', e)
|
||||
ElMessage.error(e?.message || '添加盘点明细失败')
|
||||
} finally {
|
||||
submitting.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 商品类任务:stock.check.addDetail 传 stock_ids */
|
||||
async function submitGoodsRows(taskId: number) {
|
||||
const stockIds = selectedStockIds.value
|
||||
if (!stockIds.length) {
|
||||
ElMessage.warning('请先勾选要盘点的商品')
|
||||
return
|
||||
}
|
||||
|
||||
submitting.value = true
|
||||
try {
|
||||
const res: any = await stockCheckAddDetail({ id: taskId, stock_ids: stockIds })
|
||||
const data = res?.data ?? res
|
||||
const result = resolveAddResult(res, { stocks: toNumberList(data?.invalid_stock_ids) })
|
||||
emit('update:visible', false)
|
||||
emit('success', result)
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 添加盘点明细失败', e)
|
||||
ElMessage.error(e?.message || '添加盘点明细失败')
|
||||
@ -403,9 +681,18 @@ watch(
|
||||
selectedRows.value = []
|
||||
rows.value = []
|
||||
locationText.value = ''
|
||||
nextTick(() => tableRef.value?.clearSelection?.())
|
||||
// 库位模式不需要拉库存列表
|
||||
if (!isLocationMode.value) void loadRows()
|
||||
spaceFilters.keyword = ''
|
||||
spacePagination.page = 1
|
||||
spacePagination.total = 0
|
||||
selectedSpaceRows.value = []
|
||||
spaceRows.value = []
|
||||
nextTick(() => {
|
||||
tableRef.value?.clearSelection?.()
|
||||
spaceTableRef.value?.clearSelection?.()
|
||||
})
|
||||
// 两种模式各自拉数据:商品模式拉库存列表,库位模式拉库位列表
|
||||
if (isLocationMode.value) void loadSpaceRows()
|
||||
else void loadRows()
|
||||
}
|
||||
)
|
||||
</script>
|
||||
@ -456,6 +743,28 @@ watch(
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
/* 库位模式:手动输入库位编码(兼容通道) */
|
||||
.location-manual {
|
||||
flex-shrink: 0;
|
||||
border-top: none;
|
||||
|
||||
:deep(.el-collapse-item__header) {
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
border-bottom: none;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
:deep(.el-collapse-item__wrap) {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.collapse-title {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
}
|
||||
|
||||
.location-tag {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user