liufumingren 6e1e7a0f19 fix(stock): 清空商品后解锁仓库下拉,并新增创建页重置按钮
- 货主判定只统计仍持有商品的明细行,清空商品后仓库下拉/商品搜索范围立即解除
- 商品清空时同步清掉货主快照;自动带出的编码/名称/规格/单位一并清空,
  手工改过的编码保留
- 提交前货主一致性校验只针对已选商品的行
- 入库/出库创建页新增「重置」按钮:清空单据头与明细、清除校验提示,不离开页面

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-11-05 15:20:23 +08:00

531 lines
18 KiB
Vue
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

<script setup lang="ts">
import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
import { inboundOrderApi } from '@/api/inboundOrder'
import { getWarehouseOptions, type WarehouseOption } from '@/api/warehouse'
import { getExpressCompanyOptions, type ExpressCompanyOption } from '@/api/expressCompany'
import type { ProductSearchItem } from '@/api/product'
import ProductSelect from '@/components/ProductSelect.vue'
import VirtualSelect from '@/components/VirtualSelect.vue'
import { useWarehouseGoodsScope } from '@/composables/useWarehouseGoodsScope'
/** 入库类型:RK 组(WMS 编码,与入库单列表保持一致) */
const TYPE_OPTIONS = [
{ label: 'B2B入库(B2BRK)', value: 'B2BRK' },
{ label: '生产入库(SCRK)', value: 'SCRK' },
{ label: '领用入库(LYRK)', value: 'LYRK' },
{ label: '残次品入库(CCRK)', value: 'CCRK' },
{ label: '采购入库(CGRK)', value: 'CGRK' },
{ label: '调拨入库(DBRK)', value: 'DBRK' },
{ label: '其他入库(QTRK)', value: 'QTRK' },
]
const INVENTORY_TYPE_OPTIONS = [
{ label: '正品(ZP)', value: 'ZP' },
{ label: '残次(CC)', value: 'CC' },
]
const router = useRouter()
const warehouses = ref<WarehouseOption[]>([])
/** 快递公司字典(物流公司下拉选项,不区分主体) */
const expressCompanies = ref<ExpressCompanyOption[]>([])
/* -------------------- 单据信息(页面头部) -------------------- */
interface HeaderForm {
warehouse_id: number | null
inbound_type: string
supplier: string
supplier_code: string
purchase_order_code: string
express_code: string
logistics_code: string
logistics_name: string
operate_time: string
expect_start_time: string
expect_end_time: string
total_amount: number
remark: string
}
function emptyForm(): HeaderForm {
return {
warehouse_id: null,
inbound_type: 'CGRK',
supplier: '',
supplier_code: '',
purchase_order_code: '',
express_code: '',
logistics_code: '',
logistics_name: '',
operate_time: '',
expect_start_time: '',
expect_end_time: '',
total_amount: 0,
remark: '',
}
}
const formRef = ref<FormInstance>()
const form = reactive(emptyForm())
const rules: FormRules = {
warehouse_id: [{ required: true, message: '请选择仓库', trigger: 'change' }],
}
/** 选择物流公司后带出名称(下拉已展示「名称(编码)」,名称供推送 logisticsName 与列表展示) */
function handleExpressChange(code: string | null) {
const company = expressCompanies.value.find(c => c.code === code)
form.logistics_name = company ? company.name : ''
}
/* -------------------- 商品明细(内联,随单创建) -------------------- */
interface LineItem {
product_id: number | null
/** 所选商品的所属货主(用于与仓库做同货主校验) */
product_subsidiary_id: number | null
/** 由商品自动带出的编码,用于清除商品时判断快照是否还需要保留 */
autofill_code?: string
name: string
code: string
spec: string
unit: string
quantity: number
price: number | null
inventory_type: 'ZP' | 'CC'
remark: string
}
const lines = ref<LineItem[]>([])
function addLine() {
lines.value.push({
product_id: null, product_subsidiary_id: null, name: '', code: '', spec: '', unit: '',
quantity: 1, price: null, inventory_type: 'ZP', remark: '',
})
}
function removeLine(index: number) {
lines.value.splice(index, 1)
}
/** 仓库 ↔ 商品双向货主约束:仓库决定单据货主,明细商品必须同货主 */
const { warehouseOwnerId, goodsOwnerId, goodsOwnerConflict, scopeSubsidiaryId, selectableWarehouses, canPickGoods } = useWarehouseGoodsScope({
warehouseId: computed(() => form.warehouse_id),
warehouses,
// 只有仍持有商品的明细才参与货主判定,清空商品后立即解锁仓库下拉
lineOwners: () => lines.value.map(line => (line.product_id ? line.product_subsidiary_id : null)),
clearMismatchedGoods: ownerId => {
let cleared = 0
for (const line of lines.value) {
if (!line.product_id) continue
if (line.product_subsidiary_id != null && Number(line.product_subsidiary_id) === Number(ownerId)) continue
line.product_id = null
line.product_subsidiary_id = null
line.name = ''
line.code = ''
line.spec = ''
cleared += 1
}
return cleared
},
})
// 商品被清空后同步清掉货主快照与自动带出的商品信息,避免仓库下拉仍被锁定、或残留上次商品
watch(
() => lines.value.map(line => line.product_id).join(','),
() => {
for (const line of lines.value) {
if (line.product_id) continue
line.product_subsidiary_id = null
if (line.autofill_code && line.code === line.autofill_code) {
line.code = ''
line.name = ''
line.spec = ''
line.unit = ''
}
line.autofill_code = ''
}
},
)
function onLineProductSelect(index: number, p: ProductSearchItem) {
const line = lines.value[index]
if (!line) return
line.product_id = p.id
line.product_subsidiary_id = p.subsidiary_id == null ? null : Number(p.subsidiary_id)
line.autofill_code = p.item_code || ''
line.name = p.item_name || ''
line.code = p.item_code || ''
line.spec = p.sku_property || ''
if (line.price == null) line.price = 0
}
const itemsTotal = computed(() =>
lines.value.reduce((sum, line) => sum + (Number(line.quantity) || 0) * (Number(line.price) || 0), 0),
)
/* -------------------- 提交 -------------------- */
const submitting = ref(false)
async function submit() {
if (!formRef.value) return
await formRef.value.validate(async (valid) => {
if (!valid) return
if (!lines.value.length) {
ElMessage.warning('请至少添加一行商品明细')
return
}
for (const [ i, line ] of lines.value.entries()) {
if (!line.product_id && !line.code) {
ElMessage.warning(`第 ${i + 1} 行:请选择系统商品`)
return
}
if (!(Number(line.quantity) > 0)) {
ElMessage.warning(`第 ${i + 1} 行:数量需大于 0`)
return
}
}
// 明细商品必须与仓库同货主,且同一单据明细之间也不能跨货主
if (goodsOwnerConflict.value) {
ElMessage.warning('明细商品属于不同货主(所属公司),请统一后再提交')
return
}
if (warehouseOwnerId.value !== null
&& lines.value.some(line => line.product_id && line.product_subsidiary_id != null
&& Number(line.product_subsidiary_id) !== warehouseOwnerId.value)) {
ElMessage.warning('存在与仓库货主(所属公司)不一致的商品,请重新选择')
return
}
submitting.value = true
try {
await inboundOrderApi.create({
warehouse_id: form.warehouse_id,
inbound_type: form.inbound_type,
supplier: form.supplier || null,
supplier_code: form.supplier_code || null,
purchase_order_code: form.purchase_order_code || null,
express_code: form.express_code || null,
logistics_code: form.logistics_code || null,
logistics_name: form.logistics_name || null,
operate_time: form.operate_time || null,
expect_start_time: form.expect_start_time || null,
expect_end_time: form.expect_end_time || null,
total_amount: form.total_amount,
remark: form.remark || null,
items: lines.value.map(line => ({
product_id: line.product_id,
name: line.name || null,
code: line.code || null,
spec: line.spec || null,
unit: line.unit || null,
quantity: Number(line.quantity),
price: line.price == null ? null : Number(line.price),
inventory_type: line.inventory_type,
remark: line.remark || null,
})),
})
ElMessage.success('入库单创建成功')
router.push('/inbound-order')
} catch {
// 拦截器已提示
} finally {
submitting.value = false
}
})
}
function cancel() {
router.push('/inbound-order')
}
/** 重置表单:清空单据头与明细,回到初始状态(不离开当前页面) */
async function handleReset() {
Object.assign(form, emptyForm())
lines.value = []
addLine()
// 清空字段会让下拉等控件回抛 change 校验,等它们处理完再统一清掉错误提示
await nextTick()
setTimeout(() => formRef.value?.clearValidate())
ElMessage.success('表单已重置')
}
async function fetchOptions() {
try {
const [ warehouseRes, expressRes ] = await Promise.all([
getWarehouseOptions(),
getExpressCompanyOptions(),
])
warehouses.value = warehouseRes
expressCompanies.value = expressRes
} catch {
// 拦截器已提示
}
}
onMounted(async () => {
await fetchOptions()
addLine()
})
</script>
<template>
<el-card class="create-card">
<template #header>
<div class="page-header">
<span>创建入库单</span>
<div>
<el-button @click="handleReset">重置</el-button>
<el-button @click="cancel">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submit">保存</el-button>
</div>
</div>
</template>
<div class="page-scroll">
<el-form ref="formRef" :model="form" :rules="rules" size="small" label-width="96px" class="compact-form">
<el-divider content-position="left">单据信息</el-divider>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="仓库" prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="selectableWarehouses"
label-key="name"
value-key="id"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="入库类型">
<el-select v-model="form.inbound_type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商">
<el-input v-model="form.supplier" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商编码">
<el-input v-model="form.supplier_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购单号">
<el-input v-model="form.purchase_order_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据金额">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input v-model="form.express_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物流公司">
<el-select
v-model="form.logistics_code"
placeholder="选填,推送为 logisticsCode"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="操作时间">
<el-date-picker
v-model="form.operate_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预计到货">
<el-date-picker
v-model="form.expect_start_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="最迟到货">
<el-date-picker
v-model="form.expect_end_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="选填" />
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">商品明细</el-divider>
<div class="items-toolbar">
<span class="items-title">共 {{ lines.length }} 项</span>
<span class="items-total">合计金额:{{ itemsTotal.toFixed(2) }}</span>
<el-button type="primary" size="small" @click="addLine">添加商品</el-button>
</div>
<div v-if="warehouseOwnerId !== null || goodsOwnerId !== null" class="items-tip">
{{ warehouseOwnerId !== null
? '明细商品仅可选与仓库同货主(所属公司)的商品'
: '已按所选商品的货主(所属公司)过滤可选仓库' }}
</div>
<el-table :data="lines" size="small" border max-height="240">
<el-table-column label="商品" min-width="170">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
:subsidiary-id="scopeSubsidiaryId"
:before-select="(p: ProductSearchItem) => canPickGoods(p.subsidiary_id, $index)"
@select="(p: ProductSearchItem) => onLineProductSelect($index, p)"
/>
</template>
</el-table-column>
<el-table-column label="商品编码" width="120">
<template #default="{ row }">
<el-input v-model="row.code" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="商品名称" min-width="140">
<template #default="{ row }">
<el-input v-model="row.name" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="库存类型" width="110">
<template #default="{ row }">
<el-select v-model="row.inventory_type" style="width: 100%">
<el-option v-for="o in INVENTORY_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="0" :precision="3" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="110">
<template #default="{ row }">
<el-input-number v-model="row.price" :min="0" :precision="2" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="金额" width="100" align="right">
<template #default="{ row }">
{{ ((Number(row.quantity) || 0) * (Number(row.price) || 0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="操作" width="64" fixed="right">
<template #default="{ $index }">
<el-button link type="danger" @click="removeLine($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</el-card>
</template>
<style scoped>
.page-header {
display: flex;
align-items: center;
justify-content: space-between;
font-weight: 600;
}
/* 紧凑排版:压缩表单项行距、分割线边距与卡片内边距(与创建发货单一致) */
.compact-form :deep(.el-form-item) {
margin-bottom: 6px;
}
.compact-form :deep(.el-form-item__label) {
padding-right: 6px;
}
/* 数值字段(金额)不必占满整列 */
.compact-form :deep(.el-input-number) {
max-width: 124px;
}
/* 明细表格内控件本身列宽已很窄,不做限制 */
.compact-form :deep(.el-table .el-input-number) {
max-width: none;
}
.compact-form :deep(.el-table .cell) {
padding: 0 6px;
}
.compact-form :deep(.el-divider--horizontal) {
margin: 6px 0 8px;
}
.compact-form :deep(.el-divider__text) {
font-size: 13px;
font-weight: 600;
color: #303133;
}
.compact-form :deep(.el-collapse) {
margin-top: 8px;
border-top: none;
}
.create-card {
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
}
.create-card :deep(.el-card__header) {
padding: 10px 12px;
}
.create-card :deep(.el-card__body) {
flex: 1;
min-height: 0;
overflow: hidden;
padding: 10px 12px;
display: flex;
flex-direction: column;
}
.page-scroll {
flex: 1;
min-height: 0;
overflow-y: auto;
}
.items-toolbar {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 8px;
}
.items-title {
color: #606266;
font-size: 13px;
}
.items-total {
font-weight: 600;
color: #303133;
}
.items-tip {
margin-bottom: 6px;
color: var(--el-text-color-secondary);
font-size: 12px;
}
</style>