This commit is contained in:
yin 2026-10-03 17:59:57 +08:00
parent d6314aa7a1
commit ac52c0f6b8
7 changed files with 2634 additions and 0 deletions

View File

@ -0,0 +1,415 @@
/**
* 商品流水(`stock.transaction.storeList`,**货主侧**)
*
* 与 new3 Web 端 `src/views/storage/productflow/store/index.vue` **同一个接口**
* (它引的是 `@/api/stock/stock` 的 `stockTransactionStoreList`)。
* ⚠️ 同文件另有 `stock.transaction.list`(仓库侧)—— 小程序是**货主侧**,别拿错。
*
* ```
* body = { where?, pagination: { page, pageSize }, sort: { sortField, sortOrder } }
* 返回 data = { list: [...], pagination: { page, pageSize, total } }
* ```
*
* ⚠️ **`where` 的形状是「混的」** —— 这是 new3 该页 `normalizeToWhere()` +
* `applyWarehouseToWhere()` 的**真实输出**,不是笔误:
*
* | 字段 | 形状 |
* |---|---|
* | `order_no` | `{ operator: 'contains', value, type: 'text' }`(带操作符) |
* | `created_at` | `{ operator: 'between', value: [start, end], type: 'daterange' }` |
* | `transaction_type` / `order_type` / `warehouse_id` | **裸值**(ScanBox 的 select 不产生 operator) |
*
* 展示字段取自 new3 `productflow-config.ts` 的 `columns`,但按**详情面板**的粒度收敛成
* 移动端卡片(Web 表格里 8 个数字列 → 「变动数量 / 库存 前→后 / 锁定库存 前→后」三行);
* 排序、列配置、导出、详情面板这些 Web 能力小程序不做。
*/
import request from '@/utils/request'
import type { BizResponse } from '@/utils/request'
import { SYSTEM_URL, gatewayParams } from '@/utils/gateway'
/**
* 每页条数:**固定 50 条,页面不提供修改**
*
* 与「收货单」「库存报表」「入库单」取同一个值(纯文本行,单页多放一些少翻页)
*/
export const PRODUCTFLOW_PAGE_SIZE = 50
/** 商品流水行(只声明小程序用到的字段,其余用索引签名兜住) */
export interface ProductFlowItem {
id?: number
/** 流水时间(后端原值,形如 `2026-10-03T12:00:00.000Z` 或 `2026-10-03 12:00:00`) */
created_at?: string
/** 流水类型:INBOUND 入库 / OUTBOUND 出库 / LOCK 锁定库存 / UNLOCK 取消锁定 */
transaction_type?: string
/** 商品ID(= `wms_stock_warehouse.id`,Web 列名就是「商品ID」) */
stock_id?: number
store_id?: number
warehouse_id?: number
/** 变动数量原始值(有时后端直接给,否则用 `after_quantity - before_quantity` 算) */
quantity?: number
/** 可用库存 变动前 / 变动后 */
before_quantity?: number
after_quantity?: number
/** 锁定库存 变动前 / 变动后 */
before_locked_quantity?: number
after_locked_quantity?: number
/** 批次号 */
batch_no?: string
/** 订单类型:ORDER / CGRK / SHRK / RECEIVING / ENTRY_ORDER / RETURN ... */
order_type?: string
/** 订单号 */
order_no?: string
order_id?: number
receiving_id?: number
entry_order_id?: number
/** 操作人 */
operator_name?: string
remark?: string
[key: string]: any
}
/** 列表响应体 `data` */
export interface ProductFlowPayload {
list?: ProductFlowItem[]
total?: number
pagination?: { page?: number; pageSize?: number; total?: number }
[key: string]: any
}
/** 查询条件(页面传入) */
export interface ProductFlowQuery {
page?: number
pageSize?: number
/** 订单号(`contains` 模糊),空表示不过滤 */
order_no?: string
/** 流水类型 INBOUND / OUTBOUND / LOCK / UNLOCK,空表示全部 */
transaction_type?: string
/** 订单类型,空表示全部 */
order_type?: string
/** 流水时间区间(`YYYY-MM-DD HH:mm:ss`),两个都为空则不传时间条件 */
start_time?: string
end_time?: string
/** 仓库 id,空表示全部 */
warehouse_id?: number | string
}
function isFilled(value: unknown): boolean {
return value !== undefined && value !== null && value !== ''
}
/**
* 组装请求体
*
* `sort` 固定 `created_at DESC`(与 new3 页面的默认排序一致;移动端不做排序 UI)
*/
function buildBody(query: ProductFlowQuery): Record<string, any> {
const {
page = 1,
pageSize = PRODUCTFLOW_PAGE_SIZE,
order_no,
transaction_type,
order_type,
start_time,
end_time,
warehouse_id
} = query
const where: Record<string, any> = {}
// 带操作符的一类
if (order_no && String(order_no).trim()) {
where.order_no = { operator: 'contains', value: String(order_no).trim(), type: 'text' }
}
if (isFilled(start_time) && isFilled(end_time)) {
where.created_at = { operator: 'between', value: [start_time, end_time], type: 'daterange' }
}
// 裸值的一类(ScanBox 的 select / 仓库筛选都是裸值)
if (isFilled(transaction_type)) where.transaction_type = transaction_type
if (isFilled(order_type)) where.order_type = order_type
if (isFilled(warehouse_id)) where.warehouse_id = warehouse_id
const body: Record<string, any> = {
pagination: { page, pageSize },
sort: { sortField: 'created_at', sortOrder: 'DESC' }
}
// 无有效条件时不传 where(与 new3 `where: Object.keys(where).length > 0 ? where : undefined` 一致)
if (Object.keys(where).length) body.where = where
return body
}
/** 商品流水列表(分页,货主侧) */
export function fetchStoreProductFlowList(
query: ProductFlowQuery = {}
): Promise<BizResponse<ProductFlowPayload>> {
return request<ProductFlowPayload>({
url: SYSTEM_URL,
method: 'POST',
params: gatewayParams('stock.transaction.storeList'),
data: buildBody(query),
// 需要登录:未登录时不发请求,直接弹登录抽屉
auth: true
})
}
// ── 响应解析(⚠️ 别只认 `data.list`)─────────────────────────────────────
/**
* 从响应里取流水数组
*
* ⚠️ **本接口的业务字段在「响应顶层」,没有 `data` 包裹**(与 `index.loadStores` 同类):
*
* ```json
* { "flag":"success", "code":200, "message":"ok",
* "list":[...], "pagination":{ "page":1, "pageSize":20, "total":6279 }, "timestamp":... }
* ```
*
* new3 的写法是 `const payload = res?.data ?? res` 后再取 `payload.list` → 说明
* 「带 `data` 包裹」与「扁平」两种形态都可能出现,故这里两者都兼容:
* 顶层 `list`/`items`/`rows` → `data` 包裹 → 直接数组。
*/
export function readList(res: any): ProductFlowItem[] {
const payload = res?.data ?? res
if (Array.isArray(payload)) return payload
for (const key of ['list', 'items', 'rows'] as const) {
if (Array.isArray(payload?.[key])) return payload[key]
}
// 兜底:`data` 存在但是别的对象,而列表在响应顶层
for (const key of ['list', 'items', 'rows'] as const) {
if (Array.isArray(res?.[key])) return res[key]
}
return []
}
/**
* 总数:`pagination.total` / `total`
*
* `data` 内外都找一遍(本接口实测形态见 `readList` 注释)
*/
export function readTotal(res: any): number {
const candidates = [
res?.data?.pagination?.total,
res?.pagination?.total,
res?.data?.total,
res?.total
]
for (const value of candidates) {
const num = Number(value)
if (Number.isFinite(num) && num > 0) return num
}
return 0
}
// ── 流水类型(`transaction_type`)─────────────────────────────────────────
/** 流水类型 → 文案(与 new3 `productflow-config.ts` 的 `transactionTypeConfig` 对齐) */
export const TRANSACTION_TYPE_TEXT: Record<string, string> = {
INBOUND: '入库',
OUTBOUND: '出库',
LOCK: '锁定库存',
UNLOCK: '取消锁定'
}
/** 流水类型 → 主题色(对齐 new3 的 tag:success / danger / warning / info) */
export const TRANSACTION_TYPE_COLOR: Record<string, string> = {
INBOUND: '#19be6b',
OUTBOUND: '#fa3534',
LOCK: '#ff9900',
UNLOCK: '#909399'
}
/** 流水类型 → 标签底色(与上面的主题色同源,低透明度,用于卡片头部的类型胶囊) */
export const TRANSACTION_TYPE_BG: Record<string, string> = {
INBOUND: 'rgba(25, 190, 107, 0.12)',
OUTBOUND: 'rgba(250, 53, 52, 0.12)',
LOCK: 'rgba(255, 153, 0, 0.14)',
UNLOCK: 'rgba(144, 147, 153, 0.14)'
}
/** 流水类型文案:未知值原样显示(后端加新类型也不会显示成空白) */
export function readTransactionTypeText(type?: string): string {
if (!type) return '—'
const upper = String(type).toUpperCase()
return TRANSACTION_TYPE_TEXT[upper] || type
}
/** 流水类型颜色 */
export function readTransactionTypeColor(type?: string): string {
if (!type) return '#909399'
const upper = String(type).toUpperCase()
return TRANSACTION_TYPE_COLOR[upper] || '#909399'
}
/** 流水类型标签底色;未知类型给中性灰 */
export function readTransactionTypeBg(type?: string): string {
const upper = String(type ?? '').toUpperCase()
return TRANSACTION_TYPE_BG[upper] || 'rgba(144, 147, 153, 0.14)'
}
/** 流水类型选项(筛选用,含「全部」) */
export const TRANSACTION_TYPE_OPTIONS: Array<{ value: string; label: string }> = [
{ value: '', label: '全部' },
{ value: 'INBOUND', label: '入库' },
{ value: 'OUTBOUND', label: '出库' },
{ value: 'LOCK', label: '锁定库存' },
{ value: 'UNLOCK', label: '取消锁定' }
]
// ── 订单类型(`order_type`)──────────────────────────────────────────────
/** 订单类型 → 文案(与 new3 `productflow-config.ts` 的 `orderTypeConfig` 对齐) */
export const ORDER_TYPE_TEXT: Record<string, string> = {
ORDER: '订单',
ORDER_CANCEL: '取消订单',
CGRK: '采购入库',
JYCK: '交易出库',
CGTH: '采购退货',
JYTH: '交易退货',
SCRK: '生产入库',
SHRK: '收货入库',
DELIVERY_ORDER: '出库单',
RECEIVING: '收货单',
ENTRY_ORDER: '入库单',
INVENTORY: '盘点单',
RETURN: '退货单'
}
/** 订单类型文案:未知值原样显示 */
export function readOrderTypeText(type?: string): string {
if (!type) return '—'
return ORDER_TYPE_TEXT[type] || type
}
/** 订单类型选项(筛选用,含「全部」) */
export const ORDER_TYPE_OPTIONS: Array<{ value: string; label: string }> = [
{ value: '', label: '全部' },
...Object.entries(ORDER_TYPE_TEXT).map(([value, label]) => ({ value, label }))
]
// ── 数量变动 ──────────────────────────────────────────────────────────────
/**
* 变动数量(对齐 new3 `formatQuantityDelta`)
*
* 优先用后端给的 `quantity`;否则用 `after_quantity - before_quantity` 算。
* 再按流水类型定正负:**出库 / 锁定为负,入库 / 解锁为正**
*/
export function readQuantityDelta(row: ProductFlowItem | undefined | null): number | undefined {
if (!row) return undefined
let value: number | undefined
if (isFilled(row.quantity)) {
value = Number(row.quantity)
} else {
if (!isFilled(row.before_quantity) || !isFilled(row.after_quantity)) return undefined
value = Number(row.after_quantity) - Number(row.before_quantity)
}
if (!Number.isFinite(value)) return undefined
const type = String(row.transaction_type || '').toUpperCase()
const abs = Math.abs(value)
return type === 'OUTBOUND' || type === 'LOCK' ? -abs : abs
}
/** 变动数量文案:正数带 `+`,取不到显示 `—` */
export function readQuantityText(row: ProductFlowItem | undefined | null): string {
const qty = readQuantityDelta(row)
if (qty === undefined) return '—'
return qty > 0 ? `+${qty}` : String(qty)
}
/** 变动数量的颜色:正绿负红,0 / 取不到灰 */
export function readQuantityColor(row: ProductFlowItem | undefined | null): string {
const qty = readQuantityDelta(row)
if (qty === undefined || qty === 0) return '#909399'
return qty > 0 ? '#19be6b' : '#fa3534'
}
/** 「变动前 → 变动后」文案(可用库存 / 锁定库存各一行,取不到显示 `—`) */
function readRangeText(before: unknown, after: unknown): string {
if (!isFilled(before) && !isFilled(after)) return '—'
const from = isFilled(before) ? String(before) : '—'
const to = isFilled(after) ? String(after) : '—'
return `${from} → ${to}`
}
/** 可用库存变动:`100 → 125` */
export function readStockRangeText(row: ProductFlowItem | undefined | null): string {
return readRangeText(row?.before_quantity, row?.after_quantity)
}
/** 锁定库存变动:`0 → 3` */
export function readLockRangeText(row: ProductFlowItem | undefined | null): string {
return readRangeText(row?.before_locked_quantity, row?.after_locked_quantity)
}
// ── 时间 ──────────────────────────────────────────────────────────────────
/**
* 流水时间文案:`YYYY-MM-DD HH:mm:ss`
*
* 与 new3 `productflow-config.ts` 的 `formatDateTime` 同口径(把 `T` 换成空格、截到秒),
* 已经是对口格式就用它;都解析不了就原样返回(不吞掉原值)
*/
export function readDateTimeText(value: unknown): string {
if (value === undefined || value === null || value === '') return '—'
const text = String(value).trim()
// 已经是 `YYYY-MM-DD HH:mm:ss` → 原样
if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(text)) return text
// ISO 串(`2026-10-03T12:00:00.000Z`)→ 去掉 T 与毫秒/时区,截到秒
if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(text)) return text.replace('T', ' ').slice(0, 19)
return text
}
// ── 流水时间预设(与 `api/stock/report.ts` 的区间预设同口径)──────────────
/** 预设区间(含「全部」);默认「全部」= 不传时间条件 */
export const PRODUCTFLOW_PERIOD_OPTIONS: Array<{ value: string; label: string }> = [
{ value: '', label: '全部' },
{ value: 'today', label: '今天' },
{ value: 'd7', label: '近 7 天' },
{ value: 'd30', label: '近 30 天' },
{ value: 'month', label: '本月' }
]
const pad2 = (num: number): string => String(num).padStart(2, '0')
/** 日期 → `YYYY-MM-DD HH:mm:ss`(开始取 00:00:00、结束取 23:59:59) */
function toParam(date: Date, endOfDay = false): string {
const day = `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`
return `${day} ${endOfDay ? '23:59:59' : '00:00:00'}`
}
function addDays(base: Date, days: number): Date {
const next = new Date(base.getTime())
next.setDate(next.getDate() + days)
return next
}
/**
* 预设区间 → `{ start_time, end_time }`
*
* @param key 预设标识;`''`(全部)返回 `null` = 不传时间条件
* ⚠️ 天数**含今天**:近 7 天 = 今天往前推 6 天
*/
export function buildPeriodRange(key: string): { start_time: string; end_time: string } | null {
if (!key) return null
const now = new Date()
const end = toParam(now, true)
if (key === 'today') return { start_time: toParam(now), end_time: end }
if (key === 'd7') return { start_time: toParam(addDays(now, -6)), end_time: end }
if (key === 'd30') return { start_time: toParam(addDays(now, -29)), end_time: end }
if (key === 'month') {
return { start_time: toParam(new Date(now.getFullYear(), now.getMonth(), 1)), end_time: end }
}
return null
}

477
src/api/storage/entry.ts Normal file
View File

@ -0,0 +1,477 @@
/**
* 入库单列表(`storage.entry.listStore`)
*
* 与 new3 Web 端 `src/views/storage/entry_owner/index.vue` **同一个接口**
* (它引的是 `@/api/storage.entry/entry` 的 `getEntryListStore`)。
* ⚠️ 同模块另一个 `storage.entry.list` 是**仓库侧**(会多下发 `store_name` /
* `receivingBindings`),小程序是**货主侧**,与「收货单」「库存报表」保持一致。
*
* ```
* body = { pagination: { page, pageSize }, sort?, where: { <字段>: { operator, value, type } } }
* 返回 data = { list: [...], pagination: { total } }
* ```
*
* ⚠️ **`where` 的条件形状是 `{ operator, value, type }`**(new3 的 ScanBox 契约,
* 见其 `normalizeToWhere()` / `applyWarehouseToWhere()`),**不是裸值** ——
* 和「外仓商品」那个 `where.keyword = 'xxx'` 的写法不一样,别混。
* 对照:`stock.warehouse.externalList` = 裸值;`stock.report.searchStore` = 扁平值。
*
* 小程序端展示的字段取自 new3 `entry-config.ts` 的 `entryStoreColums`(货主侧列,
* 无 `store_name` / `receivingBindings`),并按移动端取舍裁剪(去掉排序、列配置、导出、
* 详情面板等 Web 能力),见 `pagesA/external-inventory/entry.vue`。
*
* 筛选维度(对齐 new3 货主侧的 `availableFields`,去掉 `store_id` 货主项):
* 入库单号(like)/ 订单状态 / 入库状态 / 仓库。
*/
import request from '@/utils/request'
import type { BizResponse } from '@/utils/request'
import { SYSTEM_URL, gatewayParams } from '@/utils/gateway'
/**
* 每页条数:**固定 50 条,页面不提供修改**
*
* 与「收货单」「库存报表」取同一个值(纯文本明细,单页多放一些少翻页);
* 「外仓商品」因为带图片、单页重,固定的是 20。
*/
export const ENTRY_PAGE_SIZE = 50
/** 入库单列表项(只声明小程序用到的字段,其余用索引签名兜住) */
export interface EntryItem {
id?: number
/** 入库单号 */
entry_order_code?: string
/** 仓库名称 */
warehouse_name?: string
/** 入库单类型:CGRK / THRK / QTRK / PDRK / SCRK / LYRK / CCRK / DBRK / B2BRK / XNRK */
order_type?: string
/** 单据编号(外部/采购单号) */
purchase_order_code?: string
/** 商品种类数 */
total_order_lines?: number
/** 应收总数(计划数量) */
total_quantity?: number
/** 实收总数(已完成数量) */
received_quantity?: number
/** 订单状态:CREATED / PENDING / PARTIAL / PARTIAL_RECEIVED / COMPLETED / CANCELLED */
order_status?: string
/** 收货绑定:true = 已绑定收货单 / false = 未绑定(new3 侧算出来的虚拟字段) */
hasReceiving?: boolean
/** 入库(同步)状态:PENDING / SYNCING / SUCCESS / FAIL / FAILED */
sync_status?: string
/** 同步信息(失败原因等) */
sync_message?: string
/** 数据来源:QM 奇门 / API 接口 / WMS 系统 */
source_type?: string
/** 供应商编码 / 名称 */
supplier_code?: string
supplier_name?: string
/** 运单号 / 物流公司 */
express_code?: string
logistics_code?: string
logistics_name?: string
/** 单据创建时间(后端原值) */
order_create_time?: string
/** 预计开始 / 结束时间 */
expect_start_time?: string
expect_end_time?: string
/** 创建 / 更新时间 */
created_at?: string
updated_at?: string
/** 备注 */
remark?: string
[key: string]: any
}
/** 列表响应体 `data` */
export interface EntryPayload {
list?: EntryItem[]
total?: number
pagination?: { page?: number; pageSize?: number; total?: number }
[key: string]: any
}
/** 查询条件(页面传入) */
export interface EntryQuery {
page?: number
pageSize?: number
/** 入库单号(模糊搜索),空字符串表示不过滤 */
keyword?: string
/** 订单状态,空字符串表示全部 */
order_status?: string
/** 入库(同步)状态,空字符串表示全部 */
sync_status?: string
/** 仓库 id,空字符串表示全部 */
warehouse_id?: number | string
}
function isFilled(value: unknown): boolean {
return value !== undefined && value !== null && value !== ''
}
/** `where` 条件统一为 `{ operator, value, type }`(后端契约,见文件头说明) */
const eqText = (value: unknown) => ({ operator: 'eq', value, type: 'text' })
const eqNumber = (value: unknown) => ({ operator: 'eq', value, type: 'number' })
const likeText = (value: unknown) => ({ operator: 'like', value, type: 'text' })
/**
* 组装请求体(条件字段/操作符要调整时改这里)
*
* 与 new3 `normalizeToWhere()` + `applyWarehouseToWhere()` 的输出对齐:
* 文本条件 `type: 'text'`、仓库 `type: 'number'`。
*/
function buildBody(query: EntryQuery): Record<string, any> {
const { page = 1, pageSize = ENTRY_PAGE_SIZE, keyword, order_status, sync_status, warehouse_id } =
query
const where: Record<string, any> = {}
// 入库单号模糊搜索:new3 的字段配置里 `entry_order_code` 走 like
if (keyword && String(keyword).trim()) where.entry_order_code = likeText(String(keyword).trim())
if (isFilled(order_status)) where.order_status = eqText(order_status)
if (isFilled(sync_status)) where.sync_status = eqText(sync_status)
if (isFilled(warehouse_id)) {
const num = Number(warehouse_id)
where.warehouse_id = eqNumber(Number.isFinite(num) ? num : warehouse_id)
}
return {
pagination: { page, pageSize },
where
}
}
/** 入库单列表(分页,货主侧) */
export function fetchStoreEntryList(query: EntryQuery = {}): Promise<BizResponse<EntryPayload>> {
return request<EntryPayload>({
url: SYSTEM_URL,
method: 'POST',
params: gatewayParams('storage.entry.listStore'),
data: buildBody(query),
// 需要登录:未登录时不发请求,直接弹登录抽屉
auth: true
})
}
/** 总数:后端放在 `pagination.total`(也可能在顶层 `total`) */
export function readTotal(payload: EntryPayload | undefined | null): number {
const total = payload?.pagination?.total ?? payload?.total ?? 0
const num = Number(total)
return Number.isFinite(num) && num > 0 ? num : 0
}
// ── 订单状态(`order_status`)──────────────────────────────────────────────
/** 订单状态 → 文案(与 new3 `entry-config.ts` 的 `entryOrderStatusOptions` 对齐)
*
* ⚠️ 多一个 `CREATING`(创建中):new3 的选项表里没有,但 `wms_entry_order.order_status`
* 的 enum 里确实有(enum: CREATING/CREATED/PENDING/COMPLETED/CANCELLED)
*/
export const ENTRY_ORDER_STATUS_TEXT: Record<string, string> = {
CREATING: '创建中',
CREATED: '已创建',
PENDING: '待入库',
PARTIAL: '入库中',
PARTIAL_RECEIVED: '部分收货',
COMPLETED: '已完成',
CANCELLED: '已作废'
}
/** 订单状态 → 主题色(小程序没有 el-tag,用文字色区分) */
export const ENTRY_ORDER_STATUS_COLOR: Record<string, string> = {
CREATING: '#909399', // info
CREATED: '#909399', // info
PENDING: '#ff9900', // warning
PARTIAL: '#2979ff', // primary
PARTIAL_RECEIVED: '#2979ff', // primary
COMPLETED: '#19be6b', // success
CANCELLED: '#fa3534' // danger
}
/** 状态文案:未知状态原样显示(后端加了新状态也不会显示成空白) */
export function readStatusText(status?: string): string {
if (!status) return '—'
return ENTRY_ORDER_STATUS_TEXT[String(status).toUpperCase()] || status
}
/** 状态颜色 */
export function readStatusColor(status?: string): string {
if (!status) return '#909399'
return ENTRY_ORDER_STATUS_COLOR[String(status).toUpperCase()] || '#909399'
}
/** 状态选项(筛选用,含「全部」) */
export const ENTRY_ORDER_STATUS_OPTIONS: Array<{ value: string; label: string }> = [
{ value: '', label: '全部' },
{ value: 'CREATING', label: '创建中' },
{ value: 'CREATED', label: '已创建' },
{ value: 'PENDING', label: '待入库' },
{ value: 'PARTIAL', label: '入库中' },
{ value: 'PARTIAL_RECEIVED', label: '部分收货' },
{ value: 'COMPLETED', label: '已完成' },
{ value: 'CANCELLED', label: '已作废' }
]
// ── 入库单类型(`order_type`)─────────────────────────────────────────────
/** 入库单类型 → 文案(与 new3 `availableFields` 的 `order_type` 选项对齐)
*
* ⚠️ 表 enum(`wms_entry_order.order_type`)= SCRK/LYRK/CCRK/CGRK/DBRK/QTRK/B2BRK/XNRK/SHRK;
* 比 new3 选项表多一个 `SHRK`(收货入库,取自 new3 `storage/log-config.ts`),
* 少 new3 里没实际使用的 `PDRK` / `THRK`(保留兼容,未知值会原样显示)
*/
export const ENTRY_ORDER_TYPE_TEXT: Record<string, string> = {
CGRK: '采购入库',
THRK: '退货入库',
SHRK: '收货入库',
QTRK: '其他入库',
PDRK: '盘点入库',
SCRK: '生产入库',
LYRK: '领用入库',
CCRK: '拆解入库',
DBRK: '调拨入库',
B2BRK: 'B2B入库',
XNRK: '虚拟入库'
}
/** 入库类型文案:未知值原样显示 */
export function readOrderTypeText(type?: string): string {
if (!type) return '—'
return ENTRY_ORDER_TYPE_TEXT[type] || type
}
// ── 数据来源(`source_type`)──────────────────────────────────────────────
/** 数据来源 → 文案(与 new3 `availableFields` 的 `source_type` 选项对齐) */
export const ENTRY_SOURCE_TYPE_TEXT: Record<string, string> = {
QM: '奇门',
API: '接口',
WMS: '系统'
}
/** 数据来源 → 主题色(对齐 new3 列表模板:QM warning / WMS primary / 其它 success) */
export const ENTRY_SOURCE_TYPE_COLOR: Record<string, string> = {
QM: '#ff9900',
WMS: '#2979ff',
API: '#19be6b'
}
/** 数据来源文案:未知值原样显示 */
export function readSourceTypeText(type?: string): string {
if (!type) return '—'
return ENTRY_SOURCE_TYPE_TEXT[type] || type
}
/** 数据来源颜色 */
export function readSourceTypeColor(type?: string): string {
if (!type) return '#909399'
return ENTRY_SOURCE_TYPE_COLOR[type] || '#19be6b'
}
// ── 入库(同步)状态(`sync_status`)──────────────────────────────────────
/** 入库状态 → 文案(与 new3 `availableFields` 的 `sync_status` 选项对齐) */
export const ENTRY_SYNC_STATUS_TEXT: Record<string, string> = {
PENDING: '待推送',
SYNCING: '推送中',
SUCCESS: '成功',
FAIL: '失败',
FAILED: '失败'
}
/** 入库状态 → 主题色(对齐 new3 `getSyncStatusType`) */
export const ENTRY_SYNC_STATUS_COLOR: Record<string, string> = {
PENDING: '#909399', // info
SYNCING: '#2979ff', // primary
SUCCESS: '#19be6b', // success
FAIL: '#fa3534', // danger
FAILED: '#fa3534' // danger
}
/** 入库状态文案:未知值原样显示 */
export function readSyncStatusText(status?: string): string {
if (!status) return '—'
const upper = String(status).toUpperCase()
return ENTRY_SYNC_STATUS_TEXT[upper] || status
}
/** 入库状态颜色 */
export function readSyncStatusColor(status?: string): string {
if (!status) return '#909399'
const upper = String(status).toUpperCase()
return ENTRY_SYNC_STATUS_COLOR[upper] || '#909399'
}
/** 入库状态选项(筛选用,含「全部」) */
export const ENTRY_SYNC_STATUS_OPTIONS: Array<{ value: string; label: string }> = [
{ value: '', label: '全部' },
{ value: 'PENDING', label: '待推送' },
{ value: 'SYNCING', label: '推送中' },
{ value: 'SUCCESS', label: '成功' },
{ value: 'FAIL', label: '失败' }
]
// ── 收货绑定(`hasReceiving`)─────────────────────────────────────────────
/** 收货绑定文案(对齐 new3 列表模板:「已绑定」success / 「未绑定」info) */
export function readReceivingBindText(hasReceiving?: boolean): string {
return hasReceiving ? '已绑定' : '未绑定'
}
/** 收货绑定颜色 */
export function readReceivingBindColor(hasReceiving?: boolean): string {
return hasReceiving ? '#19be6b' : '#909399'
}
// ── 展示文本 ──────────────────────────────────────────────────────────────
/**
* 数量概览文案:`3 种 · 应收 120 / 实收 100 件`
*
* 缺失的字段直接省略(不显示 `0`,避免把「后端没给」误读成「没有货」);
* 应收与实收都有时才并列展示
*/
export function readQuantityText(item: EntryItem | undefined | null): string {
const parts: string[] = []
if (isFilled(item?.total_order_lines)) parts.push(`${Number(item?.total_order_lines)} 种`)
const hasPlan = isFilled(item?.total_quantity)
const hasDone = isFilled(item?.received_quantity)
if (hasPlan && hasDone) parts.push(`应收 ${Number(item?.total_quantity)} / 实收 ${Number(item?.received_quantity)} 件`)
else if (hasPlan) parts.push(`应收 ${Number(item?.total_quantity)} 件`)
else if (hasDone) parts.push(`实收 ${Number(item?.received_quantity)} 件`)
return parts.length ? parts.join(' · ') : '—'
}
/**
* 时间文案:统一为 `YYYY-MM-DD HH:mm:ss`
*
* new3 侧用 `formatTime()` 现算(`order_create_time` 是 `datetime`,网关可能下发
* ISO 串或 `YYYY-MM-DD HH:mm:ss`)。已经是对口格式就直接用,避免时区/解析差异改坏原值
*/
export function readDateTimeText(value: unknown): string {
if (value === undefined || value === null || value === '') return '—'
const text = String(value).trim()
// 已经是 `YYYY-MM-DD HH:mm:ss`(后端原值)→ 原样返回
if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(text)) return text
const date = new Date(text)
if (Number.isNaN(date.getTime())) return text
const pad = (num: number): string => String(num).padStart(2, '0')
return (
`${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ` +
`${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
)
}
// ── 单张入库单详情(`storage.entry.getStore`,货主侧)──────────────────────
/**
* 入库明细行
*
* 后端返回的是**嵌套结构**(`items[].stock.{item_code,item_name,sku_property,barcodes[],quantity}`),
* 这里拍平成展示字段 —— 映射规则与 new3 `views/storage/entry/component/entrydetail.vue`
* 的 `loadEntryDetail()` **完全一致**(含 `planned ?? count`、`completed ?? received_quantity` 兜底)。
*/
export interface EntryDetailItem {
id?: number
/** SKU(`item.stock_id ?? item.stock.id`) */
stock_id?: number
/** 商品编码(`item.stock.item_code`) */
warehouse_item_code?: string
/** 商品名称(`item.stock.item_name`) */
warehouse_item_name?: string
/** 规格(`item.stock.sku_property`) */
warehouse_item_spec?: string
/** 主条码(`item.stock.barcodes[0].barcode`) */
barcode?: string
/** 应收数量(`item.planned ?? item.count`) */
count?: number
/** 实收数量(`item.completed ?? item.received_quantity`) */
received_quantity?: number
/** 库存数量(`item.stock.quantity`,可能为 null) */
warehouse_quantity?: number | null
[key: string]: any
}
/** 详情响应体 `data`;`entryOrder` 也可能直接在**顶层**(与 `wechat.getMyLoginCode` 同类容错) */
export interface EntryDetailPayload {
entryOrder?: Record<string, any>
items?: any[]
total_quantity?: number
received_quantity?: number
[key: string]: any
}
/**
* 单张入库单详情(**货主侧**)
*
* 与 new3 `views/storage/entry/component/entrydetail.vue` 在 `store-mode` 下调用的是同一个方法
* (仓库侧是 `storage.entry.get`,⚠️ 别混)。入参就一个 `id`。
*/
export function fetchStoreEntryDetail(
id: number | string
): Promise<BizResponse<EntryDetailPayload>> {
return request<EntryDetailPayload>({
url: SYSTEM_URL,
method: 'POST',
params: gatewayParams('storage.entry.getStore'),
data: { id: Number(id) },
// 需要登录:未登录时不发请求,直接弹登录抽屉
auth: true
})
}
/** 单头:优先 `data.entryOrder`,兼容顶层 `entryOrder` */
export function readEntryOrder(
payload: EntryDetailPayload | undefined | null
): Record<string, any> {
return payload?.entryOrder || {}
}
/**
* 取原始明细数组
*
* `data.items` 是 new3 读取的路径(权威);`data.entryOrder.items` 作为兜底,
* 防止后端把 items 挪进 entryOrder(`items: []` 且 entryOrder 里有时也要能取到)
*/
function pickRawItems(payload: EntryDetailPayload | undefined | null): any[] {
const topLevel = payload?.items
if (Array.isArray(topLevel) && topLevel.length) return topLevel
const nested = payload?.entryOrder?.items
if (Array.isArray(nested)) return nested
return Array.isArray(topLevel) ? topLevel : []
}
/**
* 入库明细:拍平 `items[].stock.*`(映射规则见 `EntryDetailItem` 注释)
*
* 取值优先级:`data.items`(new3 读取的路径,权威)→ `data.entryOrder.items`(兜底,防后端换位)。
* ⚠️ 注意 `items: []` 时也要走兜底 —— 不能因为顶层是空数组就判定「没有明细」
*/
export function normalizeEntryDetailItems(
payload: EntryDetailPayload | undefined | null
): EntryDetailItem[] {
return pickRawItems(payload).map((raw: any) => {
const stock = raw?.stock || {}
const barcodes = Array.isArray(stock.barcodes) ? stock.barcodes : []
const planned = raw?.planned ?? raw?.count
const completed = raw?.completed ?? raw?.received_quantity
return {
...raw,
stock_id: raw?.stock_id ?? stock.id,
warehouse_item_code: stock.item_code || '',
warehouse_item_name: stock.item_name || '',
warehouse_item_spec: stock.sku_property || '',
barcode: barcodes.length ? barcodes[0]?.barcode || '' : '',
count: Number(planned) || 0,
received_quantity: Number(completed) || 0,
warehouse_quantity: stock.quantity ?? null
}
})
}

View File

@ -0,0 +1,392 @@
<template>
<!--
⚠️ `bg-color` 必须显式给:`up-popup` 默认背景色取自 uview 主题变量 `--up-card-bg-color`,
而它在 `@media (prefers-color-scheme: dark)` 下是 `#1c1c1e`(近黑)
→ 本组件文字色是写死的浅色主题色,暗色下会变成「深底 + 深字」整块看不清。
-->
<up-popup
:show="show"
mode="bottom"
:round="16"
bg-color="#ffffff"
@close="emit('close')"
>
<view class="entry-detail">
<view class="entry-detail__title">入库单详情</view>
<scroll-view class="entry-detail__body" scroll-y>
<!-- 单头:直接用**列表行**渲染(点开即有、不用等接口),字段与列表卡片一致 -->
<template v-if="row">
<view class="entry-detail__head">
<text class="entry-detail__no">{{ row.entry_order_code || '—' }}</text>
</view>
<!-- 订单状态:对齐 new3 详情面板的「订单状态」字段,做成带标签的一行
(原先放在标题右侧做无标签彩色文字,看不出是哪个字段) -->
<view class="kv">
<text class="kv__k">订单状态</text>
<text class="kv__v" :style="{ color: readStatusColor(row.order_status) }">
{{ readStatusText(row.order_status) }}
</text>
</view>
<view class="kv">
<text class="kv__k">仓库</text>
<text class="kv__v">{{ row.warehouse_name || '—' }}</text>
</view>
<view class="kv">
<text class="kv__k">入库类型</text>
<text class="kv__v">{{ readOrderTypeText(row.order_type) }}</text>
</view>
<view class="kv">
<text class="kv__k">数据来源</text>
<text class="kv__v">{{ readSourceTypeText(row.source_type) }}</text>
</view>
<view class="kv">
<text class="kv__k">收货绑定</text>
<text class="kv__v">{{ readReceivingBindText(row.hasReceiving) }}</text>
</view>
<view class="kv">
<text class="kv__k">入库状态</text>
<text class="kv__v">{{ readSyncStatusText(row.sync_status) }}</text>
</view>
<view class="kv">
<text class="kv__k">商品</text>
<text class="kv__v">{{ readQuantityText(row) }}</text>
</view>
<view class="kv">
<text class="kv__k">单据创建时间</text>
<text class="kv__v">{{ readDateTimeText(row.order_create_time) }}</text>
</view>
</template>
<view class="entry-detail__section">
<text class="entry-detail__section-title">入库明细</text>
<!-- 把条数直接暴露出来:万一「只显示第一条」,一眼能分辨是接口只返回一条,还是渲染丢行 -->
<text v-if="items.length" class="entry-detail__section-count">共 {{ items.length }} 条</text>
</view>
<!-- 明细:来自 storage.entry.getStore(失败只影响这一块,不挡单头) -->
<view v-if="loading" class="entry-detail__tip">加载中…</view>
<view v-else-if="error" class="entry-detail__tip entry-detail__tip--link" @click="load">
{{ error }},点击重试
</view>
<view v-else-if="!items.length" class="entry-detail__tip">暂无入库明细</view>
<template v-else>
<!--
⚠️ key 必须**无条件唯一**:`stock_id` 会重复(同一 SKU 多行,实测 7 条明细只对应 2 个 SKU),
若接口没下发 `items[].id`,直接用 `stock_id` 当 key 会撞 —— **微信在 wx:key 重复时会丢行**
-->
<view
v-for="(item, index) in items"
:key="rowKey(item, index)"
class="item"
>
<view class="item__head">
<text class="item__name">{{ item.warehouse_item_name || '未命名商品' }}</text>
<text class="item__qty">
应收 {{ item.count ?? 0 }} / 实收 {{ item.received_quantity ?? 0 }}
</text>
</view>
<view class="item__meta">
<text class="item__meta-item">编码 {{ item.warehouse_item_code || '—' }}</text>
<text class="item__meta-item">
SKU {{ isFilled(item.stock_id) ? item.stock_id : '—' }}
</text>
<text class="item__meta-item">条码 {{ item.barcode || '—' }}</text>
<text class="item__meta-item">
库存 {{ isFilled(item.warehouse_quantity) ? item.warehouse_quantity : '—' }}
</text>
</view>
</view>
</template>
</scroll-view>
<view class="entry-detail__close" @click="emit('close')">关闭</view>
</view>
</up-popup>
</template>
<script setup lang="ts">
/**
* 入库单详情底部弹层
*
* 数据分两段来源(刻意的,不是偷懒):
* - **单头**用外面传进来的**列表行**(`row`)渲染 → 点开即有、不闪、不白屏;
* 列表行的字段也最全(仓库 / 类型 / 来源 / 入库状态这些 `getStore` 的 `entryOrder` 并不都有)
* - **入库明细**只能从 `storage.entry.getStore` 拿(列表接口不下发明细)→ 打开时才请求,
* 单独处理 加载中 / 失败重试 / 空态
*
* 明细只保留移动端必要的 4 个维度:商品编码 / 名称 / SKU / 条码 / 应收·实收 / 库存
*(与 new3 Web 明细表相比去掉了「入库单号、货主」(单头已有)和「批次管理、效期管理」标记)。
*
* 用法:
* ```vue
* <entry-detail-popup :show="detailVisible" :row="detailRow" @close="detailVisible = false" />
* ```
*/
import { ref, watch } from 'vue'
import {
fetchStoreEntryDetail,
normalizeEntryDetailItems,
readDateTimeText,
readOrderTypeText,
readQuantityText,
readReceivingBindText,
readSourceTypeText,
readStatusColor,
readStatusText,
readSyncStatusText
} from '@/api/storage/entry'
import type { EntryDetailItem, EntryItem } from '@/api/storage/entry'
const props = withDefaults(
defineProps<{
/** 是否显示 */
show: boolean
/** 当前点开的入库单(列表行):单头用它渲染,`row.id` 用来拉明细 */
row?: EntryItem | null
}>(),
{
row: null
}
)
const emit = defineEmits<{
(e: 'close'): void
}>()
const loading = ref(false)
const error = ref('')
const items = ref<EntryDetailItem[]>([])
const isFilled = (value: unknown): boolean =>
value !== undefined && value !== null && value !== ''
/**
* 明细行 key
*
* **必须唯一**:`stock_id` 在同一个单里会重复(同一 SKU 拆多行),
* 而微信在 `wx:key` 重复时会丢行 ⇒ 统一用「id/stock_id + 序号」兜底
*/
const rowKey = (item: EntryDetailItem, index: number): string =>
`${item?.id ?? item?.stock_id ?? 'row'}-${index}`
/** 拉明细(`storage.entry.getStore`);失败只影响明细区 */
async function load(): Promise<void> {
const id = props.row?.id
if (!id) {
items.value = []
error.value = ''
return
}
loading.value = true
error.value = ''
try {
const res = await fetchStoreEntryDetail(id)
items.value = normalizeEntryDetailItems(res?.data)
} catch {
// 失败提示由 request 层统一 toast;这里给明细区一个可点击重试的提示
error.value = '明细加载失败'
items.value = []
} finally {
loading.value = false
}
}
// 打开时拉一次
watch(
() => props.show,
(show) => {
if (show) load()
}
)
// 弹层已开着、又点了另一张单子(`show` 不变)→ 也要重拉
watch(
() => props.row?.id,
() => {
if (props.show) load()
}
)
</script>
<style lang="scss" scoped>
.entry-detail {
/*
* 纵向 flex + 高度上限:`up-popup` 的容器是 `position: fixed; bottom: 0` 且**没有高度约束**,
* 若不给上限,明细一多弹层会向上超出屏幕(标题/单头看不见)。
* 上限 76vh 需给「标题 + 关闭 + 底部安全区」留出余量。
*/
display: flex;
flex-direction: column;
width: 100%;
box-sizing: border-box;
max-height: 76vh;
/* 背景色兜底:与 `bg-color="#ffffff"` 双保险(否则暗色主题下是深底深字) */
background-color: #ffffff;
/*
* 横向内边距放在**外层容器**而不是里面的 scroll-view:
* 微信的 `scroll-view` 上的 `padding` 只对左侧生效(内容宽度 = 宽度 − 左内边距),
* 右对齐的值会被挤到弹层右缘外而被裁掉 —— 2026-10-02 真机截图实测踩到。
*/
padding: 24rpx 32rpx 0;
&__title {
flex-shrink: 0;
padding-bottom: 16rpx;
font-size: 30rpx;
font-weight: 600;
color: #303133;
}
&__body {
/*
* 明细区吃掉剩余高度并可滚动:`scroll-view` 必须有**确定高度**才滚得动,
* flex 布局给出确定高度,再用 max-height 兜底(内容短时不会被拉伸)。
* ⚠️ 这里**不能加 padding**(原因见 .entry-detail 里的注释);
* 显式 `width: 100%` 保证 scroll-view 不会被内容撑宽
*/
flex: 1 1 auto;
width: 100%;
min-height: 0;
max-height: 56vh;
}
&__head {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 16rpx;
border-bottom: 1rpx solid #f2f3f5;
}
&__no {
flex: 1;
min-width: 0;
margin-right: 16rpx;
font-size: 30rpx;
font-weight: 600;
color: #303133;
/*
* ⚠️ 不要用 nowrap + ellipsis:单号的长度不可控,一旦折行算得不对
* (弹层内容盒被长文本撑宽)文字会直接顶出屏幕且被裁掉。→ 允许折行 + 断行保护
*/
word-break: break-all;
}
&__section {
display: flex;
align-items: baseline;
justify-content: space-between;
margin-top: 24rpx;
padding-bottom: 12rpx;
font-size: 26rpx;
font-weight: 600;
color: #303133;
border-bottom: 1rpx solid #f2f3f5;
}
&__section-count {
font-size: 24rpx;
font-weight: 400;
color: #909399;
}
&__tip {
padding: 48rpx 0;
text-align: center;
font-size: 26rpx;
color: #909399;
&--link {
color: #2979ff;
}
}
&__close {
flex-shrink: 0;
/* 抵消外层左右内边距,让分隔线与关闭栏通栏 */
margin: 0 -32rpx;
padding: 24rpx;
text-align: center;
font-size: 28rpx;
color: #606266;
border-top: 1rpx solid #f2f3f5;
}
}
/* 单头键值行(与列表卡片同款排版) */
.kv {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 14rpx;
font-size: 26rpx;
&__k {
flex-shrink: 0;
color: #909399;
}
&__v {
flex: 1;
min-width: 0;
margin-left: 16rpx;
text-align: right;
color: #606266;
/*
* ⚠️ 不要用 nowrap + ellipsis:仓库名 / 时间等值会变长,
* 右对齐 + 不换行 = 文字直接顶出屏幕右边并被裁掉(本次真实踩到)
* → 允许折行,长值分多行完整展示
*/
word-break: break-all;
}
}
/* 明细行 */
.item {
padding: 20rpx 0;
border-bottom: 1rpx solid #f7f8fa;
&__head {
display: flex;
align-items: center;
justify-content: space-between;
}
&__name {
flex: 1;
min-width: 0;
margin-right: 16rpx;
font-size: 28rpx;
font-weight: 500;
color: #303133;
/* 商品名称可能很长:允许折行(不截断),并允许长英文/数字串断行 */
word-break: break-all;
}
&__qty {
flex-shrink: 0;
font-size: 24rpx;
color: #606266;
}
&__meta {
display: flex;
flex-wrap: wrap;
margin-top: 8rpx;
}
&__meta-item {
/* 编码 / SKU / 条码 可能是很长的数字串:允许它占满一行并断行,否则会撑破弹层 */
max-width: 100%;
margin: 4rpx 24rpx 0 0;
font-size: 24rpx;
color: #909399;
word-break: break-all;
}
}
</style>

View File

@ -87,6 +87,24 @@
"backgroundTextStyle": "dark",
"onReachBottomDistance": 80
}
},
{
"path": "external-inventory/entry",
"style": {
"navigationBarTitleText": "入库单",
"enablePullDownRefresh": true,
"backgroundTextStyle": "dark",
"onReachBottomDistance": 80
}
},
{
"path": "external-inventory/productflow",
"style": {
"navigationBarTitleText": "商品流水",
"enablePullDownRefresh": true,
"backgroundTextStyle": "dark",
"onReachBottomDistance": 80
}
}
]
}

View File

@ -0,0 +1,638 @@
<template>
<view class="page">
<!-- required 未登录:页内「请先登录」+ 去登录,**不自动跳转** -->
<auth-gate auth="required">
<template #default>
<!-- 筛选区(吸顶):入库单号 + 搜索;订单状态 / 入库状态 / 仓库用胶囊按钮唤起底部选择器 -->
<view class="filter">
<view class="filter__row">
<view class="filter__input">
<up-input
v-model="form.keyword"
color="#303133"
placeholder-style="color: #c0c4cc"
placeholder="搜索入库单号"
prefix-icon="search"
border="none"
clearable
confirm-type="search"
@confirm="onSearch"
></up-input>
</view>
<up-button
type="primary"
shape="circle"
size="small"
text="搜索"
@click="onSearch"
></up-button>
</view>
<view class="filter__row filter__row--chips">
<view
class="chip"
:class="{ 'chip--active': !!form.order_status }"
@click="openPicker('orderStatus')"
>
<text class="chip__text">{{ labelOf('orderStatus') }}</text>
<up-icon
name="arrow-down"
size="12"
:color="form.order_status ? '#2979ff' : '#909399'"
></up-icon>
</view>
<view
class="chip"
:class="{ 'chip--active': !!form.sync_status }"
@click="openPicker('syncStatus')"
>
<text class="chip__text">{{ labelOf('syncStatus') }}</text>
<up-icon
name="arrow-down"
size="12"
:color="form.sync_status ? '#2979ff' : '#909399'"
></up-icon>
</view>
<view
class="chip"
:class="{ 'chip--active': isFilled(form.warehouse_id) }"
@click="openPicker('warehouse')"
>
<text class="chip__text">{{ labelOf('warehouse') }}</text>
<up-icon
name="arrow-down"
size="12"
:color="isFilled(form.warehouse_id) ? '#2979ff' : '#909399'"
></up-icon>
</view>
<view v-if="hasFilter" class="filter__reset" @click="onReset">重置</view>
</view>
</view>
<!-- 首屏加载(翻页时保留旧列表,只把页码控件置为「加载中…」,避免整屏闪动) -->
<view v-if="loading && !list.length" class="loading">
<up-loading-icon mode="circle" size="18" text="加载中"></up-loading-icon>
</view>
<template v-else-if="list.length">
<!-- 入库单卡片:单号(头部)+ 订单状态 / 仓库 / 商品数量 / 入库类型 / 数据来源 /
收货绑定 / 入库状态 / 单据编号 / 单据创建时间(备注有才显示);
**点卡片看详情**(storage.entry.getStore) -->
<view
v-for="(item, index) in list"
:key="item.id ?? item.entry_order_code ?? index"
class="order"
hover-class="order--hover"
@click="openDetail(item)"
>
<view class="order__head">
<text class="order__no">{{ item.entry_order_code || '—' }}</text>
<up-icon
name="arrow-right"
size="14"
color="#c0c4cc"
class="order__arrow"
></up-icon>
</view>
<!-- 订单状态:与 new3 列表的「订单状态」列同源(order_status)。
原先只在右上角做成无标签的彩色文字,看不出是哪个字段 → 改为带标签的独立一行 -->
<view class="order__row">
<text class="order__label">订单状态</text>
<text class="order__value" :style="{ color: statusColorOf(item) }">
{{ statusTextOf(item) }}
</text>
</view>
<view class="order__row">
<text class="order__label">仓库</text>
<text class="order__value">{{ item.warehouse_name || '—' }}</text>
</view>
<view class="order__row">
<text class="order__label">商品</text>
<text class="order__value">{{ quantityTextOf(item) }}</text>
</view>
<view class="order__row">
<text class="order__label">入库类型</text>
<text class="order__value">{{ orderTypeTextOf(item) }}</text>
</view>
<view class="order__row">
<text class="order__label">数据来源</text>
<text class="order__value" :style="{ color: sourceTypeColorOf(item) }">
{{ sourceTypeTextOf(item) }}
</text>
</view>
<view class="order__row">
<text class="order__label">收货绑定</text>
<text class="order__value" :style="{ color: receivingBindColorOf(item) }">
{{ receivingBindTextOf(item) }}
</text>
</view>
<view class="order__row">
<text class="order__label">入库状态</text>
<text class="order__value" :style="{ color: syncStatusColorOf(item) }">
{{ syncStatusTextOf(item) }}
</text>
</view>
<view v-if="item.purchase_order_code" class="order__row">
<text class="order__label">单据编号</text>
<text class="order__value">{{ item.purchase_order_code }}</text>
</view>
<view class="order__row">
<text class="order__label">单据创建时间</text>
<text class="order__value">{{ orderCreateTimeOf(item) }}</text>
</view>
<view v-if="item.remark" class="order__row">
<text class="order__label">备注</text>
<text class="order__value">{{ item.remark }}</text>
</view>
</view>
</template>
<!-- 空态:无数据 / 加载失败(有筛选条件时文案不同) -->
<empty-state v-else v-bind="emptyStateProps" @retry="loadPage(1)"></empty-state>
</template>
</auth-gate>
<!-- 分页器(固定底部,公共组件;每页条数由 ENTRY_PAGE_SIZE 固定,不可改) -->
<page-pager
v-if="list.length"
:total="total"
:page="pageNo"
:page-size="ENTRY_PAGE_SIZE"
:loading="loading"
unit="张入库单"
@change="goPage"
></page-pager>
<!-- 选择器(订单状态 / 入库状态 / 仓库):底部弹层,选项多时组件自带名称搜索 -->
<option-picker
:show="pickerVisible"
:title="pickerTitle"
:options="pickerOptions"
:value="pickerValue"
:loading="pickerLoading"
@select="chooseOption"
@close="closePicker"
></option-picker>
<!-- 入库单详情(点卡片打开):单头用列表行渲染,明细走 storage.entry.getStore -->
<entry-detail-popup
:show="detailVisible"
:row="detailRow"
@close="detailVisible = false"
></entry-detail-popup>
<!-- 登录抽屉:点「去登录」或碰需要登录的接口时就地弹出(不跳页) -->
<auth-modal></auth-modal>
</view>
</template>
<script setup lang="ts">
/**
* 入库单(列表)
*
* 接口与 new3 Web 端 `views/storage/entry_owner/index.vue`(**货主侧**)**同源**
* (`storage.entry.listStore`,见 `api/storage/entry.ts`)。
* ⚠️ 同模块另一个 `storage.entry.list` 是**仓库侧**,别拿错。
*
* 展示字段取自 new3 `entry-config.ts` 的 `entryStoreColums`(货主侧列),并按移动端裁剪:
* 入库单号 / 订单状态 / 仓库 / 商品种类数·应收·实收 / 入库类型 / 数据来源 / 收货绑定 /
* 入库状态 / 单据编号 / 单据创建时间 / 备注。
*
* 移动端取舍(与「外仓商品」「收货单」「库存报表」一致):
* - 筛选只保留**入库单号 + 订单状态 + 入库状态 + 仓库**(`entry_order_code` / `order_status` /
* `sync_status` / `warehouse_id`);Web 的货主、供货商、物流、时间区间等筛选项不做
* - 每页固定 50 条不可改,分页用固定底部的 `components/page-pager`,**整页替换**不做追加
* - Web 的排序、列配置、导出、详情面板(入库明细 / 绑定关系 / 入库记录 / 操作日志)不做,
* 只保留**点卡片看入库明细**这一项(`storage.entry.getStore`,见 `components/entry-detail-popup`)
*
* ⚠️ 三条必须保持一致,改任意一处都要同步另两处(`npm run check:pages` 会校验):
* 1. 本文件的物理路径 `pagesA/external-inventory/entry`
* 2. `src/pages.json` 里 `subPackages[pagesA]` 的注册
* 3. `src/router/pages.ts` 的 `PAGE_REGISTRY`(key = 后端 `wms_permission.path` = `/external-inventory/entry`)
*/
import { computed, reactive, ref, watch } from 'vue'
import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app'
import { usePageAuth } from '@/composables/usePageAuth'
import AuthModal from '@/components/auth-modal/auth-modal.vue'
import EntryDetailPopup from '@/components/entry-detail-popup/entry-detail-popup.vue'
import OptionPicker from '@/components/option-picker/option-picker.vue'
import PagePager from '@/components/page-pager/page-pager.vue'
import { fetchWarehouseOptions } from '@/api/index/index'
import type { SelectOption } from '@/api/index/index'
import {
ENTRY_ORDER_STATUS_OPTIONS,
ENTRY_PAGE_SIZE,
ENTRY_SYNC_STATUS_OPTIONS,
fetchStoreEntryList,
readDateTimeText,
readOrderTypeText,
readQuantityText,
readReceivingBindColor,
readReceivingBindText,
readSourceTypeColor,
readSourceTypeText,
readStatusColor,
readStatusText,
readSyncStatusColor,
readSyncStatusText,
readTotal
} from '@/api/storage/entry'
import type { EntryItem } from '@/api/storage/entry'
/** 本页是 required:未登录时只做页内提示,不自动跳登录 */
const { isLogin } = usePageAuth('required')
/** 筛选条件(入库单号回车 / 点搜索才生效,避免每输入一个字就请求;胶囊点选立即生效) */
const form = reactive({
keyword: '',
order_status: '',
sync_status: '',
warehouse_id: '' as string | number
})
const list = ref<EntryItem[]>([])
/** 后端总数(「共 N 条」与总页数都靠它) */
const total = ref(0)
/** 当前页码(1-based) */
const pageNo = ref(1)
const loading = ref(false)
const isFilled = (value: unknown): boolean =>
value !== undefined && value !== null && value !== ''
const hasFilter = computed(
() =>
!!form.keyword.trim() ||
!!form.order_status ||
!!form.sync_status ||
isFilled(form.warehouse_id)
)
const statusTextOf = (item: EntryItem): string => readStatusText(item?.order_status)
const statusColorOf = (item: EntryItem): string => readStatusColor(item?.order_status)
const orderTypeTextOf = (item: EntryItem): string => readOrderTypeText(item?.order_type)
const sourceTypeTextOf = (item: EntryItem): string => readSourceTypeText(item?.source_type)
const sourceTypeColorOf = (item: EntryItem): string => readSourceTypeColor(item?.source_type)
const receivingBindTextOf = (item: EntryItem): string => readReceivingBindText(item?.hasReceiving)
const receivingBindColorOf = (item: EntryItem): string => readReceivingBindColor(item?.hasReceiving)
const syncStatusTextOf = (item: EntryItem): string => readSyncStatusText(item?.sync_status)
const syncStatusColorOf = (item: EntryItem): string => readSyncStatusColor(item?.sync_status)
const quantityTextOf = (item: EntryItem): string => readQuantityText(item)
const orderCreateTimeOf = (item: EntryItem): string => readDateTimeText(item?.order_create_time)
/** 总页数(按固定每页条数算;总数 0 时也算 1 页,避免出现「第 1/0 页」) */
const pageCount = computed(() => Math.max(1, Math.ceil(total.value / ENTRY_PAGE_SIZE)))
/** 翻页后回到顶部(否则新一页会从上一页的滚动位置继续,看着像没动) */
const scrollToTop = (): void => {
uni.pageScrollTo({ scrollTop: 0, duration: 0 })
}
/**
* 拉取指定页(**整页替换**,不做追加 —— 分页由底部页码控件驱动)
* @param target 目标页码(1-based),越界自动夹到 `[1, pageCount]`
*/
const loadPage = async (target = pageNo.value): Promise<void> => {
if (!isLogin.value) return
if (loading.value) return
// 未知总数时(首屏)先不夹上界,拿到 total 后页码自会收敛
const max = total.value > 0 ? pageCount.value : Number.MAX_SAFE_INTEGER
const page = Math.min(Math.max(1, Math.floor(target) || 1), max)
loading.value = true
try {
const res = await fetchStoreEntryList({
page,
pageSize: ENTRY_PAGE_SIZE,
keyword: form.keyword,
order_status: form.order_status,
sync_status: form.sync_status,
warehouse_id: form.warehouse_id
})
const payload = res?.data
list.value = payload?.list || []
total.value = readTotal(payload)
pageNo.value = page
} catch {
// 失败提示由 request 层统一 toast;这里保留原页与旧数据(不把用户用到空白页)
} finally {
loading.value = false
uni.stopPullDownRefresh()
}
}
/** 切页(页容器按钮用):夹取范围、已在目标页则不动作 */
const goPage = (target: number): void => {
if (loading.value) return
const next = Math.min(Math.max(1, Math.floor(target) || 1), pageCount.value)
if (next === pageNo.value) return
loadPage(next).then(scrollToTop)
}
/** 筛选变了必须重拉第 1 页(不能因为「还在第 1 页」就跳过) */
const reloadFirstPage = (): void => {
loadPage(1).then(scrollToTop)
}
const onSearch = (): void => {
reloadFirstPage()
}
const onReset = (): void => {
form.keyword = ''
form.order_status = ''
form.sync_status = ''
form.warehouse_id = ''
reloadFirstPage()
}
/** 下拉刷新:重拉当前页;若当前页已越界(总数变少)则回到第 1 页 */
const refresh = async (): Promise<void> => {
await loadPage(pageNo.value)
if (!list.value.length && pageNo.value > 1) await loadPage(1)
}
// ── 订单状态 / 入库状态 / 仓库 选择器(同一个底部弹层组件复用)──
type PickerKind = 'orderStatus' | 'syncStatus' | 'warehouse'
const pickerVisible = ref(false)
const pickerKind = ref<PickerKind>('orderStatus')
const pickerLoading = ref(false)
const warehouseOptions = ref<SelectOption[]>([])
const PICKER_TITLES: Record<PickerKind, string> = {
orderStatus: '选择订单状态',
syncStatus: '选择入库状态',
warehouse: '选择仓库'
}
/**
* 胶囊上显示的名称
*
* 未选中时显示**筛选项名**(订单状态 / 入库状态 / 仓库),
* 选中后显示具体值(待入库 / 成功 / 仓库名)
*/
const PICKER_NAMES: Record<PickerKind, string> = {
orderStatus: '订单状态',
syncStatus: '入库状态',
warehouse: '仓库'
}
/** 维度 → 表单字段名(只在这里维护一次映射) */
const FIELD_OF: Record<PickerKind, 'order_status' | 'sync_status' | 'warehouse_id'> = {
orderStatus: 'order_status',
syncStatus: 'sync_status',
warehouse: 'warehouse_id'
}
/** 本地常量选项(仓库选项来自接口,不在这里) */
const LOCAL_OPTIONS: Record<Exclude<PickerKind, 'warehouse'>, SelectOption[]> = {
orderStatus: ENTRY_ORDER_STATUS_OPTIONS,
syncStatus: ENTRY_SYNC_STATUS_OPTIONS
}
/** 某个维度当前选中的值 */
const valueOf = (kind: PickerKind): string | number => form[FIELD_OF[kind]]
const pickerTitle = computed(() => PICKER_TITLES[pickerKind.value])
const pickerValue = computed(() => valueOf(pickerKind.value))
/** 弹层选项:仓库来自接口(含「全部仓库」),两个状态是本地常量;「名称搜索」在 option-picker 内部 */
const pickerOptions = computed<SelectOption[]>(() => {
if (pickerKind.value === 'warehouse') {
return [{ value: '', label: '全部仓库' }, ...warehouseOptions.value]
}
return LOCAL_OPTIONS[pickerKind.value as Exclude<PickerKind, 'warehouse'>]
})
/**
* 胶囊文案:未选中 = 筛选项名,选中 = 选项文案(找不到就原样显示值)
*
* 文案由「当前值 + 选项表」算出来,不再额外维护一份 label 状态,
* 重置时也就不会漏掉某个胶囊
*/
const labelOf = (kind: PickerKind): string => {
const value = valueOf(kind)
if (!isFilled(value)) return PICKER_NAMES[kind]
const options = kind === 'warehouse' ? warehouseOptions.value : LOCAL_OPTIONS[kind]
return options.find((option) => String(option.value) === String(value))?.label || String(value)
}
/** 仓库选项只有用到时才拉(拉过就缓存,不重复请求) */
const ensureWarehouseOptions = async (): Promise<void> => {
if (warehouseOptions.value.length) return
pickerLoading.value = true
try {
warehouseOptions.value = await fetchWarehouseOptions()
} catch {
// 失败提示由 request 层统一 toast;这里保持空列表(弹层里只剩「全部仓库」)
} finally {
pickerLoading.value = false
}
}
const openPicker = (kind: PickerKind): void => {
pickerKind.value = kind
pickerVisible.value = true
if (kind === 'warehouse') ensureWarehouseOptions()
}
const closePicker = (): void => {
pickerVisible.value = false
}
const chooseOption = (option: SelectOption): void => {
// 表单各字段类型不同(string / string | number),用索引赋值避免联合类型收窄报错
;(form as Record<string, unknown>)[FIELD_OF[pickerKind.value]] = option.value
closePicker()
reloadFirstPage()
}
// ── 详情弹层(点卡片打开;明细走 storage.entry.getStore)──
const detailVisible = ref(false)
const detailRow = ref<EntryItem | null>(null)
const openDetail = (item: EntryItem): void => {
// 先落行再开弹层:弹层打开时单头即可用(明细由弹层自己拉)
detailRow.value = item
detailVisible.value = true
}
/** 空态文案:有筛选条件时不能用「服务器出差了」这种口气 */
const emptyStateProps = computed(() =>
hasFilter.value ? { text: '没有符合条件的入库单,试试换个单号或筛选条件' } : {}
)
// ── 生命周期 ──
onLoad(() => {
loadPage(1)
})
// 未登录进来是空态(页内有登录引导);登录成功后自动拉一次
watch(isLogin, (value) => {
if (value && !list.value.length) loadPage(1)
})
// 下拉刷新:重拉当前页
onPullDownRefresh(() => {
refresh()
})
</script>
<style lang="scss" scoped>
.page {
min-height: 100vh;
background-color: #f5f6fa;
/* 给固定底部的分页器留位置(分页器现在只有一行,约 72rpx),否则最后一张卡会被盖住 */
padding-bottom: 140rpx;
}
/* 筛选区:吸顶。部分低版本基础库不支持 sticky 就退化为普通块,不影响使用 */
.filter {
position: sticky;
top: 0;
z-index: 10;
padding: 16rpx 24rpx 12rpx;
background-color: #ffffff;
border-bottom: 1rpx solid #ebeef5;
&__row {
display: flex;
align-items: center;
&--chips {
margin-top: 8rpx;
/* 筛选项变多了(订单状态 / 入库状态 / 仓库 / 重置):允许换行,否则会被挤出屏幕 */
flex-wrap: wrap;
}
}
&__input {
flex: 1;
/* flex 子项里的输入框必须允许收缩,否则长占位符会把搜索按钮挤出去 */
min-width: 0;
margin-right: 16rpx;
padding: 0 20rpx;
background-color: #f5f6fa;
border-radius: 999rpx;
}
&__reset {
padding: 8rpx 8rpx 8rpx 16rpx;
font-size: 24rpx;
color: #2979ff;
}
}
.chip {
display: flex;
align-items: center;
max-width: 320rpx;
/* 筛选项有多个 + 重置:允许换行,所以上下各留 4rpx 避免换行后贴在一起 */
margin: 4rpx 16rpx 4rpx 0;
padding: 10rpx 20rpx;
background-color: #f5f6fa;
border-radius: 999rpx;
&--active {
background-color: rgba(41, 121, 255, 0.1);
}
&__text {
margin-right: 6rpx;
font-size: 24rpx;
color: #606266;
/* 仓库名可能很长:截断而不是把筛选行撑破 */
max-width: 240rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.loading {
display: flex;
align-items: center;
justify-content: center;
padding: 96rpx 0;
}
/* 入库单卡片 */
.order {
margin: 20rpx 24rpx 0;
padding: 24rpx;
background-color: #ffffff;
border-radius: 16rpx;
/* 点按反馈(卡片可点开详情) */
&--hover {
background-color: #f7f8fa;
}
&__head {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 16rpx;
border-bottom: 1rpx solid #f2f3f5;
}
&__no {
flex: 1;
min-width: 0;
margin-right: 16rpx;
font-size: 30rpx;
font-weight: 600;
color: #303133;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
/* 详情入口箭头 */
&__arrow {
flex-shrink: 0;
margin-left: 8rpx;
}
&__row {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 14rpx;
font-size: 26rpx;
}
&__label {
flex-shrink: 0;
color: #909399;
}
&__value {
flex: 1;
min-width: 0;
margin-left: 16rpx;
text-align: right;
color: #606266;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
/* 分页器样式在 components/page-pager(多个列表页共用,勿在此重复定义) */
</style>

View File

@ -0,0 +1,673 @@
<template>
<view class="page">
<!-- required 未登录:页内「请先登录」+ 去登录,**不自动跳转** -->
<auth-gate auth="required">
<template #default>
<!-- 筛选区(吸顶):订单号 + 搜索;流水类型 / 订单类型 / 流水时间 / 仓库用胶囊唤起底部选择器 -->
<view class="filter">
<view class="filter__row">
<view class="filter__input">
<up-input
v-model="form.order_no"
color="#303133"
placeholder-style="color: #c0c4cc"
placeholder="搜索订单号"
prefix-icon="search"
border="none"
clearable
confirm-type="search"
@confirm="onSearch"
></up-input>
</view>
<up-button
type="primary"
shape="circle"
size="small"
text="搜索"
@click="onSearch"
></up-button>
</view>
<view class="filter__row filter__row--chips">
<view
class="chip"
:class="{ 'chip--active': !!form.transaction_type }"
@click="openPicker('transactionType')"
>
<text class="chip__text">{{ labelOf('transactionType') }}</text>
<up-icon
name="arrow-down"
size="12"
:color="form.transaction_type ? '#2979ff' : '#909399'"
></up-icon>
</view>
<view
class="chip"
:class="{ 'chip--active': !!form.order_type }"
@click="openPicker('orderType')"
>
<text class="chip__text">{{ labelOf('orderType') }}</text>
<up-icon
name="arrow-down"
size="12"
:color="form.order_type ? '#2979ff' : '#909399'"
></up-icon>
</view>
<view
class="chip"
:class="{ 'chip--active': !!form.period }"
@click="openPicker('period')"
>
<text class="chip__text">{{ labelOf('period') }}</text>
<up-icon
name="arrow-down"
size="12"
:color="form.period ? '#2979ff' : '#909399'"
></up-icon>
</view>
<view
class="chip"
:class="{ 'chip--active': isFilled(form.warehouse_id) }"
@click="openPicker('warehouse')"
>
<text class="chip__text">{{ labelOf('warehouse') }}</text>
<up-icon
name="arrow-down"
size="12"
:color="isFilled(form.warehouse_id) ? '#2979ff' : '#909399'"
></up-icon>
</view>
<view v-if="hasFilter" class="filter__reset" @click="onReset">重置</view>
</view>
</view>
<!-- 首屏加载(翻页时保留旧列表,只把页码控件置为「加载中…」,避免整屏闪动) -->
<view v-if="loading && !list.length" class="loading">
<up-loading-icon mode="circle" size="18" text="加载中"></up-loading-icon>
</view>
<template v-else-if="list.length">
<!-- 流水卡片:批次号(头部)/ 流水类型 / 流水时间 / 商品ID / 变动数量 /
库存 前→后 / 锁定库存 前→后 / 订单类型 / 订单号 / 操作人 / 备注(空的不显示) -->
<view
v-for="(item, index) in list"
:key="rowKey(item, index)"
class="flow"
>
<!-- 头部:批次号(流水没有业务单号,批次号是最像「键」的字段) -->
<view class="flow__head">
<text class="flow__head-label">批次号</text>
<text class="flow__batch">{{ item.batch_no || '—' }}</text>
</view>
<!-- 流水类型:独立成带标签的一行(原先放在头部右侧做无标签胶囊,看不出是哪个字段) -->
<view class="flow__row">
<text class="flow__label">流水类型</text>
<view
class="flow__tag"
:style="{ color: typeColorOf(item), backgroundColor: typeBgOf(item) }"
>
<text class="flow__tag-text">{{ typeTextOf(item) }}</text>
</view>
</view>
<view class="flow__row">
<text class="flow__label">流水时间</text>
<text class="flow__value">{{ dateTimeTextOf(item) }}</text>
</view>
<view class="flow__row">
<text class="flow__label">商品ID</text>
<text class="flow__value">{{ isFilled(item.stock_id) ? item.stock_id : '—' }}</text>
</view>
<view class="flow__row">
<text class="flow__label">变动数量</text>
<text class="flow__value" :style="{ color: quantityColorOf(item) }">
{{ quantityTextOf(item) }}
</text>
</view>
<view class="flow__row">
<text class="flow__label">库存</text>
<text class="flow__value">{{ stockRangeOf(item) }}</text>
</view>
<view class="flow__row">
<text class="flow__label">锁定库存</text>
<text class="flow__value">{{ lockRangeOf(item) }}</text>
</view>
<view class="flow__row">
<text class="flow__label">订单类型</text>
<text class="flow__value">{{ orderTypeTextOf(item) }}</text>
</view>
<view v-if="item.order_no" class="flow__row">
<text class="flow__label">订单号</text>
<text class="flow__value">{{ item.order_no }}</text>
</view>
<view v-if="item.operator_name" class="flow__row">
<text class="flow__label">操作人</text>
<text class="flow__value">{{ item.operator_name }}</text>
</view>
<view v-if="item.remark" class="flow__row">
<text class="flow__label">备注</text>
<text class="flow__value">{{ item.remark }}</text>
</view>
</view>
</template>
<!-- 空态:无数据 / 加载失败(有筛选条件时文案不同) -->
<empty-state v-else v-bind="emptyStateProps" @retry="loadPage(1)"></empty-state>
</template>
</auth-gate>
<!-- 分页器(固定底部,公共组件;每页条数由 PRODUCTFLOW_PAGE_SIZE 固定,不可改) -->
<page-pager
v-if="list.length"
:total="total"
:page="pageNo"
:page-size="PRODUCTFLOW_PAGE_SIZE"
:loading="loading"
unit="条流水"
@change="goPage"
></page-pager>
<!-- 选择器(流水类型 / 订单类型 / 流水时间 / 仓库):底部弹层,选项多时组件自带名称搜索 -->
<option-picker
:show="pickerVisible"
:title="pickerTitle"
:options="pickerOptions"
:value="pickerValue"
:loading="pickerLoading"
@select="chooseOption"
@close="closePicker"
></option-picker>
<!-- 登录抽屉:点「去登录」或碰需要登录的接口时就地弹出(不跳页) -->
<auth-modal></auth-modal>
</view>
</template>
<script setup lang="ts">
/**
* 商品流水(列表)
*
* 接口与 new3 Web 端 `views/storage/productflow/store/index.vue`(**货主侧**)**同源**
* (`stock.transaction.storeList`,见 `api/stock/productflow.ts`)。
* ⚠️ 同模块的 `stock.transaction.list` 是**仓库侧**,别拿错。
*
* 字段取自 new3 `productflow-config.ts` 的 `columns`,但按**详情面板**的粒度收敛:
* Web 表格里「库存变动 / 锁定变动 / 变动前库存 / 变动后库存 / 变动前锁定 / 变动后锁定」
* 6 个数字列 → 移动端 3 行(变动数量 / 库存 前→后 / 锁定库存 前→后)。
*
* 移动端取舍(与「外仓商品」「收货单」「库存报表」「入库单」一致):
* - 筛选只保留**订单号 + 流水类型 + 订单类型 + 流水时间 + 仓库**;Web 的商品ID / 批次号 /
* 操作人等筛选项不做(字段太多,移动端筛选行放不下)
* - 每页固定 50 条不可改,分页用固定底部的 `components/page-pager`,**整页替换**不做追加
* - Web 的排序、列配置、导出、详情面板不做
*
* ⚠️ 三条必须保持一致,改任意一处都要同步另两处(`npm run check:pages` 会校验):
* 1. 本文件的物理路径 `pagesA/external-inventory/productflow`
* 2. `src/pages.json` 里 `subPackages[pagesA]` 的注册
* 3. `src/router/pages.ts` 的 `PAGE_REGISTRY`(key = 后端 `wms_permission.path` = `/external-inventory/productflow`)
*/
import { computed, reactive, ref, watch } from 'vue'
import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app'
import { usePageAuth } from '@/composables/usePageAuth'
import AuthModal from '@/components/auth-modal/auth-modal.vue'
import OptionPicker from '@/components/option-picker/option-picker.vue'
import PagePager from '@/components/page-pager/page-pager.vue'
import { fetchWarehouseOptions } from '@/api/index/index'
import type { SelectOption } from '@/api/index/index'
import {
ORDER_TYPE_OPTIONS,
PRODUCTFLOW_PAGE_SIZE,
PRODUCTFLOW_PERIOD_OPTIONS,
TRANSACTION_TYPE_OPTIONS,
buildPeriodRange,
fetchStoreProductFlowList,
readDateTimeText,
readList,
readLockRangeText,
readOrderTypeText,
readQuantityColor,
readQuantityText,
readStockRangeText,
readTotal,
readTransactionTypeBg,
readTransactionTypeColor,
readTransactionTypeText
} from '@/api/stock/productflow'
import type { ProductFlowItem } from '@/api/stock/productflow'
/** 本页是 required:未登录时只做页内提示,不自动跳登录 */
const { isLogin } = usePageAuth('required')
/**
* 筛选条件
*
* - `order_no` 输入框回车 / 点搜索才生效(避免每输入一个字就请求);胶囊点选立即生效
* - `period` 是**预设标识**(界面状态),`start_time` / `end_time` 才是真正发给后端的参数
* —— 两者由 `applyPeriod()` 一起写,避免出现「预设显示近 7 天、实际传的是别的区间」
*/
const form = reactive({
order_no: '',
transaction_type: '',
order_type: '',
period: '',
start_time: '',
end_time: '',
warehouse_id: '' as string | number
})
const list = ref<ProductFlowItem[]>([])
/** 后端总数(分页器靠它算总页数) */
const total = ref(0)
/** 当前页码(1-based) */
const pageNo = ref(1)
const loading = ref(false)
const isFilled = (value: unknown): boolean =>
value !== undefined && value !== null && value !== ''
/**
* 行 key:**必须唯一**
* (流水行没有业务单号,后端 `id` 是主键;仍带序号兜底,避免 key 撞了让微信丢行)
*/
const rowKey = (item: ProductFlowItem, index: number): string =>
`${item?.id ?? 'row'}-${index}`
const hasFilter = computed(
() =>
!!form.order_no.trim() ||
!!form.transaction_type ||
!!form.order_type ||
!!form.period ||
isFilled(form.warehouse_id)
)
const dateTimeTextOf = (item: ProductFlowItem): string => readDateTimeText(item?.created_at)
const typeTextOf = (item: ProductFlowItem): string => readTransactionTypeText(item?.transaction_type)
const typeColorOf = (item: ProductFlowItem): string =>
readTransactionTypeColor(item?.transaction_type)
const typeBgOf = (item: ProductFlowItem): string => readTransactionTypeBg(item?.transaction_type)
const quantityTextOf = (item: ProductFlowItem): string => readQuantityText(item)
const quantityColorOf = (item: ProductFlowItem): string => readQuantityColor(item)
const stockRangeOf = (item: ProductFlowItem): string => readStockRangeText(item)
const lockRangeOf = (item: ProductFlowItem): string => readLockRangeText(item)
const orderTypeTextOf = (item: ProductFlowItem): string => readOrderTypeText(item?.order_type)
/** 总页数(按固定每页条数算;总数 0 时也算 1 页,避免出现「第 1/0 页」) */
const pageCount = computed(() => Math.max(1, Math.ceil(total.value / PRODUCTFLOW_PAGE_SIZE)))
/** 翻页后回到顶部(否则新一页会从上一页的滚动位置继续,看着像没动) */
const scrollToTop = (): void => {
uni.pageScrollTo({ scrollTop: 0, duration: 0 })
}
/**
* 拉取指定页(**整页替换**,不做追加 —— 分页由底部页码控件驱动)
* @param target 目标页码(1-based),越界自动夹到 `[1, pageCount]`
*/
const loadPage = async (target = pageNo.value): Promise<void> => {
if (!isLogin.value) return
if (loading.value) return
// 未知总数时(首屏)先不夹上界,拿到 total 后页码自会收敛
const max = total.value > 0 ? pageCount.value : Number.MAX_SAFE_INTEGER
const page = Math.min(Math.max(1, Math.floor(target) || 1), max)
loading.value = true
try {
const res = await fetchStoreProductFlowList({
page,
pageSize: PRODUCTFLOW_PAGE_SIZE,
order_no: form.order_no,
transaction_type: form.transaction_type,
order_type: form.order_type,
start_time: form.start_time,
end_time: form.end_time,
warehouse_id: form.warehouse_id
})
// ⚠️ 用容错解析:本接口把 list/pagination 放在**响应顶层**(无 `data` 包裹),
// 直接取 `res.data.list` 会永远是空数组
list.value = readList(res)
total.value = readTotal(res)
pageNo.value = page
// 解析不到列表时打一条告警:在开发者工具控制台可直接看到真实响应结构,便于定位
if (!list.value.length && res) {
console.warn('[商品流水] 未从响应中解析出列表,请核对响应结构:', res)
}
} catch {
// 失败提示由 request 层统一 toast;这里保留原页与旧数据(不把用户用到空白页)
} finally {
loading.value = false
uni.stopPullDownRefresh()
}
}
/** 切页(分页器按钮用):夹取范围、已在目标页则不动作 */
const goPage = (target: number): void => {
if (loading.value) return
const next = Math.min(Math.max(1, Math.floor(target) || 1), pageCount.value)
if (next === pageNo.value) return
loadPage(next).then(scrollToTop)
}
/** 筛选变了必须重拉第 1 页(不能因为「还在第 1 页」就跳过) */
const reloadFirstPage = (): void => {
loadPage(1).then(scrollToTop)
}
const onSearch = (): void => {
reloadFirstPage()
}
const onReset = (): void => {
form.order_no = ''
form.transaction_type = ''
form.order_type = ''
form.warehouse_id = ''
// 清预设时一并清掉真正的时间参数(只清 period 会留下上次的区间)
applyPeriod('')
reloadFirstPage()
}
/** 下拉刷新:重拉当前页;若当前页已越界(总数变少)则回到第 1 页 */
const refresh = async (): Promise<void> => {
await loadPage(pageNo.value)
if (!list.value.length && pageNo.value > 1) await loadPage(1)
}
// ── 流水类型 / 订单类型 / 流水时间 / 仓库 选择器(同一个底部弹层组件复用)──
type PickerKind = 'transactionType' | 'orderType' | 'period' | 'warehouse'
const pickerVisible = ref(false)
const pickerKind = ref<PickerKind>('transactionType')
const pickerLoading = ref(false)
const warehouseOptions = ref<SelectOption[]>([])
const PICKER_TITLES: Record<PickerKind, string> = {
transactionType: '选择流水类型',
orderType: '选择订单类型',
period: '选择流水时间',
warehouse: '选择仓库'
}
/**
* 胶囊上显示的名称
*
* 未选中时显示**筛选项名**(流水类型 / 订单类型 / 流水时间 / 仓库),
* 选中后显示具体值(入库 / 入库单 / 近 7 天 / 仓库名)
*/
const PICKER_NAMES: Record<PickerKind, string> = {
transactionType: '流水类型',
orderType: '订单类型',
period: '流水时间',
warehouse: '仓库'
}
/** 维度 → 表单字段名(`period` 不落字段,由 `applyPeriod()` 展开成时间参数) */
const FIELD_OF: Record<Exclude<PickerKind, 'period'>, 'transaction_type' | 'order_type' | 'warehouse_id'> = {
transactionType: 'transaction_type',
orderType: 'order_type',
warehouse: 'warehouse_id'
}
/** 本地常量选项(仓库选项来自接口,不在这里) */
const LOCAL_OPTIONS: Record<Exclude<PickerKind, 'warehouse'>, SelectOption[]> = {
transactionType: TRANSACTION_TYPE_OPTIONS,
orderType: ORDER_TYPE_OPTIONS,
period: PRODUCTFLOW_PERIOD_OPTIONS
}
/**
* 预设区间:写 `period` 的同时把 `start_time` / `end_time` 落到表单
* (`''` = 全部 → 清空时间参数,不传即跟随后端默认口径)
*/
const applyPeriod = (key: string): void => {
form.period = key
const range = buildPeriodRange(key)
form.start_time = range?.start_time || ''
form.end_time = range?.end_time || ''
}
/** 某个维度当前选中的值 */
const valueOf = (kind: PickerKind): string | number => {
if (kind === 'period') return form.period
return form[FIELD_OF[kind]]
}
const pickerTitle = computed(() => PICKER_TITLES[pickerKind.value])
const pickerValue = computed(() => valueOf(pickerKind.value))
/** 弹层选项:仓库来自接口(含「全部仓库」),其余是本地常量;「名称搜索」在 option-picker 内部 */
const pickerOptions = computed<SelectOption[]>(() => {
if (pickerKind.value === 'warehouse') {
return [{ value: '', label: '全部仓库' }, ...warehouseOptions.value]
}
return LOCAL_OPTIONS[pickerKind.value as Exclude<PickerKind, 'warehouse'>]
})
/**
* 胶囊文案:未选中 = 筛选项名,选中 = 选项文案(找不到就原样显示值)
*
* 文案由「当前值 + 选项表」算出来,不再额外维护一份 label 状态,重置时也就不会漏掉某个胶囊
*/
const labelOf = (kind: PickerKind): string => {
const value = valueOf(kind)
if (!isFilled(value)) return PICKER_NAMES[kind]
const options = kind === 'warehouse' ? warehouseOptions.value : LOCAL_OPTIONS[kind]
return options.find((option) => String(option.value) === String(value))?.label || String(value)
}
/** 仓库选项只有用到时才拉(拉过就缓存,不重复请求) */
const ensureWarehouseOptions = async (): Promise<void> => {
if (warehouseOptions.value.length) return
pickerLoading.value = true
try {
warehouseOptions.value = await fetchWarehouseOptions()
} catch {
// 失败提示由 request 层统一 toast;这里保持空列表(弹层里只剩「全部仓库」)
} finally {
pickerLoading.value = false
}
}
const openPicker = (kind: PickerKind): void => {
pickerKind.value = kind
pickerVisible.value = true
if (kind === 'warehouse') ensureWarehouseOptions()
}
const closePicker = (): void => {
pickerVisible.value = false
}
const chooseOption = (option: SelectOption): void => {
if (pickerKind.value === 'period') {
applyPeriod(String(option.value))
} else {
// 各字段类型不同(string / string | number),用索引赋值避免联合类型收窄报错
;(form as Record<string, unknown>)[FIELD_OF[pickerKind.value]] = option.value
}
closePicker()
reloadFirstPage()
}
/** 空态文案:有筛选条件时不能用「服务器出差了」这种口气 */
const emptyStateProps = computed(() =>
hasFilter.value ? { text: '没有符合条件的商品流水,试试换个订单号或筛选条件' } : {}
)
// ── 生命周期 ──
onLoad(() => {
loadPage(1)
})
// 未登录进来是空态(页内有登录引导);登录成功后自动拉一次
watch(isLogin, (value) => {
if (value && !list.value.length) loadPage(1)
})
// 下拉刷新:重拉当前页
onPullDownRefresh(() => {
refresh()
})
</script>
<style lang="scss" scoped>
.page {
min-height: 100vh;
background-color: #f5f6fa;
/* 给固定底部的分页器留位置(分页器现在只有一行,约 72rpx),否则最后一张卡会被盖住 */
padding-bottom: 140rpx;
}
/* 筛选区:吸顶。部分低版本基础库不支持 sticky 就退化为普通块,不影响使用 */
.filter {
position: sticky;
top: 0;
z-index: 10;
padding: 16rpx 24rpx 12rpx;
background-color: #ffffff;
border-bottom: 1rpx solid #ebeef5;
&__row {
display: flex;
align-items: center;
&--chips {
margin-top: 8rpx;
/* 筛选项有四个 + 重置:允许换行,否则会被挤出屏幕 */
flex-wrap: wrap;
}
}
&__input {
flex: 1;
/* flex 子项里的输入框必须允许收缩,否则长占位符会把搜索按钮挤出去 */
min-width: 0;
margin-right: 16rpx;
padding: 0 20rpx;
background-color: #f5f6fa;
border-radius: 999rpx;
}
&__reset {
padding: 8rpx 8rpx 8rpx 16rpx;
font-size: 24rpx;
color: #2979ff;
}
}
.chip {
display: flex;
align-items: center;
max-width: 320rpx;
/* 筛选项有多个 + 重置:允许换行,所以上下各留 4rpx 避免换行后贴在一起 */
margin: 4rpx 16rpx 4rpx 0;
padding: 10rpx 20rpx;
background-color: #f5f6fa;
border-radius: 999rpx;
&--active {
background-color: rgba(41, 121, 255, 0.1);
}
&__text {
margin-right: 6rpx;
font-size: 24rpx;
color: #606266;
/* 仓库名可能很长:截断而不是把筛选行撑破 */
max-width: 240rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.loading {
display: flex;
align-items: center;
justify-content: center;
padding: 96rpx 0;
}
/* 流水卡片 */
.flow {
margin: 20rpx 24rpx 0;
padding: 24rpx;
background-color: #ffffff;
border-radius: 16rpx;
&__head {
display: flex;
align-items: center;
padding-bottom: 16rpx;
border-bottom: 1rpx solid #f2f3f5;
}
&__head-label {
flex-shrink: 0;
margin-right: 16rpx;
font-size: 24rpx;
color: #909399;
}
/* 批次号:卡片标题(可能很长,允许折行,不要 nowrap 以免宽度算错时顶出屏幕) */
&__batch {
flex: 1;
min-width: 0;
font-size: 30rpx;
font-weight: 600;
color: #303133;
word-break: break-all;
}
/* 流水类型胶囊:底色与文字色都由类型决定,一眼区分出入库/锁定 */
&__tag {
flex-shrink: 0;
padding: 4rpx 16rpx;
border-radius: 999rpx;
}
&__tag-text {
font-size: 22rpx;
line-height: 1.6;
}
&__row {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 14rpx;
font-size: 26rpx;
}
&__label {
flex-shrink: 0;
color: #909399;
}
&__value {
flex: 1;
min-width: 0;
margin-left: 16rpx;
text-align: right;
color: #606266;
/* 订单号 / 备注可能较长:允许折行,长数字串也断行,不截断 */
word-break: break-all;
}
}
/* 分页器样式在 components/page-pager(多个列表页共用,勿在此重复定义) */
</style>

View File

@ -168,6 +168,27 @@ export const PAGE_REGISTRY: PageMeta[] = [
auth: 'required'
// 对应后端 id=637(父节点 632「外仓库存」分类,sort=1 排在「收货单」之后)
// 接口 stock.report.searchStore(**货主侧**),见 api/stock/report.ts
},
{
key: '/external-inventory/entry',
path: 'pagesA/external-inventory/entry',
title: '入库单',
// 本地兜底图标;后端 id=638 下发的也是 order(uview 图标表里存在同名图标)
icon: 'order',
auth: 'required'
// 对应后端 id=638(父节点 632「外仓库存」分类,sort=2 排在「库存报表」之后)
// 接口 storage.entry.listStore(**货主侧**,与 new3 views/storage/entry_owner 同源),见 api/storage/entry.ts
},
{
key: '/external-inventory/productflow',
path: 'pagesA/external-inventory/productflow',
title: '商品流水',
// 本地兜底图标;后端 id=639 下发的是 list-dot(uview 图标表里存在同名图标)
icon: 'list-dot',
auth: 'required'
// 对应后端 id=639(父节点 632「外仓库存」分类,sort=3 排在「入库单」之后)
// 接口 stock.transaction.storeList(**货主侧**,与 new3 views/storage/productflow/store 同源),
// 见 api/stock/productflow.ts
}
// ─────────────── 待启用(页面文件就绪后再登记)───────────────