feat(frontend): 出入库记录页、入库/出库创建页与仓库快递映射

- 新增出入库记录页:先用商品编码/名称关键词搜索锁定 product_id,再按商品查询流水;
  列表展示变动数量与总数量/锁定数量/可用数量「前→后」;菜单兜底同步
- 新增入库单/出库单创建独立页,出库单列表与明细适配快递、运单号字段
- 外部仓库页新增仓库快递映射配置;发货单列表支持运单号展示,恢复时提示换号后的新单号
- 登录失效处理:区分登录页校验失败与登录态失效,提示后端返回的具体原因
This commit is contained in:
liufumingren 2026-09-14 00:59:27 +08:00
parent 39c19a4de7
commit 23d372aa52
15 changed files with 2020 additions and 270 deletions

View File

@ -90,7 +90,7 @@ export interface InboundOrderPayload {
receiver_info?: unknown
extend_props?: unknown
total_amount?: number
remark?: string
remark?: string | null
items?: InboundItemInput[]
}

View File

@ -74,6 +74,12 @@ export interface OrderDelivery {
logistics_code: string | null
logistics_name: string | null
express_code: string | null
/** 运单号集合(WMS 发货确认回传,多包裹时为多个;express_code 为首个) */
express_codes?: string[] | null
/** 回传平台店铺状态:0未同步 1同步中 2同步成功 3同步失败(系统托管) */
shop_sync_status?: number
/** 回传平台店铺的重试次数(系统托管) */
shop_sync_retry_count?: number
logistics_area_code: string | null
operator_name: string | null
oaid_order_source_code: string | null
@ -302,6 +308,8 @@ export interface BatchScopeParams {
from_shop_id?: number
/** 原发货仓库ID */
from_warehouse_id?: number
/** 回传平台店铺状态:0未同步 1同步中 2同步成功 3同步失败 */
shop_sync_status?: number
}
/** 批量操作结果(审核与推送共用;dry_run 时额外返回 samples) */
@ -331,9 +339,9 @@ export function pushBatchOrderDeliveries(data: BatchScopeParams) {
return post<BatchOperationResult>('/order-deliveries/push-batch', data)
}
/** 状态流转:驳回 已审核(2)→待处理(1),不换号 */
/** 状态流转:驳回 已审核(2)→待处理(1),**会变更单号**(基础单号后追加/递增 _N,首次 _1) */
export function rejectOrderDelivery(id: number) {
return post<{ id: number }>(`/order-deliveries/${id}/reject`)
return post<{ id: number; delivery_order_code: string }>(`/order-deliveries/${id}/reject`)
}
/** 状态流转:取消 →已取消(9) */
@ -341,9 +349,11 @@ export function cancelOrderDelivery(id: number) {
return post<{ id: number }>(`/order-deliveries/${id}/cancel`)
}
/** 状态流转:恢复 已取消(9)→待处理(1) */
/** 状态流转:恢复 已取消(9)→待处理(1);**曾推送过的单据会变更单号**(追加/递增 _N,首次 _1) */
export function restoreOrderDelivery(id: number) {
return post<{ id: number }>(`/order-deliveries/${id}/restore`)
return post<{ id: number; delivery_order_code?: string; bill_no_changed?: boolean }>(
`/order-deliveries/${id}/restore`,
)
}
/** 状态流转:作废 已审核(2)→已作废(5) */

View File

@ -20,6 +20,26 @@ export interface OutboundOrder {
total_amount: number | string
remark?: string | null
stock_deducted?: number
/** 运单号集合(WMS 出库确认回传,多包裹时为多个;列名对齐 wms_order_stockout) */
waybill_codes?: string[] | null
/** 快递公司编码(推送 deliveryOrder.logisticsCode,如 SF/STO) */
express_code?: string | null
/** 快递公司名称(按快递公司字典解析的快照) */
express_name?: string | null
/** 收件人(receiverInfo,推送 WMS stockout.create) */
receiver_name?: string | null
receiver_company?: string | null
receiver_tel?: string | null
receiver_mobile?: string | null
receiver_email?: string | null
receiver_country_code?: string | null
receiver_province?: string | null
receiver_city?: string | null
receiver_area?: string | null
receiver_town?: string | null
receiver_detail_address?: string | null
receiver_zip_code?: string | null
receiver_id?: string | null
void_at?: string | null
void_by?: number | null
void_reason?: string | null
@ -61,7 +81,24 @@ export interface OutboundOrderPayload {
customer?: string | null
operator?: string | null
total_amount?: number
remark?: string
remark?: string | null
/** 快递公司编码(推送为 deliveryOrder.logisticsCode) */
express_code?: string | null
/** 快递公司名称(传编码时前端自动带出) */
express_name?: string | null
receiver_name?: string | null
receiver_company?: string | null
receiver_tel?: string | null
receiver_mobile?: string | null
receiver_email?: string | null
receiver_country_code?: string | null
receiver_province?: string | null
receiver_city?: string | null
receiver_area?: string | null
receiver_town?: string | null
receiver_detail_address?: string | null
receiver_zip_code?: string | null
receiver_id?: string | null
items?: OutboundItemInput[]
}

View File

@ -0,0 +1,60 @@
import { get } from '@/utils/request'
/**
* 出入库记录(库存流水):每一次库存变动的完整前后余量
* 业务动作 biz_type:outbound_lock 出库推送锁定 / outbound_unlock 出库解锁 /
* outbound_deduct 出库确认扣减 / outbound_restore 出库驳回回补 / inbound_increase 入库确认增加
*/
export interface StockRecordItem {
id: number
principal_id: number
warehouse_id: number | null
product_id: number | null
item_code: string | null
item_name: string | null
item_type: string
biz_type: string
biz_type_label: string
direction: number
direction_label: string
bill_type: number
bill_id: number | null
bill_no: string | null
/** 以下数量列 MySQL DECIMAL 可能以字符串返回,展示时用 Number() 转换 */
quantity: number | string
quantity_before: number | string
quantity_after: number | string
lock_quantity: number | string
lock_before: number | string
lock_after: number | string
available_before: number | string
available_after: number | string
remark: string | null
created_by: number | null
created_at: string
}
/** 业务动作选项(后端 stockRecord 常量,用于筛选下拉) */
export interface StockRecordBizType {
value: string
label: string
direction: number
bill_type: number
}
/**
* 出入库记录列表
* @param params page / pageSize / product_id / warehouse_id / biz_type / direction /
* bill_type / item_type / bill_no / keyword / start_time / end_time
*/
export function getStockRecords(params?: object) {
return get<{ list: StockRecordItem[]; total: number; page: number; pageSize: number }>(
'/stock-records',
params,
)
}
/** 业务动作选项(筛选下拉,避免前后端枚举文案漂移) */
export function getStockRecordBizTypes() {
return get<StockRecordBizType[]>('/stock-records/biz-types')
}

View File

@ -0,0 +1,56 @@
import { get, post, put, del } from '@/utils/request'
/**
* 仓库快递映射(外部传入的自定义快递编码 → OMS 默认快递编码,按仓库维度)
*
* 外部(WMS)回传的快递编码可能是仓库维度的「自定义编码」(对齐 WMS `wms_express_setting` 的
* `code`,如 SF.KY / KYSF)。OMS 解析顺序:映射命中 → 用 express_code;未命中 → 外部编码本身
* 若在快递公司字典里则兜底;两者都没有 → 回传报错提示来此配置。
*/
export interface WarehouseExpressMappingItem {
id: number
principal_id: number
warehouse_id: number
/** 默认快递编码(OMS/标准编码,如 SF/ZT,关联快递公司字典) */
express_code: string
/** 快递名称(由 express_code 关联快递公司字典派生,仅返回时附带) */
express_name?: string
/** 自定义编码(外部传入的快递编码,如 SF.KY/KYSF) */
custom_code: string
/** 状态:1启用 0禁用(仅启用参与回传解析) */
status: number
remark: string | null
created_at?: string
updated_at?: string
/** 列表接口 include 带回的仓库 */
warehouse?: { id: number; code: string; name: string } | null
}
export interface WarehouseExpressMappingPayload {
warehouse_id: number
/** 默认快递编码(需存在于快递公司字典) */
express_code: string
/** 自定义编码(同仓库内唯一,服务端统一转大写) */
custom_code: string
status?: number
remark?: string | null
}
export function getWarehouseExpressMappings(params?: object) {
return get<{ list: WarehouseExpressMappingItem[]; total: number; page: number; pageSize: number }>(
'/warehouse-express-mappings',
params,
)
}
export function createWarehouseExpressMapping(data: WarehouseExpressMappingPayload) {
return post<{ id: number }>('/warehouse-express-mappings', data)
}
export function updateWarehouseExpressMapping(id: number, data: Partial<WarehouseExpressMappingPayload>) {
return put<{ id: number }>(`/warehouse-express-mappings/${id}`, data)
}
export function deleteWarehouseExpressMapping(id: number) {
return del<{ id: number }>(`/warehouse-express-mappings/${id}`)
}

View File

@ -42,6 +42,9 @@ const defaultMenus: MenuItem[] = [
children: [
{ id: 61, parent_id: 6, name: '入库单', type: 2, path: '/inbound-order', icon: 'Bottom', permission: 'inboundOrder:list', component: 'views/InboundOrder/Index.vue', sort: 75, status: 1 },
{ id: 62, parent_id: 6, name: '出库单', type: 2, path: '/outbound-order', icon: 'Top', permission: 'outboundOrder:list', component: 'views/OutboundOrder/Index.vue', sort: 70, status: 1 },
{ id: 65, parent_id: 6, name: '创建出库单', type: 2, path: '/outbound-order-create', icon: 'Plus', permission: 'outboundOrder:create', component: 'views/OutboundOrder/Create.vue', sort: 71, status: 1 },
{ id: 66, parent_id: 6, name: '创建入库单', type: 2, path: '/inbound-order-create', icon: 'Plus', permission: 'inboundOrder:create', component: 'views/InboundOrder/Create.vue', sort: 76, status: 1 },
{ id: 63, parent_id: 6, name: '出入库记录', type: 2, path: '/stock-record', icon: 'Finished', permission: 'stockRecord:list', component: 'views/StockRecord/Index.vue', sort: 65, status: 1 },
],
},
{

View File

@ -90,19 +90,25 @@ service.interceptors.response.use(
syncRefreshedToken(error.response?.headers)
if (status === 401) {
// 登录失效:清空本地登录态(token 与所选主体)并返回首页
// (未登录会被路由守卫转到登录页,登录成功后再回到首页)
clearToken()
usePrincipalStore().setCurrentId(null)
if (!redirectingToHome && router.currentRoute.value.name !== 'login') {
redirectingToHome = true
ElMessage.warning('登录状态已失效,请重新登录')
// 延后一个事件循环再跳转:避免在路由守卫的导航过程中插入新导航
setTimeout(() => {
router.replace('/').finally(() => {
redirectingToHome = false
})
}, 0)
const onLoginPage = router.currentRoute.value.name === 'login'
if (onLoginPage) {
// 登录页内(正在登录):直接提示后端返回的具体错误,如「账号或密码错误」
ElMessage.error(message || '登录失败,请检查账号或密码')
} else {
// 登录失效:清空本地登录态(token 与所选主体)并返回首页
// (未登录会被路由守卫转到登录页,登录成功后再回到首页)
clearToken()
usePrincipalStore().setCurrentId(null)
if (!redirectingToHome) {
redirectingToHome = true
ElMessage.warning(message || '登录状态已失效,请重新登录')
// 延后一个事件循环再跳转:避免在路由守卫的导航过程中插入新导航
setTimeout(() => {
router.replace('/').finally(() => {
redirectingToHome = false
})
}, 0)
}
}
} else {
ElMessage.error(message)

View File

@ -30,6 +30,14 @@ import {
type WarehouseApiFieldGroup,
} from '@/api/warehouseApi'
import { getOutboundLogs, type OutboundLogItem } from '@/api/outboundLog'
import {
getWarehouseExpressMappings,
createWarehouseExpressMapping,
updateWarehouseExpressMapping,
deleteWarehouseExpressMapping,
type WarehouseExpressMappingItem,
} from '@/api/warehouseExpressMapping'
import { getExpressCompanyOptions, type ExpressCompanyOption } from '@/api/expressCompany'
import SplitLayout from '@/components/SplitLayout.vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
@ -118,6 +126,8 @@ async function switchWarehouse(id: number) {
if (currentWarehouse.value?.id === id) return
configLoadedId.value = null
configList.value = []
mappingLoadedId.value = null
mappingList.value = []
resetProductState()
resetOutboundState()
resetInventoryState()
@ -138,11 +148,128 @@ async function openConfigTab(row: WarehouseItem) {
function handleDetailTabChange(name: string | number) {
if (name === 'config' && configLoadedId.value !== currentWarehouse.value?.id) fetchConfigs()
if (name === 'express' && mappingLoadedId.value !== currentWarehouse.value?.id) fetchMappings()
if (name === 'products' && productLoadedId.value !== currentWarehouse.value?.id) fetchProducts()
if (name === 'inventory' && inventoryLoadedId.value !== currentWarehouse.value?.id) fetchInventory()
if (name === 'logs' && outboundLoadedId.value !== currentWarehouse.value?.id) fetchOutboundLogs()
}
/* -------------------- 快递映射(按仓库:外部自定义编码 → 默认快递编码) -------------------- */
const mappingLoading = ref(false)
const mappingList = ref<WarehouseExpressMappingItem[]>([])
/** 已加载快递映射的仓库ID,避免切换标签页时重复请求 */
const mappingLoadedId = ref<number | null>(null)
/** 快递公司字典(供「默认快递」下拉) */
const expressCompanies = ref<ExpressCompanyOption[]>([])
/** 拉取当前仓库的快递映射列表 */
async function fetchMappings() {
const warehouseId = currentWarehouse.value?.id
if (!warehouseId) return
mappingLoading.value = true
try {
const res = await getWarehouseExpressMappings({ warehouse_id: warehouseId, page: 1, pageSize: 200 })
// 请求期间若已切换仓库,丢弃过期结果
if (currentWarehouse.value?.id !== warehouseId) return
mappingList.value = res.list
mappingLoadedId.value = warehouseId
} catch {
mappingList.value = []
} finally {
mappingLoading.value = false
}
}
async function ensureExpressCompanies() {
if (expressCompanies.value.length) return
try { expressCompanies.value = await getExpressCompanyOptions() } catch { expressCompanies.value = [] }
}
const mappingDialogVisible = ref(false)
const mappingSubmitting = ref(false)
const mappingFormRef = ref<FormInstance>()
const mappingEditId = ref<number | null>(null)
const mappingForm = reactive({
express_code: '',
custom_code: '',
status: 1,
remark: '',
})
const mappingRules: FormRules = {
express_code: [{ required: true, message: '请选择默认快递', trigger: 'change' }],
custom_code: [{ required: true, message: '请填写自定义编码', trigger: 'blur' }],
}
function openMappingCreate() {
mappingEditId.value = null
Object.assign(mappingForm, { express_code: '', custom_code: '', status: 1, remark: '' })
ensureExpressCompanies()
mappingDialogVisible.value = true
}
function openMappingEdit(row: WarehouseExpressMappingItem) {
mappingEditId.value = row.id
Object.assign(mappingForm, {
express_code: row.express_code,
custom_code: row.custom_code,
status: row.status,
remark: row.remark || '',
})
ensureExpressCompanies()
mappingDialogVisible.value = true
}
async function submitMappingForm() {
if (!mappingFormRef.value) return
await mappingFormRef.value.validate(async (valid) => {
if (!valid) return
const warehouseId = currentWarehouse.value?.id
if (!warehouseId) return
mappingSubmitting.value = true
try {
const payload = {
warehouse_id: warehouseId,
express_code: mappingForm.express_code,
custom_code: mappingForm.custom_code.trim().toUpperCase(),
status: mappingForm.status,
remark: mappingForm.remark || null,
}
if (mappingEditId.value == null) {
await createWarehouseExpressMapping(payload)
ElMessage.success('新增成功')
} else {
await updateWarehouseExpressMapping(mappingEditId.value, payload)
ElMessage.success('保存成功')
}
mappingDialogVisible.value = false
await fetchMappings()
} catch {
// 拦截器已提示
} finally {
mappingSubmitting.value = false
}
})
}
async function handleMappingDelete(row: WarehouseExpressMappingItem) {
try {
await ElMessageBox.confirm(
`确定删除自定义编码「${row.custom_code}」的映射吗?删除后该编码将只能按快递公司字典兑底解析。`,
'删除映射',
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' },
)
} catch {
return
}
try {
await deleteWarehouseExpressMapping(row.id)
ElMessage.success('已删除')
await fetchMappings()
} catch {
// 拦截器已提示
}
}
/* -------------------- 仓库 新增 / 编辑 -------------------- */
const dialogVisible = ref(false)
const submitting = ref(false)
@ -870,6 +997,46 @@ onMounted(fetchList)
</div>
</el-tab-pane>
<el-tab-pane label="快递映射" name="express">
<div class="detail-body is-config">
<template v-if="currentWarehouse">
<div class="items-toolbar">
<span class="items-title">快递映射 · {{ currentWarehouse.name }}</span>
<span class="muted toolbar-hint">
外部回传的快递编码优先按此处「自定义编码 → 默认快递编码」解析;未配映射时按快递公司字典兜底
</span>
<el-button type="primary" size="small" class="toolbar-right" @click="openMappingCreate">
新增映射
</el-button>
</div>
<div class="bottom-table-wrap">
<DataTable :loading="mappingLoading" :data="mappingList" class="fill-table">
<el-table-column label="快递名称" min-width="150">
<template #default="{ row }">{{ row.express_name || '-' }}</template>
</el-table-column>
<el-table-column prop="express_code" label="默认快递编码" width="140" />
<el-table-column prop="custom_code" label="自定义编码" width="160" />
<el-table-column label="状态" width="90">
<template #default="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'info'" size="small">
{{ row.status === 1 ? '启用' : '禁用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip />
<el-table-column label="操作" width="130" fixed="right">
<template #default="{ row }">
<el-button link type="primary" @click="openMappingEdit(row)">编辑</el-button>
<el-button link type="danger" @click="handleMappingDelete(row)">删除</el-button>
</template>
</el-table-column>
</DataTable>
</div>
</template>
<el-empty v-else description="请点击上方仓库查看快递映射" />
</div>
</el-tab-pane>
<el-tab-pane label="商品" name="products">
<div class="detail-body is-config">
<template v-if="currentWarehouse">
@ -1144,6 +1311,43 @@ onMounted(fetchList)
<el-button type="primary" :loading="apiSubmitting" @click="submitApiForm">保存</el-button>
</template>
</el-dialog>
<!-- 快递映射 新增 / 编辑:自定义编码(外部传入)→ 默认快递编码(快递公司字典) -->
<el-dialog
v-model="mappingDialogVisible"
:title="mappingEditId == null ? '新增快递映射' : '编辑快递映射'"
width="520px"
append-to-body
>
<el-form ref="mappingFormRef" :model="mappingForm" :rules="mappingRules" label-width="110px">
<el-form-item label="默认快递" prop="express_code">
<el-select
v-model="mappingForm.express_code"
filterable
placeholder="请选择快递公司(OMS 默认编码)"
style="width: 100%"
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</el-select>
</el-form-item>
<el-form-item label="自定义编码" prop="custom_code">
<el-input v-model="mappingForm.custom_code" placeholder="外部传入的快递编码,如 SF.KY / KYSF" />
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="mappingForm.status">
<el-radio :value="1">启用</el-radio>
<el-radio :value="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="mappingForm.remark" placeholder="选填" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="mappingDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="mappingSubmitting" @click="submitMappingForm">保存</el-button>
</template>
</el-dialog>
</el-card>
</template>
@ -1265,6 +1469,12 @@ onMounted(fetchList)
.toolbar-right {
margin-left: auto;
}
/* 工具栏说明文案(与按钮同行,过长时自动换行) */
.toolbar-hint {
margin-left: 12px;
font-size: 12px;
line-height: 1.4;
}
/* 调用日志:展开详情与辅助样式 */
.log-detail {
padding: 4px 12px;

View File

@ -0,0 +1,547 @@
<script setup lang="ts">
import { computed, onMounted, reactive, ref } 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 type { ProductSearchItem } from '@/api/product'
import ProductSelect from '@/components/ProductSelect.vue'
import VirtualSelect from '@/components/VirtualSelect.vue'
/** 入库类型: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' },
]
/** 发件人 / 收件人共用字段(奇门 senderInfo / receiverInfo 子集) */
const PARTY_FIELDS: Array<{ key: string; label: string }> = [
{ key: 'company', label: '公司' },
{ key: 'name', label: '姓名' },
{ key: 'mobile', label: '手机' },
{ key: 'tel', label: '电话' },
{ key: 'province', label: '省' },
{ key: 'city', label: '市' },
{ key: 'detailAddress', label: '详细地址' },
{ key: 'zipCode', label: '邮编' },
]
const router = useRouter()
const warehouses = ref<WarehouseOption[]>([])
/* -------------------- 单据信息(页面头部) -------------------- */
interface HeaderForm {
warehouse_id: number | null
inbound_type: string
supplier: string
supplier_code: string
purchase_order_code: string
operator: string
operator_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: '',
operator: '',
operator_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' }],
}
/** WMS 扩展信息(选填,折叠区):发件人 / 收件人 / 扩展属性 */
function emptyParty(): Record<string, string> {
return Object.fromEntries(PARTY_FIELDS.map(f => [ f.key, '' ]))
}
const senderInfo = reactive(emptyParty())
const receiverInfo = reactive(emptyParty())
const extendProps = ref<Array<{ key: string; value: string }>>([])
/* -------------------- 商品明细(内联,随单创建) -------------------- */
interface LineItem {
product_id: number | null
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, name: '', code: '', spec: '', unit: '',
quantity: 1, price: null, inventory_type: 'ZP', remark: '',
})
}
function removeLine(index: number) {
lines.value.splice(index, 1)
}
function onLineProductSelect(index: number, p: ProductSearchItem) {
const line = lines.value[index]
if (!line) return
line.product_id = p.id
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)
/** 过滤空值:全部为空时返回 null(不下发空对象) */
function cleanObject(obj: Record<string, string>) {
const r: Record<string, string> = {}
let has = false
for (const k in obj) {
const v = obj[k]
if (v != null && String(v).trim() !== '') { r[k] = v; has = true }
}
return has ? r : null
}
function propsToObject(rows: Array<{ key: string; value: string }>) {
const r: Record<string, string> = {}
let has = false
for (const { key, value } of rows) {
if (key && key.trim()) { r[key.trim()] = value; has = true }
}
return has ? r : null
}
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
}
}
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,
operator: form.operator || null,
operator_code: form.operator_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,
sender_info: cleanObject(senderInfo),
receiver_info: cleanObject(receiverInfo),
extend_props: propsToObject(extendProps.value),
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 fetchOptions() {
try {
warehouses.value = await getWarehouseOptions()
} 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="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="warehouses"
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 v-model="form.operator" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="操作员编码">
<el-input v-model="form.operator_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-input v-model="form.logistics_code" placeholder="选填,如 SF/YTO" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物流公司名称">
<el-input v-model="form.logistics_name" placeholder="选填" />
</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>
<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"
@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>
<!-- WMS 扩展信息(选填,默认折叠) -->
<el-collapse class="ext-collapse">
<el-collapse-item title="WMS 扩展信息(选填)" name="ext">
<div class="ext-block">
<div class="ext-subtitle"><span>发件人(senderInfo)</span></div>
<el-row :gutter="12">
<el-col v-for="f in PARTY_FIELDS" :key="'s' + f.key" :span="6">
<el-form-item :label="f.label" label-width="70px">
<el-input v-model="senderInfo[f.key]" />
</el-form-item>
</el-col>
</el-row>
</div>
<div class="ext-block">
<div class="ext-subtitle"><span>收件人(receiverInfo)</span></div>
<el-row :gutter="12">
<el-col v-for="f in PARTY_FIELDS" :key="'r' + f.key" :span="6">
<el-form-item :label="f.label" label-width="70px">
<el-input v-model="receiverInfo[f.key]" />
</el-form-item>
</el-col>
</el-row>
</div>
<div class="ext-block">
<div class="ext-subtitle">
<span>扩展属性(extendProps)</span>
<el-button size="small" @click="extendProps.push({ key: '', value: '' })">添加</el-button>
</div>
<el-table :data="extendProps" size="small" border>
<el-table-column label="键" width="220">
<template #default="{ row }"><el-input v-model="row.key" placeholder="key" /></template>
</el-table-column>
<el-table-column label="值">
<template #default="{ row }"><el-input v-model="row.value" placeholder="value" /></template>
</el-table-column>
<el-table-column label="" width="64">
<template #default="{ $index }">
<el-button link type="danger" @click="extendProps.splice($index, 1)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-collapse-item>
</el-collapse>
</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;
}
.ext-block {
margin-bottom: 6px;
}
.ext-subtitle {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 4px;
font-size: 13px;
font-weight: 600;
color: #606266;
}
</style>

View File

@ -1,10 +1,10 @@
<script setup lang="ts">
import { computed, onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
import {
inboundOrderApi,
type InboundOrder,
type InboundItemInput,
type InboundItemPayload,
} from '@/api/inboundOrder'
import type { StockItemLine } from '@/api/stockOrder'
@ -114,22 +114,10 @@ const form = reactive({
const rules: FormRules = {
warehouse_id: [{ required: true, message: '请选择仓库', trigger: 'change' }],
}
function resetForm() {
Object.assign(form, {
warehouse_id: null, inbound_type: 'CGRK',
supplier: '', supplier_code: '', operator: '', operator_code: '', operate_time: '',
purchase_order_code: '', logistics_code: '', logistics_name: '', express_code: '',
expect_start_time: '', expect_end_time: '', total_amount: 0, remark: '',
sender_info: { name: '', mobile: '', company: '', province: '', city: '', detailAddress: '' },
receiver_info: { name: '', mobile: '', company: '', province: '', city: '', detailAddress: '' },
extend_props: [],
})
}
async function openCreate() {
editId.value = null
resetForm()
formItems.value = []
dialogVisible.value = true
const router = useRouter()
/** 新增入库单改为独立整页(菜单「创建入库单」),此处仅跳转 */
function openCreate() {
router.push('/inbound-order-create')
}
async function openEdit(row: InboundOrder) {
const full = await inboundOrderApi.get(row.id)
@ -156,7 +144,6 @@ async function openEdit(row: InboundOrder) {
? Object.entries(full.extend_props).map(([key, value]) => ({ key, value: String(value) }))
: [],
})
formItems.value = []
dialogVisible.value = true
}
@ -203,24 +190,8 @@ async function submitForm() {
receiver_info: cleanObject(form.receiver_info),
extend_props: propsToObject(form.extend_props),
} as Record<string, unknown>
if (editId.value == null) {
payload.items = formItems.value.map((it) => ({
product_id: it.product_id ?? null,
name: it.name || null,
code: it.code || null,
spec: it.spec || null,
unit: it.unit || null,
quantity: it.quantity,
price: it.price,
inventory_type: it.inventory_type || 'ZP',
remark: it.remark || null,
}))
await inboundOrderApi.create(payload as any)
ElMessage.success('新增成功')
} else {
await inboundOrderApi.update(editId.value, payload as any)
ElMessage.success('保存成功')
}
await inboundOrderApi.update(editId.value as number, payload as any)
ElMessage.success('保存成功')
dialogVisible.value = false
await fetchList()
} catch {
@ -231,27 +202,6 @@ async function submitForm() {
})
}
/* -------------------- 随单明细(创建时内联) -------------------- */
const formItems = ref<InboundItemInput[]>([])
function addFormItem() {
formItems.value.push({ product_id: null, name: '', code: '', spec: '', unit: '', quantity: 1, price: 0, inventory_type: 'ZP', remark: '' })
}
function removeFormItem(idx: number) {
formItems.value.splice(idx, 1)
}
function onFormItemProductSelect(idx: number, p: ProductSearchItem) {
const it = formItems.value[idx]
if (!it) return
it.product_id = p.id
it.name = p.item_name || ''
it.code = p.item_code || ''
it.spec = p.sku_property || ''
it.unit = p.stock_unit || ''
}
const formTotal = computed(() =>
formItems.value.reduce((s, it) => s + (Number(it.quantity) || 0) * (Number(it.price) || 0), 0),
)
/* -------------------- 状态流转 -------------------- */
const transiting = ref(false)
async function transit(action: 'audit' | 'push' | 'complete' | 'cancel' | 'restore') {
@ -751,7 +701,7 @@ onMounted(async () => {
<!-- 新增 / 编辑 对话框 -->
<el-dialog
v-model="dialogVisible"
:title="editId == null ? '新增入库单' : '编辑入库单'"
:title="'编辑入库单'"
width="880px"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px">
@ -841,60 +791,6 @@ onMounted(async () => {
</el-col>
</el-row>
<!-- 随单商品明细(仅新建时) -->
<template v-if="editId == null">
<el-divider content-position="left">商品明细</el-divider>
<div class="items-toolbar">
<span class="items-title">共 {{ formItems.length }} 项</span>
<span class="total">合计金额:{{ formTotal.toFixed(2) }}</span>
<el-button type="primary" @click="addFormItem">添加商品</el-button>
</div>
<el-table :data="formItems" size="small" border class="fill-table" style="max-height: 280px; overflow: auto">
<el-table-column label="系统商品" min-width="220">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
@select="(p: ProductSearchItem) => onFormItemProductSelect($index, p)"
/>
</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-input v-model="row.code" placeholder="自动带出" /></template>
</el-table-column>
<el-table-column label="规格" width="100">
<template #default="{ row }"><el-input v-model="row.spec" /></template>
</el-table-column>
<el-table-column label="单位" width="80">
<template #default="{ row }"><el-input v-model="row.unit" /></template>
</el-table-column>
<el-table-column label="库存类型" width="120">
<template #default="{ row }">
<el-select v-model="row.inventory_type" style="width: 100%">
<el-option v-for="o in INV_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="110">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="0" :precision="0" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="120">
<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="70" fixed="right">
<template #default="{ $index }">
<el-button link type="danger" @click="removeFormItem($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</template>
<!-- WMS 扩展信息 -->
<el-collapse class="ext-collapse">
<el-collapse-item title="WMS 扩展信息(选填)" name="ext">

View File

@ -393,7 +393,7 @@ onMounted(async () => {
<el-input v-model="form.operator_name" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="12">
<el-form-item label="物流公司">
<el-select
v-model="form.logistics_code"
@ -412,11 +412,6 @@ onMounted(async () => {
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物流公司名称">
<el-input :model-value="form.logistics_name || '-'" disabled />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="订单总金额">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />

View File

@ -74,6 +74,25 @@ const ORDER_TYPE_LABELS: Record<string, string> = {
}
/** 订单类型默认值 */
const DEFAULT_ORDER_TYPE = 'JYCK'
/** 回传平台店铺状态:0未同步 1同步中 2同步成功 3同步失败(与后端 app/lib/shopSyncStatus.js 同口径) */
const SHOP_SYNC_STATUS_OPTIONS = [
{ value: 0, label: '未同步' },
{ value: 1, label: '同步中' },
{ value: 2, label: '同步成功' },
{ value: 3, label: '同步失败' },
]
const SHOP_SYNC_STATUS_LABELS: Record<number, string> = {
0: '未同步',
1: '同步中',
2: '同步成功',
3: '同步失败',
}
const SHOP_SYNC_STATUS_TAGS: Record<number, string> = {
0: 'info',
1: 'warning',
2: 'success',
3: 'danger',
}
/** 单据头与明细的可编辑状态:仅「待处理」 */
const EDITABLE_STATUS = 1
/** 可删除状态:待处理 / 已取消 */
@ -93,6 +112,7 @@ const query = reactive({
order_type: '',
shop_id: '' as string | number,
warehouse_id: '' as string | number,
shop_sync_status: '' as string | number,
})
const { loading, list, total, elapsed, fetchList, search, handlePageChange, handleSizeChange } = useListPage({
@ -105,6 +125,7 @@ const { loading, list, total, elapsed, fetchList, search, handlePageChange, hand
if (params.status === '') delete params.status
if (params.shop_id === '') delete params.shop_id
if (params.warehouse_id === '') delete params.warehouse_id
if (params.shop_sync_status === '') delete params.shop_sync_status
return getOrderDeliveries(params)
},
})
@ -132,6 +153,7 @@ function reset() {
query.order_type = ''
query.shop_id = ''
query.warehouse_id = ''
query.shop_sync_status = ''
search()
}
@ -238,7 +260,7 @@ function toPayload(): OrderDeliveryPayload {
return payload as OrderDeliveryPayload
}
/** 选择快递公司后自动带出名称(物流公司名称只读展示) */
/** 选择快递公司后自动带出名称(下拉已展示「名称(编码)」,此处仅同步写入 logistics_name 供推送/展示用) */
function handleExpressChange(code: string | null) {
const company = expressCompanies.value.find(c => c.code === code)
form.logistics_name = company ? company.name : ''
@ -311,6 +333,7 @@ const scopeText = computed(() => {
if (query.order_type) parts.push(`订单类型=${ORDER_TYPE_LABELS[query.order_type] || query.order_type}`)
if (query.shop_id !== '') parts.push(`店铺=${shops.value.find(s => s.id === query.shop_id)?.name || query.shop_id}`)
if (query.warehouse_id !== '') parts.push(`原仓库=${warehouses.value.find(w => w.id === query.warehouse_id)?.name || query.warehouse_id}`)
if (query.shop_sync_status !== '') parts.push(`店铺同步=${SHOP_SYNC_STATUS_LABELS[Number(query.shop_sync_status)] || query.shop_sync_status}`)
const base = parts.length ? `按当前筛选条件:${parts.join(',')}` : '按当前筛选条件:未设置筛选,将匹配全部单据'
return selectedRows.value.length ? `${base}(本次忽略已勾选的 ${selectedRows.value.length} 条)` : base
})
@ -370,6 +393,7 @@ function buildScopeParams(dryRun: boolean): BatchScopeParams {
if (query.order_type) payload.order_type = String(query.order_type)
if (query.shop_id !== '') payload.from_shop_id = Number(query.shop_id)
if (query.warehouse_id !== '') payload.from_warehouse_id = Number(query.warehouse_id)
if (query.shop_sync_status !== '') payload.shop_sync_status = Number(query.shop_sync_status)
return payload
}
@ -555,10 +579,10 @@ async function handlePush(row: OrderDelivery) {
}
async function handleReject(row: OrderDelivery) {
if (!(await confirm(`确认驳回发货单「${row.delivery_order_code}」?驳回后回到待处理。`, '驳回确认'))) return
if (!(await confirm(`确认驳回发货单「${row.delivery_order_code}」?驳回后回到待处理,单号会追加 _1/_2 后缀(避免重新推送时与仓库侧重号)。`, '驳回确认'))) return
try {
await rejectOrderDelivery(row.id)
ElMessage.success('已驳回')
const res = await rejectOrderDelivery(row.id)
ElMessage.success(res.delivery_order_code ? `已驳回,单号变更为 ${res.delivery_order_code}` : '已驳回')
await fetchList()
} catch {
// 拦截器已提示
@ -577,9 +601,20 @@ async function handleCancel(row: OrderDelivery) {
}
async function handleRestore(row: OrderDelivery) {
if (
!(await confirm(
`确认恢复发货单「${row.delivery_order_code}」?曾推送过的单据恢复后单号会追加 _1/_2 后缀(避免重新推送时与仓库侧重号)。`,
'恢复确认',
))
)
return
try {
await restoreOrderDelivery(row.id)
ElMessage.success('已恢复为待处理')
const res = await restoreOrderDelivery(row.id)
ElMessage.success(
res.bill_no_changed && res.delivery_order_code
? `已恢复,单号变更为 ${res.delivery_order_code}`
: '已恢复为待处理',
)
await fetchList()
} catch {
// 拦截器已提示
@ -870,6 +905,11 @@ onMounted(async () => {
<el-option v-for="opt in ORDER_TYPE_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
<el-form-item label="店铺同步">
<el-select v-model="query.shop_sync_status" placeholder="全部" clearable style="width: 130px">
<el-option v-for="opt in SHOP_SYNC_STATUS_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
<el-form-item label="店铺">
<VirtualSelect
v-model="query.shop_id"
@ -926,6 +966,16 @@ onMounted(async () => {
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="店铺同步" width="120">
<template #default="{ row }">
<el-tag size="small" :type="SHOP_SYNC_STATUS_TAGS[row.shop_sync_status ?? 0] || 'info'">
{{ SHOP_SYNC_STATUS_LABELS[row.shop_sync_status ?? 0] || '未同步' }}
</el-tag>
<el-tooltip v-if="row.shop_sync_retry_count > 0" :content="`已重试 ${row.shop_sync_retry_count} 次`" placement="top">
<span class="retry-count">重试{{ row.shop_sync_retry_count }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="商品总数/种类" width="120" align="right">
<template #default="{ row }">{{ row.item_total }} / {{ row.item_kind }}</template>
</el-table-column>
@ -938,8 +988,13 @@ onMounted(async () => {
<el-table-column label="收件人" width="100">
<template #default="{ row }">{{ row.name || '-' }}</template>
</el-table-column>
<el-table-column label="运单号" width="130">
<template #default="{ row }">{{ row.express_code || '-' }}</template>
<el-table-column label="运单号" width="180">
<template #default="{ row }">
<template v-if="(row.express_codes || []).length">
<div v-for="code in row.express_codes" :key="code">{{ code }}</div>
</template>
<template v-else>{{ row.express_code || '-' }}</template>
</template>
</el-table-column>
<el-table-column prop="created_at" label="创建时间" width="180" />
<el-table-column label="操作" width="300" fixed="right">
@ -1098,9 +1153,6 @@ onMounted(async () => {
/>
</el-select>
</el-form-item>
<el-form-item label="物流公司名称">
<span class="form-tip">{{ form.logistics_name || '-' }}</span>
</el-form-item>
<el-divider content-position="left">收件人(receiverInfo)</el-divider>
<el-form-item label="姓名" prop="name">
@ -1331,11 +1383,6 @@ onMounted(async () => {
color: #909399;
font-size: 12px;
}
.form-tip {
margin-left: 8px;
color: #909399;
font-size: 12px;
}
/* 切换仓库弹窗 */
.scope-tip {
margin-top: 4px;
@ -1371,6 +1418,14 @@ onMounted(async () => {
cursor: help;
border-bottom: 1px dashed #f56c6c;
}
/* 回传平台店铺的重试次数标记 */
.retry-count {
margin-left: 4px;
color: #e6a23c;
font-size: 12px;
cursor: help;
border-bottom: 1px dashed #e6a23c;
}
.form-scroll {
max-height: 62vh;
overflow-y: auto;

View File

@ -0,0 +1,515 @@
<script setup lang="ts">
import { computed, onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
import { outboundOrderApi } from '@/api/outboundOrder'
import { getWarehouseOptions, type WarehouseOption } from '@/api/warehouse'
import { getShops, type ShopItem } from '@/api/shop'
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'
/** 出库类型:CK 组(WMS 编码,与出库单列表保持一致) */
const TYPE_OPTIONS = [
{ label: '普通出库单(PTCK)', value: 'PTCK' },
{ label: '调拨出库(DBCK)', value: 'DBCK' },
{ label: 'B2B出库(B2BCK)', value: 'B2BCK' },
{ label: '其他出库(QTCK)', value: 'QTCK' },
{ label: '采购退货出库单(CGTH)', value: 'CGTH' },
]
const INVENTORY_TYPE_OPTIONS = [
{ label: '正品(ZP)', value: 'ZP' },
{ label: '残次(CC)', value: 'CC' },
]
const router = useRouter()
const warehouses = ref<WarehouseOption[]>([])
const shops = ref<ShopItem[]>([])
const expressCompanies = ref<ExpressCompanyOption[]>([])
/* -------------------- 单据信息 + 收件人(页面头部) -------------------- */
interface HeaderForm {
warehouse_id: number | null
outbound_type: string
shop_id: number | null
customer: string
express_code: string
express_name: string
operator: string
total_amount: number
remark: string
receiver_name: string
receiver_company: string
receiver_mobile: string
receiver_tel: string
receiver_email: string
receiver_zip_code: string
receiver_country_code: string
receiver_id: string
receiver_province: string
receiver_city: string
receiver_area: string
receiver_town: string
receiver_detail_address: string
}
/**
* 单据头初值。收件人与快递字段对齐 WMS `stockout.create` 的 receiverInfo / logisticsCode
* (13 个标准字段:name/company/zipCode/tel/mobile/email/countryCode/province/city/area/town/detailAddress/id)
*/
function emptyForm(): HeaderForm {
return {
warehouse_id: null,
outbound_type: 'PTCK',
shop_id: null,
customer: '',
express_code: '',
express_name: '',
operator: '',
total_amount: 0,
remark: '',
receiver_name: '',
receiver_company: '',
receiver_mobile: '',
receiver_tel: '',
receiver_email: '',
receiver_zip_code: '',
receiver_country_code: '',
receiver_id: '',
receiver_province: '',
receiver_city: '',
receiver_area: '',
receiver_town: '',
receiver_detail_address: '',
}
}
const formRef = ref<FormInstance>()
const form = reactive(emptyForm())
const rules: FormRules = {
warehouse_id: [{ required: true, message: '请选择仓库', trigger: 'change' }],
}
/** 选择快递公司后同步名称(下拉已展示「名称(编码)」,此处仅写入 express_name 供推送/列表展示) */
function handleExpressChange(code: string | null) {
const company = expressCompanies.value.find(c => c.code === code)
form.express_name = company ? company.name : ''
}
/* -------------------- 商品明细(内联,随单创建) -------------------- */
interface LineItem {
product_id: number | null
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, name: '', code: '', spec: '', unit: '',
quantity: 1, price: null, inventory_type: 'ZP', remark: '',
})
}
function removeLine(index: number) {
lines.value.splice(index, 1)
}
function onLineProductSelect(index: number, p: ProductSearchItem) {
const line = lines.value[index]
if (!line) return
line.product_id = p.id
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
}
}
submitting.value = true
try {
await outboundOrderApi.create({
warehouse_id: form.warehouse_id,
shop_id: form.shop_id || null,
outbound_type: form.outbound_type,
customer: form.customer || null,
express_code: form.express_code || null,
express_name: form.express_name || null,
operator: form.operator || null,
total_amount: form.total_amount,
remark: form.remark || null,
receiver_name: form.receiver_name || null,
receiver_company: form.receiver_company || null,
receiver_mobile: form.receiver_mobile || null,
receiver_tel: form.receiver_tel || null,
receiver_email: form.receiver_email || null,
receiver_zip_code: form.receiver_zip_code || null,
receiver_country_code: form.receiver_country_code || null,
receiver_id: form.receiver_id || null,
receiver_province: form.receiver_province || null,
receiver_city: form.receiver_city || null,
receiver_area: form.receiver_area || null,
receiver_town: form.receiver_town || null,
receiver_detail_address: form.receiver_detail_address || 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('/outbound-order')
} catch {
// 拦截器已提示
} finally {
submitting.value = false
}
})
}
function cancel() {
router.push('/outbound-order')
}
async function fetchOptions() {
try {
const [ warehouseRes, shopRes, expressRes ] = await Promise.all([
getWarehouseOptions(),
getShops({ page: 1, pageSize: 200 }),
getExpressCompanyOptions(),
])
warehouses.value = warehouseRes
shops.value = shopRes.list
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="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="warehouses"
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.outbound_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="目标店铺">
<VirtualSelect
v-model="form.shop_id"
:options="shops"
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-input v-model="form.customer" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物流公司">
<el-select
v-model="form.express_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-input v-model="form.operator" 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="24">
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="选填" />
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">收件人(receiverInfo)</el-divider>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="姓名">
<el-input v-model="form.receiver_name" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="公司">
<el-input v-model="form.receiver_company" maxlength="200" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机">
<el-input v-model="form.receiver_mobile" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="固定电话">
<el-input v-model="form.receiver_tel" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="邮箱">
<el-input v-model="form.receiver_email" maxlength="100" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="邮编">
<el-input v-model="form.receiver_zip_code" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国家编码">
<el-input v-model="form.receiver_country_code" maxlength="50" placeholder="如 CN" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input v-model="form.receiver_id" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="省">
<el-input v-model="form.receiver_province" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="市">
<el-input v-model="form.receiver_city" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="区">
<el-input v-model="form.receiver_area" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="街道/镇">
<el-input v-model="form.receiver_town" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="详细地址">
<el-input v-model="form.receiver_detail_address" maxlength="200" />
</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>
<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"
@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;
}
.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;
}
</style>

View File

@ -1,15 +1,16 @@
<script setup lang="ts">
import { computed, onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
import {
outboundOrderApi,
type OutboundOrder,
type OutboundItemInput,
type OutboundItemPayload,
} from '@/api/outboundOrder'
import type { StockItemLine } from '@/api/stockOrder'
import { getWarehouseOptions, type WarehouseOption } from '@/api/warehouse'
import { getShops, type ShopItem } from '@/api/shop'
import { getExpressCompanyOptions, type ExpressCompanyOption } from '@/api/expressCompany'
import { type ProductSearchItem } from '@/api/product'
import SplitLayout from '@/components/SplitLayout.vue'
import DataTable from '@/components/DataTable.vue'
@ -43,6 +44,8 @@ const shops = ref<ShopItem[]>([])
const shopSelectOptions = computed(() =>
shops.value.map((s) => ({ label: `${s.code} ${s.name}`, value: s.id })),
)
/** 快递公司字典(仅启用,供「物流公司」下拉,对齐 WMS stockout.create 的 deliveryOrder.logisticsCode) */
const expressCompanies = ref<ExpressCompanyOption[]>([])
/* -------------------- 列表 -------------------- */
const query = reactive({
@ -65,6 +68,7 @@ const { loading, list, total, elapsed, fetchList, search, handlePageChange, hand
async function fetchOptions() {
try { warehouses.value = await getWarehouseOptions() } catch { warehouses.value = [] }
try { shops.value = (await getShops({ pageSize: 200 })).list } catch { shops.value = [] }
try { expressCompanies.value = await getExpressCompanyOptions() } catch { expressCompanies.value = [] }
}
function reset() {
query.bill_no = ''
@ -80,34 +84,57 @@ function hasItems(row: { item_kind?: number | string | null }) {
return Number(row.item_kind) > 0
}
/* -------------------- 新增 / 编辑 单据头 + 随单明细 -------------------- */
/* -------------------- 新增 / 编辑 单据头 -------------------- */
const router = useRouter()
const dialogVisible = ref(false)
const submitting = ref(false)
const formRef = ref<FormInstance>()
const editId = ref<number | null>(null)
const form = reactive({
warehouse_id: null as number | null,
shop_id: null as number | null,
outbound_type: 'PTCK',
customer: '',
operator: '',
total_amount: 0,
remark: '',
})
/**
* 单据头表单初值。
* 快递公司与收件人字段对齐 WMS `stockout.create` 的 deliveryOrder.logisticsCode / receiverInfo
* (13 个字段:name/company/zipCode/tel/mobile/email/countryCode/province/city/area/town/detailAddress/id)
*/
function emptyForm() {
return {
warehouse_id: null as number | null,
shop_id: null as number | null,
outbound_type: 'PTCK',
customer: '',
operator: '',
total_amount: 0,
remark: '',
express_code: '',
express_name: '',
receiver_name: '',
receiver_company: '',
receiver_tel: '',
receiver_mobile: '',
receiver_email: '',
receiver_country_code: '',
receiver_province: '',
receiver_city: '',
receiver_area: '',
receiver_town: '',
receiver_detail_address: '',
receiver_zip_code: '',
receiver_id: '',
}
}
const form = reactive(emptyForm())
const rules: FormRules = {
warehouse_id: [{ required: true, message: '请选择仓库', trigger: 'change' }],
}
function resetForm() {
Object.assign(form, {
warehouse_id: null, shop_id: null, outbound_type: 'PTCK',
customer: '', operator: '', total_amount: 0, remark: '',
})
/** 选择快递公司后同步名称(下拉已展示「名称(编码)」,此处仅写入 express_name 供推送/列表展示) */
function handleExpressChange(code: string | null) {
const company = expressCompanies.value.find(c => c.code === code)
form.express_name = company ? company.name : ''
}
async function openCreate() {
editId.value = null
resetForm()
formItems.value = []
dialogVisible.value = true
/** 新增出库单改为独立整页(菜单「创建出库单」),此处仅跳转 */
function openCreate() {
router.push('/outbound-order-create')
}
async function openEdit(row: OutboundOrder) {
const full = await outboundOrderApi.get(row.id)
@ -120,8 +147,22 @@ async function openEdit(row: OutboundOrder) {
operator: full.operator || '',
total_amount: Number(full.total_amount) || 0,
remark: full.remark || '',
express_code: full.express_code || '',
express_name: full.express_name || '',
receiver_name: full.receiver_name || '',
receiver_company: full.receiver_company || '',
receiver_tel: full.receiver_tel || '',
receiver_mobile: full.receiver_mobile || '',
receiver_email: full.receiver_email || '',
receiver_country_code: full.receiver_country_code || '',
receiver_province: full.receiver_province || '',
receiver_city: full.receiver_city || '',
receiver_area: full.receiver_area || '',
receiver_town: full.receiver_town || '',
receiver_detail_address: full.receiver_detail_address || '',
receiver_zip_code: full.receiver_zip_code || '',
receiver_id: full.receiver_id || '',
})
formItems.value = []
dialogVisible.value = true
}
@ -139,25 +180,24 @@ async function submitForm() {
operator: form.operator || null,
total_amount: form.total_amount,
remark: form.remark || null,
express_code: form.express_code || null,
express_name: form.express_name || null,
receiver_name: form.receiver_name || null,
receiver_company: form.receiver_company || null,
receiver_tel: form.receiver_tel || null,
receiver_mobile: form.receiver_mobile || null,
receiver_email: form.receiver_email || null,
receiver_country_code: form.receiver_country_code || null,
receiver_province: form.receiver_province || null,
receiver_city: form.receiver_city || null,
receiver_area: form.receiver_area || null,
receiver_town: form.receiver_town || null,
receiver_detail_address: form.receiver_detail_address || null,
receiver_zip_code: form.receiver_zip_code || null,
receiver_id: form.receiver_id || null,
} as Record<string, unknown>
if (editId.value == null) {
payload.items = formItems.value.map((it) => ({
product_id: it.product_id ?? null,
name: it.name || null,
code: it.code || null,
spec: it.spec || null,
unit: it.unit || null,
quantity: it.quantity,
price: it.price,
inventory_type: it.inventory_type || 'ZP',
remark: it.remark || null,
}))
await outboundOrderApi.create(payload as any)
ElMessage.success('新增成功')
} else {
await outboundOrderApi.update(editId.value, payload as any)
ElMessage.success('保存成功')
}
await outboundOrderApi.update(editId.value as number, payload as any)
ElMessage.success('保存成功')
dialogVisible.value = false
await fetchList()
} catch {
@ -168,27 +208,6 @@ async function submitForm() {
})
}
/* -------------------- 随单明细(创建时内联) -------------------- */
const formItems = ref<OutboundItemInput[]>([])
function addFormItem() {
formItems.value.push({ product_id: null, name: '', code: '', spec: '', unit: '', quantity: 1, price: 0, inventory_type: 'ZP', remark: '' })
}
function removeFormItem(idx: number) {
formItems.value.splice(idx, 1)
}
function onFormItemProductSelect(idx: number, p: ProductSearchItem) {
const it = formItems.value[idx]
if (!it) return
it.product_id = p.id
it.name = p.item_name || ''
it.code = p.item_code || ''
it.spec = p.sku_property || ''
it.unit = p.stock_unit || ''
}
const formTotal = computed(() =>
formItems.value.reduce((s, it) => s + (Number(it.quantity) || 0) * (Number(it.price) || 0), 0),
)
/* -------------------- 状态流转 -------------------- */
const transiting = ref(false)
async function transit(action: 'audit' | 'push' | 'complete' | 'cancel' | 'restore') {
@ -486,6 +505,9 @@ onMounted(async () => {
<el-table-column label="客户" width="140">
<template #default="{ row }">{{ row.customer || '-' }}</template>
</el-table-column>
<el-table-column label="收件人" width="100">
<template #default="{ row }">{{ row.receiver_name || '-' }}</template>
</el-table-column>
<el-table-column label="操作人" width="100">
<template #default="{ row }">{{ row.operator || '-' }}</template>
</el-table-column>
@ -501,6 +523,14 @@ onMounted(async () => {
<el-table-column label="商品种类" width="100" align="right">
<template #default="{ row }">{{ row.item_kind ?? 0 }}</template>
</el-table-column>
<el-table-column label="运单号" width="180">
<template #default="{ row }">
<template v-if="(row.waybill_codes || []).length">
<div v-for="code in row.waybill_codes" :key="code">{{ code }}</div>
</template>
<template v-else>-</template>
</template>
</el-table-column>
<el-table-column prop="created_at" label="创建时间" width="180" />
<el-table-column label="操作" width="300" fixed="right">
<template #default="{ row }">
@ -543,8 +573,15 @@ onMounted(async () => {
<el-descriptions-item label="仓库">{{ currentOrder.warehouse?.name || '-' }}</el-descriptions-item>
<el-descriptions-item label="店铺">{{ currentOrder.shop?.name || '-' }}</el-descriptions-item>
<el-descriptions-item label="客户">{{ currentOrder.customer || '-' }}</el-descriptions-item>
<el-descriptions-item label="物流公司">{{ currentOrder.express_name || currentOrder.express_code || '-' }}</el-descriptions-item>
<el-descriptions-item label="运单号">{{ (currentOrder.waybill_codes || []).join('、') || '-' }}</el-descriptions-item>
<el-descriptions-item label="操作人">{{ currentOrder.operator || '-' }}</el-descriptions-item>
<el-descriptions-item label="总金额">{{ currentOrder.total_amount }}</el-descriptions-item>
<el-descriptions-item label="收件人">{{ currentOrder.receiver_name || '-' }}</el-descriptions-item>
<el-descriptions-item label="收件人电话">{{ currentOrder.receiver_mobile || currentOrder.receiver_tel || '-' }}</el-descriptions-item>
<el-descriptions-item label="收货地址" :span="2">
{{ [ currentOrder.receiver_province, currentOrder.receiver_city, currentOrder.receiver_area, currentOrder.receiver_town, currentOrder.receiver_detail_address ].filter(Boolean).join(' ') || '-' }}
</el-descriptions-item>
<el-descriptions-item label="备注" :span="2">{{ currentOrder.remark || '-' }}</el-descriptions-item>
<el-descriptions-item v-if="currentOrder.status === 5" label="作废人">{{ currentOrder.voider?.nickname || currentOrder.voider?.username || '-' }}</el-descriptions-item>
<el-descriptions-item v-if="currentOrder.status === 5" label="作废时间">{{ currentOrder.void_at || '-' }}</el-descriptions-item>
@ -669,7 +706,7 @@ onMounted(async () => {
<!-- 新增 / 编辑 对话框 -->
<el-dialog
v-model="dialogVisible"
:title="editId == null ? '新增出库单' : '编辑出库单'"
title="编辑出库单"
width="880px"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px">
@ -708,6 +745,20 @@ onMounted(async () => {
<el-input v-model="form.customer" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物流公司">
<el-select
v-model="form.express_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="12">
<el-form-item label="操作人">
<el-input v-model="form.operator" placeholder="选填" />
@ -718,66 +769,81 @@ onMounted(async () => {
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</el-col>
</el-row>
<!-- 随单商品明细(仅新建时) -->
<template v-if="editId == null">
<el-divider content-position="left">商品明细</el-divider>
<div class="items-toolbar">
<span class="items-title">共 {{ formItems.length }} 项</span>
<span class="total">合计金额:{{ formTotal.toFixed(2) }}</span>
<el-button type="primary" @click="addFormItem">添加商品</el-button>
</div>
<el-table :data="formItems" size="small" border class="fill-table" style="max-height: 280px; overflow: auto">
<el-table-column label="系统商品" min-width="220">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
@select="(p: ProductSearchItem) => onFormItemProductSelect($index, p)"
/>
</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-input v-model="row.code" placeholder="自动带出" /></template>
</el-table-column>
<el-table-column label="规格" width="100">
<template #default="{ row }"><el-input v-model="row.spec" /></template>
</el-table-column>
<el-table-column label="单位" width="80">
<template #default="{ row }"><el-input v-model="row.unit" /></template>
</el-table-column>
<el-table-column label="库存类型" width="120">
<template #default="{ row }">
<el-select v-model="row.inventory_type" style="width: 100%">
<el-option v-for="o in INV_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="110">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="0" :precision="0" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="120">
<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="70" fixed="right">
<template #default="{ $index }">
<el-button link type="danger" @click="removeFormItem($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</template>
<el-col :span="24">
<el-divider content-position="left">收件人(receiverInfo)</el-divider>
</el-col>
<el-col :span="12">
<el-form-item label="姓名">
<el-input v-model="form.receiver_name" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公司">
<el-input v-model="form.receiver_company" maxlength="200" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机">
<el-input v-model="form.receiver_mobile" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="固定电话">
<el-input v-model="form.receiver_tel" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱">
<el-input v-model="form.receiver_email" maxlength="100" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮编">
<el-input v-model="form.receiver_zip_code" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国家编码">
<el-input v-model="form.receiver_country_code" maxlength="50" placeholder="如 CN" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="收件人证件号">
<el-input v-model="form.receiver_id" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="省">
<el-input v-model="form.receiver_province" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="市">
<el-input v-model="form.receiver_city" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="区">
<el-input v-model="form.receiver_area" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="街道/镇">
<el-input v-model="form.receiver_town" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="详细地址">
<el-input v-model="form.receiver_detail_address" maxlength="200" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>

View File

@ -0,0 +1,294 @@
<script setup lang="ts">
import { onMounted, reactive, ref } from 'vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import ProductSelect from '@/components/ProductSelect.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import {
getStockRecords,
getStockRecordBizTypes,
type StockRecordBizType,
type StockRecordItem,
} from '@/api/stockRecord'
import type { ProductSearchItem } from '@/api/product'
/**
* 出入库记录(库存流水)页
*
* 数据来自 stock_records:出库单推送锁定、出库解锁/回补、出库确认扣减、入库确认增加,
* 每行记录变动数量与变动前后的总数量/锁定数量/可用数量。
*
* 商品维度查询采用「先锁商品再查询」:先用商品选择器按商品编码/名称(关键词)搜到并选中商品,
* 锁定 product_id 后按该商品精确过滤;未锁定时可用关键词模糊匹配商品编码/名称/单据号。
*/
const BIZ_TAG_TYPES: Record<string, string> = {
outbound_lock: 'warning',
outbound_unlock: 'info',
outbound_deduct: 'danger',
outbound_restore: 'success',
inbound_increase: 'success',
order_lock: 'warning',
order_unlock: 'info',
order_deduct: 'danger',
}
const query = reactive({
page: 1,
pageSize: DEFAULT_PAGE_SIZE,
/** 商品选择器锁定的商品ID(为空表示不限定商品) */
product_id: null as number | null,
/** 关键词:单据号 / 商品编码 / 商品名称(未锁定商品时使用) */
keyword: '',
bill_no: '',
biz_type: '',
direction: '' as string | number,
bill_type: '' as string | number,
dateRange: [] as string[],
})
/** 已锁定商品的展示标签(product_id 有值但选项未加载时用于回显) */
const lockedProductLabel = ref('')
const { loading, list, total, elapsed, fetchList, search, handlePageChange, handleSizeChange } =
useListPage<StockRecordItem, typeof query>({
query,
fetcher: () => {
const params: Record<string, unknown> = {
page: query.page,
pageSize: query.pageSize,
}
if (query.product_id != null) params.product_id = query.product_id
if (query.keyword) params.keyword = query.keyword.trim()
if (query.bill_no) params.bill_no = query.bill_no.trim()
if (query.biz_type) params.biz_type = query.biz_type
if (query.direction !== '') params.direction = query.direction
if (query.bill_type !== '') params.bill_type = query.bill_type
if (query.dateRange.length === 2) {
params.start_time = query.dateRange[0]
params.end_time = query.dateRange[1]
}
return getStockRecords(params)
},
})
/** 业务动作下拉(后端返回枚举,避免文案漂移) */
const bizTypes = ref<StockRecordBizType[]>([])
async function fetchBizTypes() {
try {
bizTypes.value = await getStockRecordBizTypes()
} catch {
bizTypes.value = []
}
}
/** 商品选择器选中:锁定商品ID(并展示标签) */
function onProductLock(product: ProductSearchItem) {
query.product_id = product.id
lockedProductLabel.value = product.item_code
? `${product.item_code} ${product.item_name}`
: product.item_name
}
/** 商品选择器清空 */
function onProductClear() {
query.product_id = null
lockedProductLabel.value = ''
}
/** 重置全部筛选条件 */
function reset() {
query.keyword = ''
query.bill_no = ''
query.biz_type = ''
query.direction = ''
query.bill_type = ''
query.dateRange = []
onProductClear()
search()
}
/** DECIMAL 可能是字符串,统一转数字展示(整数不带小数,小数最多 3 位) */
function fmtQty(value: unknown): string {
const num = Number(value ?? 0)
if (!Number.isFinite(num)) return '0'
return Number.isInteger(num) ? String(num) : String(Number(num.toFixed(3)))
}
/** 变动前后对比文案 */
function fmtRange(before: unknown, after: unknown): string {
return `${fmtQty(before)} → ${fmtQty(after)}`
}
/** 单据类型文案:1 入库单 2 出库单 3 发货单(订单) */
function billTypeLabel(value: number | string): string {
const map: Record<number, string> = { 1: '入库单', 2: '出库单', 3: '发货单' }
return map[Number(value)] || '-'
}
onMounted(() => {
fetchBizTypes()
fetchList()
})
</script>
<template>
<el-card class="stock-record-card">
<template #header>
<div class="page-header">
<span>出入库记录</span>
<span class="hint">库存流水:出库推送锁定 / 解锁 / 确认扣减,入库确认增加</span>
</div>
</template>
<el-form :inline="true" class="search-bar" size="small">
<el-form-item label="商品">
<div class="product-filter">
<ProductSelect
v-model="query.product_id"
:model-label="lockedProductLabel"
placeholder="搜索商品编码/名称锁定商品"
@select="onProductLock"
/>
<el-button v-if="query.product_id != null" link type="primary" @click="onProductClear">清除</el-button>
</div>
</el-form-item>
<el-form-item label="关键词">
<el-input
v-model="query.keyword"
placeholder="单据号 / 商品编码 / 名称"
clearable
style="width: 200px"
@keyup.enter="search"
/>
</el-form-item>
<el-form-item label="业务动作">
<el-select v-model="query.biz_type" placeholder="全部" clearable style="width: 150px">
<el-option v-for="o in bizTypes" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
<el-form-item label="方向">
<el-select v-model="query.direction" placeholder="全部" clearable style="width: 110px">
<el-option label="入库" :value="1" />
<el-option label="出库" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="单据类型">
<el-select v-model="query.bill_type" placeholder="全部" clearable style="width: 110px">
<el-option label="入库单" :value="1" />
<el-option label="出库单" :value="2" />
<el-option label="发货单" :value="3" />
</el-select>
</el-form-item>
<el-form-item label="单据号">
<el-input v-model="query.bill_no" placeholder="如 CK_1" clearable style="width: 150px" @keyup.enter="search" />
</el-form-item>
<el-form-item label="记录时间">
<el-date-picker
v-model="query.dateRange"
type="daterange"
value-format="YYYY-MM-DD"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="reset">重置</el-button>
</el-form-item>
</el-form>
<div class="table-wrap">
<DataTable :loading="loading" :data="list" class="fill-table">
<el-table-column prop="created_at" label="记录时间" width="165" />
<el-table-column label="业务动作" width="130">
<template #default="{ row }">
<el-tag size="small" :type="BIZ_TAG_TYPES[row.biz_type] || 'info'">
{{ row.biz_type_label || row.biz_type }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="方向" width="70">
<template #default="{ row }">{{ row.direction_label || '-' }}</template>
</el-table-column>
<el-table-column label="单据类型" width="90">
<template #default="{ row }">{{ billTypeLabel(row.bill_type) }}</template>
</el-table-column>
<el-table-column prop="bill_no" label="单据号" width="130" />
<el-table-column prop="item_code" label="商品编码" width="140" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="160" show-overflow-tooltip />
<el-table-column label="库存类型" width="90">
<template #default="{ row }">{{ row.item_type === 'CC' ? '残次品' : '正品' }}</template>
</el-table-column>
<el-table-column label="变动数量" width="100" align="right">
<template #default="{ row }">{{ fmtQty(row.quantity) }}</template>
</el-table-column>
<el-table-column label="总数量(前→后)" width="150" align="right">
<template #default="{ row }">{{ fmtRange(row.quantity_before, row.quantity_after) }}</template>
</el-table-column>
<el-table-column label="锁定数量(前→后)" width="150" align="right">
<template #default="{ row }">{{ fmtRange(row.lock_before, row.lock_after) }}</template>
</el-table-column>
<el-table-column label="可用数量(前→后)" width="150" align="right">
<template #default="{ row }">{{ fmtRange(row.available_before, row.available_after) }}</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
</DataTable>
</div>
<ListPager
:total="total"
:elapsed="elapsed"
:page="query.page"
:page-size="query.pageSize"
@page-change="handlePageChange"
@size-change="handleSizeChange"
/>
</el-card>
</template>
<style scoped>
.stock-record-card {
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
}
.stock-record-card :deep(.el-card__header) {
padding: 8px 14px;
}
.stock-record-card :deep(.el-card__body) {
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
overflow: hidden;
padding: 10px 14px;
}
.page-header {
display: flex;
align-items: center;
justify-content: space-between;
font-weight: 600;
}
.page-header .hint {
font-weight: 400;
font-size: 12px;
color: var(--el-text-color-secondary);
}
.search-bar {
margin-bottom: 8px;
}
.product-filter {
display: flex;
align-items: center;
gap: 6px;
}
.table-wrap {
flex: 1;
min-height: 0;
overflow: hidden;
}
</style>