This commit is contained in:
yin 2026-06-16 18:24:32 +08:00
parent 54cf1b3d17
commit ca20e218dd
121 changed files with 4387 additions and 4615 deletions

Binary file not shown.

View File

@ -45,9 +45,56 @@ function pickScanOrderBody(data: RecheckScanOrderParams): Record<string, string>
)
}
/** scanOrder 成功时服务端常用字段(与 order.recheckOrder.scanOrder 响应对齐) */
/** 散单 list 项(有波次时的扁平订单) */
export type ScanOrderSingleListItem = {
order_id?: number
delivery_order_code?: string
waybill_no?: string
pick_status?: string
is_printed?: boolean | number | string
is_reviewed?: boolean | number | string
shop_nick?: string
items_count?: number
wave_index?: number | string
recheck_status?: string
order_type?: string
status?: string
logistics_name?: string
store_remark?: string
intercept_status?: string
stock?: unknown[]
/** 无波次时单订单详情模式 */
detail?: Record<string, unknown>
items?: unknown[]
expresses?: unknown[]
logs?: unknown[]
}
/** 团购 list 项(波次视图) */
export type ScanOrderGroupListItem = {
wave_id?: number
wave_no?: string
wave_type?: number
wave_status?: string
total_orders?: number
processed_orders?: number
creator?: string
create_time?: string
update_time?: string
order_count?: number
pick_mode?: number
box_no?: string
order_ids?: Array<number | string>
orders_detail?: unknown[]
orders?: unknown[]
stocks?: unknown[]
recheck_status?: string
is_reviewed?: boolean | number | string
}
/** scanOrder / scanTask 成功时服务端字段(与 order.recheckOrder.scanOrder 响应对齐) */
export type ScanOrderResultShape = {
match_type?: 'waybill' | 'wave' | 'cart' | string
match_type?: 'waybill' | 'wave' | 'cart' | 'task' | string
list_type?: 'single' | 'group' | string
waybill_no?: string
task_id?: number | null
@ -62,7 +109,8 @@ export type ScanOrderResultShape = {
total_orders?: number
reviewed_count?: number
unreviewed_count?: number
list?: unknown[]
list?: Array<ScanOrderSingleListItem | ScanOrderGroupListItem | Record<string, unknown>>
/** 历史兼容:车号命中旧结构 */
cart_match_view?: Record<string, unknown> | null
order_id?: number | string
order?: Record<string, unknown>
@ -71,6 +119,110 @@ export type ScanOrderResultShape = {
logs?: unknown[]
}
export function isRecheckApiSuccess(res: unknown) {
const r = res as { code?: number; flag?: string } | null | undefined
return Boolean(r && (r.code === 1 || r.code === 200 || r.flag === 'success'))
}
/** 解包 scanOrder / scanTask 响应 data */
export function unwrapScanOrderResponse(res: unknown): ScanOrderResultShape {
if (!res || typeof res !== 'object') return {}
const r = res as Record<string, unknown>
const d = r.data
if (d && typeof d === 'object' && !Array.isArray(d)) return d as ScanOrderResultShape
return r as ScanOrderResultShape
}
function asRecord(v: unknown): Record<string, unknown> | null {
return v && typeof v === 'object' && !Array.isArray(v) ? (v as Record<string, unknown>) : null
}
function normalizeStockRows(raw: unknown): Record<string, unknown>[] {
if (!Array.isArray(raw)) return []
return raw
.filter((item) => item && typeof item === 'object' && !Array.isArray(item))
.map((item) => {
const row = item as Record<string, unknown>
const barcodes = Array.isArray(row.barcodes)
? row.barcodes
: row.barcode
? [row.barcode]
: []
return {
...row,
item_name: row.item_name || row.name || '',
barcode: barcodes[0] || row.item_code || row.barcode || '',
barcodes,
plan_qty: row.plan_qty ?? row.qty ?? row.quantity,
images: Array.isArray(row.images) ? row.images : [],
has_shared_barcode: !!row.has_shared_barcode
}
})
}
/** 是否为无波次时的单订单详情 list 项(含 detail/items/expresses/logs) */
export function isScanOrderDetailListItem(item: unknown): boolean {
const row = asRecord(item)
if (!row) return false
return Boolean(row.detail || row.items || row.expresses || row.logs)
}
/** 将 scanOrder list 项规范化为面板订单行 */
export function normalizeScanOrderPanelRow(item: unknown): Record<string, unknown> {
const row = asRecord(item) || {}
if (isScanOrderDetailListItem(row)) {
const detail = asRecord(row.detail) || row
const items = Array.isArray(row.items) ? row.items : detail.items
const stock = normalizeStockRows(items ?? detail.stock)
return {
...detail,
order_id: detail.order_id ?? detail.id ?? row.order_id,
waybill_no: String(
detail.waybill_no ?? detail.waybillCode ?? detail.waybill_code ?? row.waybill_no ?? ''
).trim(),
stock,
expresses: Array.isArray(row.expresses) ? row.expresses : detail.expresses,
logs: Array.isArray(row.logs) ? row.logs : detail.logs
}
}
const stock = normalizeStockRows(row.stock ?? row.stocks)
return {
...row,
order_id: row.order_id ?? row.id,
waybill_no: String(row.waybill_no ?? row.waybillCode ?? row.waybill_code ?? '').trim(),
stock: stock.length ? stock : normalizeStockRows(row.stocks)
}
}
/** 将 scanOrder 团购波次 list 项规范化为面板行 */
export function normalizeScanOrderGroupWaveRow(wave: unknown): Record<string, unknown> {
const w = asRecord(wave) || {}
const stocks = normalizeStockRows(w.stocks)
const totalOrders = Number(w.total_orders ?? w.order_count ?? 0)
const processedOrders = Number(w.processed_orders ?? 0)
const recheckStatus = String(
w.recheck_status ?? (processedOrders >= totalOrders && totalOrders > 0 ? 'fin' : '')
).trim()
return {
...w,
_is_wave: true,
waybill_no: String(w.wave_no ?? '').trim(),
id: w.wave_id,
order_id: w.wave_id,
order_ids: Array.isArray(w.order_ids) ? w.order_ids : [],
orders_detail: Array.isArray(w.orders_detail) ? w.orders_detail : w.orders,
stock: stocks,
recheck_status: recheckStatus,
is_reviewed: w.is_reviewed ?? (processedOrders >= totalOrders && totalOrders > 0)
}
}
export function isOrderRecheckFinished(row: Record<string, unknown>) {
const status = String(row.recheck_status ?? row.is_reviewed ?? '').trim()
return status === 'fin' || status === 'true' || row.is_reviewed === true
}
/** confirmRecheck 成功时服务端常用字段 */
export type ConfirmRecheckResultShape = {
order_id?: number
@ -198,6 +350,70 @@ export function batchQuickRecheck(data: BatchQuickRecheckParams): Promise<any> {
} as any)
}
export type QueryRecheckOrderSingleListWhere = {
keyword?: string
wave_no?: string
recheck_status?: string
pick_status?: string
}
export type QueryRecheckOrderSingleListParams = {
where?: QueryRecheckOrderSingleListWhere
pagination?: {
page?: number
pageSize?: number
}
}
export type RecheckOrderSingleListItem = {
order_id?: number
delivery_order_code?: string
order_type?: string
wave_id?: number
wave_no?: string
pick_status?: string
recheck_status?: string
shop_nick?: string
logistics_name?: string
items_count?: number
items_total?: number
items_weight?: number | string
weight_type?: string
status?: string
create_at?: string
pick_time?: string
recheck_time?: string
}
export type QueryRecheckOrderSingleListResponse = {
list: RecheckOrderSingleListItem[]
pagination: {
page?: number
pageSize?: number
total?: number
totalPages?: number
hasPrevious?: boolean
hasNext?: boolean
}
}
/** order.recheckOrder.queryRecheckOrderSingleList:散单模式复核列表查询 */
export function queryRecheckOrderSingleList(
data: QueryRecheckOrderSingleListParams = {}
): Promise<any> {
return request({
url: '/system',
method: 'post',
params: {
method: 'order.recheckOrder.queryRecheckOrderSingleList',
v,
timestamp: Date.now()
},
data,
isSystemApi: true
} as any)
}
/** order.recheckOrder.confirmIntercept:确认拦截,入参 order_id,匹配单个订单并标记拦截 */
export function confirmIntercept(data: ConfirmRecheckParams): Promise<any> {
return request({
@ -217,7 +433,8 @@ export const orderRecheckOrder = {
scanOrder,
batchQuickRecheck,
confirmRecheck,
confirmIntercept
confirmIntercept,
queryRecheckOrderSingleList
}
export type {

View File

@ -162,8 +162,28 @@ export type WaveGroupOrderFetchListParams = {
return_order_ids?: boolean
}
export type WaveGroupOrderFetchListItem = Record<string, unknown> & {
item_detail?: string
item_detail_machine?: string
item_detail_machine_snapshot?: string
item_snapshot?: string
group?: string
group_count?: number
items_total?: number
/** 总重量 kg,取组内首单 items_weight */
items_weight?: number | string
store_id?: number
store_ids?: number[]
logistics_name?: string
distinguish_express?: boolean
first_order_time?: string
last_order_time?: string
status_summary?: Record<string, unknown>
order_ids?: number[]
}
export type WaveGroupOrderFetchListResponse = {
list: Array<Record<string, unknown>>
list: WaveGroupOrderFetchListItem[]
pagination: WaveListPagination
}

View File

@ -105,3 +105,34 @@ export function packageMaterialList(data?: PackageMaterialGetParams) {
data: data || {}
})
}
export type PackageMaterialSearchParams = {
keyword?: string
}
export type PackageMaterialSearchItem = {
id?: number
material_code?: string
material_name?: string
material_type?: string
spec?: string
status?: number
}
export type PackageMaterialSearchResponse = {
data: PackageMaterialSearchItem[]
}
/** setting.packageMaterial.search:包材关键字搜索,最多返回 50 条启用中的包材 */
export function packageMaterialSearch(data?: PackageMaterialSearchParams) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.packageMaterial.search',
v,
timestamp: new Date().getTime()
},
data: data || {}
})
}

View File

@ -13,6 +13,17 @@ export type SettingWarehouseAutoOutboundRules = {
require_pick?: boolean
}
/** 文档默认:auto_outbound_rules 各子项默认值 */
export const DEFAULT_AUTO_OUTBOUND_RULES: Required<SettingWarehouseAutoOutboundRules> = {
enabled: false,
require_recheck: true,
require_pack: true,
require_weigh: true,
require_sync: true,
require_print: true,
require_pick: true
}
/** 与 module setting.warehouse 文档 subject_config 对齐 */
export type SettingWarehouseSubjectConfig = {
enable_external_express_code?: boolean
@ -41,6 +52,82 @@ export type SettingWarehouseSaveSettingsPayload = SettingWarehouseSettingsPayloa
cache_cleared_warehouse_id: number | null
}
function clonePlainObject<T extends Record<string, unknown>>(src: T): T {
return JSON.parse(JSON.stringify(src)) as T
}
/** 归一化 getSettings / saveSettings 返回的 subject_config(补全文档默认项) */
export function normalizeWarehouseSubjectConfig(
raw: unknown
): SettingWarehouseSubjectConfig {
const base =
raw && typeof raw === 'object' && !Array.isArray(raw)
? clonePlainObject(raw as Record<string, unknown>)
: ({} as Record<string, unknown>)
if (typeof base.enable_external_express_code !== 'boolean') {
base.enable_external_express_code = false
}
const rulesRaw = base.auto_outbound_rules
const rules =
rulesRaw && typeof rulesRaw === 'object' && !Array.isArray(rulesRaw)
? { ...(rulesRaw as Record<string, unknown>) }
: ({} as Record<string, unknown>)
base.auto_outbound_rules = {
...DEFAULT_AUTO_OUTBOUND_RULES,
...Object.fromEntries(
Object.entries(rules).filter(([, v]) => typeof v === 'boolean')
)
} as SettingWarehouseAutoOutboundRules
return base as SettingWarehouseSubjectConfig
}
export function normalizeGetSettingsPayload(
raw: Record<string, unknown> | null | undefined
): SettingWarehouseSettingsPayload {
const payload = raw && typeof raw === 'object' ? raw : {}
const warehouseId = Number(payload.warehouse_id)
return {
warehouse_id: Number.isFinite(warehouseId) ? warehouseId : 0,
subject_config: normalizeWarehouseSubjectConfig(payload.subject_config)
}
}
/** 构造 saveSettings 请求体(仅 subject_config + 可选 cache 仓库 ID) */
export function buildSaveSettingsRequest(options: {
subject_config: SettingWarehouseSubjectConfig | Record<string, unknown>
cache_warehouse_id?: number | null
}): SettingWarehouseSaveSettingsParams {
const body: SettingWarehouseSaveSettingsParams = {
subject_config: normalizeWarehouseSubjectConfig(options.subject_config)
}
const cacheId = options.cache_warehouse_id
if (cacheId != null && Number.isFinite(cacheId) && cacheId > 0) {
body.cache_warehouse_id = Math.trunc(cacheId)
}
return body
}
export function normalizeSaveSettingsPayload(
raw: Record<string, unknown> | null | undefined
): SettingWarehouseSaveSettingsPayload {
const base = normalizeGetSettingsPayload(raw)
const cleared = raw?.cache_cleared_warehouse_id
const cacheCleared =
cleared === null || cleared === undefined
? null
: Number.isFinite(Number(cleared))
? Number(cleared)
: null
return {
...base,
cache_cleared_warehouse_id: cacheCleared
}
}
export function unwrapSettingWarehousePayload(
res: Record<string, unknown> | null | undefined
): Record<string, unknown> {

View File

@ -3,6 +3,7 @@
v-model="visible"
:title="dialogTitle"
width="1135px"
align-center
class="print-dialog"
custom-class="print-dialog"
:body-style="printDialogBodyStyle"
@ -196,7 +197,7 @@ const printerLoading = ref(false)
const businessTypeOptions = [
{ label: '收货单 (RECEIPT)', value: 'RECEIPT' },
{ label: '库存单 (STOCK)', value: 'STOCK' },
{ label: '出库单 (STOCKOUT)', value: 'STOCKOUT' },
{ label: '出库单 (OUTBOUND)', value: 'OUTBOUND' },
{ label: '拣货单 (PICKING)', value: 'PICKING' }
]
@ -451,17 +452,23 @@ async function loadPrintOptions() {
}
}
function normalizeBusinessType(value: string) {
const normalized = String(value || '').trim()
if (normalized === 'STOCKOUT') return 'OUTBOUND'
return normalized
}
function resolveBusinessType() {
const fromProp = String(props.businessType || '').trim()
const fromProp = normalizeBusinessType(String(props.businessType || '').trim())
if (isSupportedBusinessType(fromProp)) return fromProp
const firstRow = props.selectionRows[0]
const fromRow = String(firstRow?.business_type ?? firstRow?.businessType ?? '').trim()
const fromRow = normalizeBusinessType(String(firstRow?.business_type ?? firstRow?.businessType ?? '').trim())
if (isSupportedBusinessType(fromRow)) return fromRow
return 'RECEIPT'
}
function isSupportedBusinessType(value: string) {
return ['STOCK', 'STOCKOUT', 'RECEIPT', 'PICKING'].includes(value)
return ['STOCK', 'OUTBOUND', 'RECEIPT', 'PICKING'].includes(value)
}
async function handleBusinessTypeChange() {
@ -488,7 +495,9 @@ function normalizeTemplateListResponse(res: any): any[] {
async function loadTemplatesByBusinessType() {
try {
const templates: any = await templateApi.listTemplatesByType({ businessType: printSettings.businessType })
const templates: any = await templateApi.listTemplatesByType({
businessType: normalizeBusinessType(printSettings.businessType)
})
if (isApiSuccess(templates)) {
templateOptions.value = normalizeTemplateListResponse(templates).map((item: any) => ({
...item,

View File

@ -50,8 +50,15 @@ export function buildStockQuery(params: Record<string, any>) {
}
// 4. 类型转换与值处理
// 处理 boolean -> Y/N
if (condition.type === 'boolean') {
// has_bound_item 为特殊字段,保留 boolean 原值(后端亦支持 Y/N)
if (key === 'has_bound_item' && condition.type === 'boolean') {
if (condition.value === true || condition.value === 'true' || condition.value === 1 || condition.value === '1') {
condition.value = true;
} else if (condition.value === false || condition.value === 'false' || condition.value === 0 || condition.value === '0') {
condition.value = false;
}
} else if (condition.type === 'boolean') {
// 处理 boolean -> Y/N
if (condition.value === true || condition.value === 'true') {
condition.value = 'Y';
} else if (condition.value === false || condition.value === 'false') {

View File

@ -0,0 +1,170 @@
<template>
<el-dialog
v-model="visible"
title="包材快速搜索"
width="860px"
align-center
destroy-on-close
:close-on-click-modal="!loading"
@closed="emit('closed')"
>
<el-alert
type="info"
:closable="false"
show-icon
class="search-alert"
title="setting.packageMaterial.search"
description="按包材编码/名称模糊匹配,最多返回 50 条启用中的包材;关键字为空时返回前 50 条。"
/>
<el-form :inline="true" size="small" class="search-form" @submit.prevent="handleSearch">
<el-form-item label="关键字">
<el-input
v-model="keyword"
clearable
placeholder="编码 / 名称"
style="width: 260px"
@keyup.enter="handleSearch"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="loading" @click="handleSearch">搜索</el-button>
<el-button :disabled="loading" @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<div class="result-meta">
共 {{ list.length }} 条(最多 50 条)
</div>
<el-table
:data="list"
border
size="small"
max-height="420"
v-loading="loading"
row-key="id"
empty-text="暂无包材"
highlight-current-row
@row-dblclick="handleSelect"
>
<el-table-column prop="id" label="ID" width="72" />
<el-table-column prop="material_code" label="包材编码" min-width="130" show-overflow-tooltip />
<el-table-column prop="material_name" label="包材名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="material_type" label="类型" min-width="100" show-overflow-tooltip />
<el-table-column prop="spec" label="规格" min-width="120" show-overflow-tooltip />
<el-table-column label="状态" width="88" align="center">
<template #default="{ row }">
<el-tag :type="formatPackageMaterialStatus(row.status).type" size="small">
{{ formatPackageMaterialStatus(row.status).text }}
</el-tag>
</template>
</el-table-column>
<el-table-column v-if="selectable" label="操作" width="80" fixed="right" align="center">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="handleSelect(row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="visible = false">关闭</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { packageMaterialSearch, type PackageMaterialSearchItem } from '@/api/setting.packagematerial/packagematerial'
import {
formatPackageMaterialStatus,
isPackageMaterialApiSuccess,
parsePackageMaterialSearchResponse,
type PackageMaterialRecord
} from '../package-material-config'
const visible = defineModel<boolean>({ default: false })
const props = withDefaults(
defineProps<{
/** 是否显示「选择」操作列并 emit select */
selectable?: boolean
/** 打开时预填关键字 */
initialKeyword?: string
}>(),
{
selectable: false,
initialKeyword: ''
}
)
const emit = defineEmits<{
(e: 'closed'): void
(e: 'select', row: PackageMaterialSearchItem): void
}>()
const loading = ref(false)
const keyword = ref('')
const list = ref<PackageMaterialRecord[]>([])
watch(
() => visible.value,
(open) => {
if (!open) return
keyword.value = String(props.initialKeyword || '').trim()
void loadList()
}
)
async function loadList() {
loading.value = true
try {
const payload: { keyword?: string } = {}
const text = keyword.value.trim()
if (text) payload.keyword = text
const res = await packageMaterialSearch(payload)
if (!isPackageMaterialApiSuccess(res)) {
throw new Error((res as any)?.message || '包材搜索失败')
}
list.value = parsePackageMaterialSearchResponse(res)
} catch (error: any) {
list.value = []
ElMessage.error(error?.message || '包材搜索失败')
} finally {
loading.value = false
}
}
function handleSearch() {
void loadList()
}
function handleReset() {
keyword.value = ''
void loadList()
}
function handleSelect(row: PackageMaterialRecord) {
emit('select', row)
if (props.selectable) {
visible.value = false
}
}
</script>
<style scoped lang="scss">
.search-alert {
margin-bottom: 12px;
}
.search-form {
margin-bottom: 8px;
}
.result-meta {
margin-bottom: 8px;
font-size: 12px;
color: #909399;
}
</style>

View File

@ -30,6 +30,7 @@
<el-tag size="small" type="info">共 {{ pagination.total }} 条</el-tag>
</div>
<div class="toolbar-right">
<el-button size="small" type="primary" plain @click="searchFormVisible = true">快速搜索</el-button>
<el-button type="success" size="small" @click="openCreate">新增包材</el-button>
<el-button type="warning" size="small" plain @click="openBatchImport">批量导入</el-button>
</div>
@ -191,6 +192,7 @@
</el-dialog>
<BatchImportDialog v-model="batchImportVisible" @success="onBatchImportSuccess" />
<PackageMaterialSearchForm v-model="searchFormVisible" />
</div>
</template>
@ -201,6 +203,7 @@ import type { FormInstance, FormRules } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import BatchImportDialog from './component/BatchImportDialog.vue'
import PackageMaterialSearchForm from './form/PackageMaterialSearchForm.vue'
import {
packageMaterialCreate,
packageMaterialDelete,
@ -247,6 +250,7 @@ const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const dialogVisible = ref(false)
const dialogMode = ref<'create' | 'edit'>('create')
const batchImportVisible = ref(false)
const searchFormVisible = ref(false)
const formRef = ref<FormInstance>()
const formData = reactive({
id: undefined as number | undefined,

View File

@ -250,3 +250,17 @@ export function parsePackageMaterialListResponse(res: any): {
return pick(res)
}
/** setting.packageMaterial.search 响应解析(data 为数组,最多 50 条) */
export function parsePackageMaterialSearchResponse(res: unknown): PackageMaterialRecord[] {
const root = (res as any)?.data ?? res
if (Array.isArray(root)) return root as PackageMaterialRecord[]
if (Array.isArray(root?.data)) return root.data as PackageMaterialRecord[]
if (Array.isArray(root?.list)) return root.list as PackageMaterialRecord[]
return []
}
export function isPackageMaterialApiSuccess(res: unknown) {
const r = res as { code?: number; flag?: string } | null | undefined
return Boolean(r && (r.code === 1 || r.code === 200 || r.flag === 'success'))
}

View File

@ -75,8 +75,11 @@ import {
orderBindExpressPackageMaterialByWaybill,
type BindExpressPackageMaterialByWaybillResponse
} from '@/api/order.index/orderindex'
import { packageMaterialGet } from '@/api/setting.packagematerial/packagematerial'
import { parsePackageMaterialListResponse } from '@/views/material/packageMaterial/package-material-config'
import { packageMaterialSearch } from '@/api/setting.packagematerial/packagematerial'
import {
isPackageMaterialApiSuccess,
parsePackageMaterialSearchResponse
} from '@/views/material/packageMaterial/package-material-config'
import { isOrderIndexApiSuccess } from '../utils/order-index-helpers'
const props = defineProps<{
@ -115,6 +118,7 @@ watch(
form.waybill_code = String(props.initialWaybillCode || '').trim()
form.package_material_code = ''
materialOptions.value = []
void searchPackageMaterials('')
}
)
@ -136,19 +140,15 @@ function focusMaterialSelect() {
async function searchPackageMaterials(query: string) {
const keyword = String(query || '').trim()
if (!keyword) {
materialOptions.value = []
return
}
materialLoading.value = true
try {
const res: any = await packageMaterialGet({
pagination: { page: 1, pageSize: 50 },
where: { quickWhere: keyword }
})
const data = parsePackageMaterialListResponse(res)
materialOptions.value = (data.list || [])
.map((item: any) => ({
const res: any = await packageMaterialSearch(keyword ? { keyword } : {})
if (!isPackageMaterialApiSuccess(res)) {
materialOptions.value = []
return
}
materialOptions.value = parsePackageMaterialSearchResponse(res)
.map((item) => ({
material_code: String(item.material_code || '').trim(),
material_name: String(item.material_name || '').trim()
}))

View File

@ -298,6 +298,7 @@ export const ORDER_TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
columnConfig: { key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' },
toggleDetail: { key: 'toggleDetail', label: '显示详情', dynamicLabelKey: 'detailToggleLabel', size: 'small', action: 'toggleDetailVisible' },
reverseReview: { key: 'reverseReview', label: '反审回待审核', size: 'small', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleReverseReview' },
createOrder: { key: 'createOrder', label: '建单', size: 'small', type: 'primary', plain: true, action: 'openCreateOrderDialog' },
// markPendingOutbound: { key: 'markPendingOutbound', label: '标记待出库', size: 'small', type: 'warning', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleMarkPendingOutbound' },
allocateStorage: { key: 'allocateStorage', label: '分配储位', size: 'small', type: 'primary', plain: true, loadingKey: 'storageAllocateLoading', disabledKey: 'hasNoSelection', action: 'openStorageAllocateDialog' },
cancelAllocateStorage: { key: 'cancelAllocateStorage', label: '取消分配储位', size: 'small', type: 'danger', plain: true, loadingKey: 'storageAllocateLoading', disabledKey: 'hasNoSelection', action: 'openStorageCancelDialog' },
@ -312,11 +313,20 @@ export const ORDER_TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
action: 'handleWaveSingleFetchByIds'
},
allocateExpress: { key: 'allocateExpress', label: '分配快递号', size: 'small', type: 'success', loadingKey: 'allocateLoading', disabledKey: 'hasNoSelection', action: 'openAllocateExpressDialog' },
batchQuickRecheck: {
key: 'batchQuickRecheck',
label: '批量复核',
size: 'small',
type: 'success',
plain: true,
disabledKey: 'hasNoSelection',
action: 'openBatchQuickRecheckDialog'
},
manualWaybill: { key: 'manualWaybill', label: '录入运单号', size: 'small', type: 'primary', plain: true, loadingKey: 'manualWaybillLoading', disabledKey: 'notSingleSelection', action: 'openManualWaybillDialog' },
updateExpress: { key: 'updateExpress', label: '修改快递', size: 'small', type: 'warning', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderExpressDialog' },
updatePlatform: { key: 'updatePlatform', label: '修改平台', size: 'small', type: 'info', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderPlatformDialog' },
updateAddress: { key: 'updateAddress', label: '修改地址', size: 'small', type: 'warning', plain: true, loadingKey: 'updateAddressLoading', disabledKey: 'hasNoSelection', action: 'openUpdateAddressDialog' },
createOrder: { key: 'createOrder', label: '建单', size: 'small', type: 'primary', plain: true, action: 'openCreateOrderDialog' },
cloneOrder: { key: 'cloneOrder', label: '克隆订单', size: 'small', type: 'warning', plain: true, loadingKey: 'cloneOrderLoading', disabledKey: 'notSingleSelection', action: 'openCloneOrderDialog' },
syncOrderIds: { key: 'syncOrderIds', label: '同步订单', size: 'small', type: 'primary', plain: true, loadingKey: 'syncOrderIdsLoading', disabledKey: 'hasNoSelection', action: 'openSyncOrderIdsDialog' },
cancelOrder: { key: 'cancelOrder', label: '取消订单', size: 'small', type: 'danger', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleCancelOrder' },
@ -1576,6 +1586,7 @@ export const pendingOrderbuttonList: any[] = [
export const pendingToolbarButtonKeys = [
...simpleListToolbarButtonKeys,
'reverseReview',
'createOrder',
'markPendingOutbound',
'waveSingleFetchByIds',
'allocateStorage',
@ -1585,7 +1596,7 @@ export const pendingToolbarButtonKeys = [
'updateExpress',
'updatePlatform',
'updateAddress',
'createOrder',
'batchQuickRecheck',
'cloneOrder',
'syncOrderIds',
'cancelOrder',

View File

@ -0,0 +1,305 @@
<template>
<el-dialog
v-model="visible"
title="批量快捷复核"
width="720px"
align-center
destroy-on-close
:close-on-click-modal="!submitting"
:close-on-press-escape="!submitting"
@closed="emit('closed')"
>
<!-- <el-alert
type="info"
:closable="false"
show-icon
class="batch-recheck-alert"
title="批量快捷复核说明"
description="对每个订单执行前置检查(已分配储位、已分配快递、已同步且未被拦截),必要时自动完成拣货后标记复核。各订单独立事务,支持部分失败。"
/> -->
<el-form ref="formRef" :model="form" :rules="rules" label-width="96px" class="batch-recheck-form">
<el-form-item label="已选订单">
<span>{{ selectedRows.length }} 条</span>
</el-form-item>
<el-form-item v-if="selectedRows.length" label="订单预览">
<el-table :data="selectedRows" border size="small" max-height="160" empty-text="无">
<el-table-column prop="id" label="订单 ID" width="96" />
<el-table-column prop="delivery_order_code" label="发货单号" min-width="150" show-overflow-tooltip />
<el-table-column label="复核状态" width="96">
<template #default="{ row }">
{{ translateRecheckStatus(row) }}
</template>
</el-table-column>
<el-table-column label="拣货状态" width="96">
<template #default="{ row }">
{{ translatePickStatus(row) }}
</template>
</el-table-column>
</el-table>
</el-form-item>
<!-- <el-form-item label="订单 ID" prop="idsText" required>
<el-input
v-model="form.idsText"
type="textarea"
:rows="4"
placeholder="必填。支持多个订单 ID,逗号、空格或换行分隔;接口参数 ids 支持数组或逗号分隔字符串"
/>
<div class="form-hint">
已解析 <strong>{{ parsedIds.length }}</strong> 个有效 ID
<el-button
v-if="suggestedIds.length"
link
type="primary"
size="small"
style="margin-left: 8px"
@click="fillSuggestedIds"
>
恢复为当前勾选({{ suggestedIds.length }})
</el-button>
</div>
</el-form-item> -->
</el-form>
<div v-if="result" class="recheck-result">
<!-- <el-divider content-position="left">执行结果</el-divider> -->
<div class="result-summary">
<el-tag type="success" size="small">成功 {{ result.success_count }}</el-tag>
<el-tag type="danger" size="small">失败 {{ result.failed_count }}</el-tag>
</div>
<el-tabs v-model="resultTab" class="result-tabs">
<el-tab-pane :label="`成功 (${result.success.length})`" name="success">
<el-table :data="normalizeResultRows(result.success)" border size="small" max-height="220" empty-text="无">
<el-table-column prop="order_id" label="订单 ID" width="100" />
<el-table-column prop="waybill_no" label="运单号" min-width="140" show-overflow-tooltip />
<el-table-column prop="message" label="说明" min-width="160" show-overflow-tooltip />
</el-table>
</el-tab-pane>
<el-tab-pane :label="`失败 (${result.failed.length})`" name="failed">
<el-table :data="normalizeResultRows(result.failed)" border size="small" max-height="220" empty-text="无">
<el-table-column prop="order_id" label="订单 ID" width="100" />
<el-table-column prop="waybill_no" label="运单号" min-width="140" show-overflow-tooltip />
<el-table-column prop="reason" label="原因" min-width="180" show-overflow-tooltip />
<el-table-column prop="message" label="说明" min-width="160" show-overflow-tooltip />
</el-table>
</el-tab-pane>
</el-tabs>
</div>
<template #footer>
<el-button :disabled="submitting" @click="visible = false">关闭</el-button>
<el-button type="primary" :loading="submitting" @click="handleSubmit">执行复核</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { computed, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import {
batchQuickRecheck,
type BatchQuickRecheckResponse
} from '@/api/order.recheckorder/recheckOrder'
import { translateOrderField } from '../config/order-common-config'
import { resolveOrderRecheckStatus } from '../utils/order-index-helpers'
export type BatchQuickRecheckPreviewRow = {
id?: number | string
delivery_order_code?: string
recheck_status?: string
pick_status?: string
}
const visible = defineModel<boolean>({ default: false })
const props = defineProps<{
suggestedIds?: number[]
selectedRows?: BatchQuickRecheckPreviewRow[]
}>()
const emit = defineEmits<{
(e: 'closed'): void
(e: 'success', payload: BatchQuickRecheckResponse): void
}>()
const formRef = ref<FormInstance>()
const submitting = ref(false)
const result = ref<BatchQuickRecheckResponse | null>(null)
const resultTab = ref<'success' | 'failed'>('success')
const form = reactive({
idsText: ''
})
const suggestedIds = computed(() =>
(props.suggestedIds || []).filter((id) => Number.isFinite(id) && id > 0)
)
const selectedRows = computed(() => props.selectedRows || [])
const parsedIds = computed(() => parseOrderIdsInput(form.idsText))
const rules: FormRules = {
idsText: [
{
validator: (_rule, _value, callback) => {
if (parsedIds.value.length === 0) {
callback(new Error('请至少输入一个有效订单 ID(接口参数 ids 必填)'))
} else {
callback()
}
},
trigger: 'blur'
}
]
}
watch(
() => visible.value,
(open) => {
if (!open) return
result.value = null
resultTab.value = 'success'
form.idsText = suggestedIds.value.join(', ')
formRef.value?.clearValidate()
}
)
watch(
suggestedIds,
(ids) => {
if (!visible.value || form.idsText.trim()) return
form.idsText = ids.join(', ')
}
)
function translateRecheckStatus(row: BatchQuickRecheckPreviewRow) {
return translateOrderField('recheck_status', resolveOrderRecheckStatus(row))
}
function translatePickStatus(row: BatchQuickRecheckPreviewRow) {
return translateOrderField('pick_status', row.pick_status)
}
function fillSuggestedIds() {
if (!suggestedIds.value.length) return
form.idsText = suggestedIds.value.join(', ')
formRef.value?.clearValidate(['idsText'])
}
function parseOrderIdsInput(raw: string): number[] {
const parts = String(raw || '')
.split(/[,,\s\n\r]+/)
.map((s) => s.trim())
.filter(Boolean)
const ids: number[] = []
const seen = new Set<number>()
for (const part of parts) {
const n = Number(part)
if (Number.isFinite(n) && n > 0 && Number.isInteger(n) && !seen.has(n)) {
seen.add(n)
ids.push(n)
}
}
return ids
}
function normalizeResultRows(rows: unknown[]): Array<Record<string, unknown>> {
return rows.map((row) => {
if (row && typeof row === 'object' && !Array.isArray(row)) {
return row as Record<string, unknown>
}
return { message: String(row) }
})
}
function unwrapBatchResult(res: any): BatchQuickRecheckResponse | null {
const raw = res?.data
if (raw && typeof raw === 'object' && !Array.isArray(raw)) {
return raw as BatchQuickRecheckResponse
}
return null
}
function isRecheckApiSuccess(res: any) {
return res && (res.code === 1 || res.code === 200 || res.flag === 'success')
}
async function handleSubmit() {
if (!formRef.value || submitting.value) return
const valid = await formRef.value.validate().catch(() => false)
if (!valid) return
const ids = parsedIds.value
if (!ids.length) {
ElMessage.warning('请至少输入一个有效订单 ID')
return
}
submitting.value = true
try {
const res: any = await batchQuickRecheck({ ids })
if (!isRecheckApiSuccess(res)) {
throw new Error(res?.message || '批量快捷复核失败')
}
const payload = unwrapBatchResult(res)
if (!payload) {
throw new Error('未获取到复核结果')
}
result.value = {
success: Array.isArray(payload.success) ? payload.success : [],
failed: Array.isArray(payload.failed) ? payload.failed : [],
success_count: Number(payload.success_count) || 0,
failed_count: Number(payload.failed_count) || 0
}
resultTab.value = result.value.failed_count > 0 ? 'failed' : 'success'
emit('success', result.value)
if (result.value.failed_count === 0) {
ElMessage.success(`批量复核完成,成功 ${result.value.success_count} 单`)
} else {
ElMessage.warning(
`复核完成:成功 ${result.value.success_count} 单,失败 ${result.value.failed_count} 单`
)
}
} catch (error: any) {
ElMessage.error(error?.message || '批量快捷复核失败')
} finally {
submitting.value = false
}
}
</script>
<style scoped lang="scss">
.batch-recheck-alert {
margin-bottom: 12px;
}
.batch-recheck-form {
margin-top: 4px;
}
.form-hint {
margin-top: 6px;
font-size: 12px;
color: #909399;
line-height: 1.5;
}
.recheck-result {
margin-top: 4px;
}
.result-summary {
display: flex;
gap: 8px;
margin-bottom: 8px;
}
.result-tabs :deep(.el-tabs__header) {
margin-bottom: 8px;
}
</style>

View File

@ -264,6 +264,13 @@
@closed="resetSyncOrderIdsDialog"
@submit="submitSyncOrderIds"
/>
<batch-quick-recheck-form
v-model="batchQuickRecheckDialogVisible"
:suggested-ids="batchQuickRecheckSuggestedIds"
:selected-rows="batchQuickRecheckSelectedRows"
@closed="resetBatchQuickRecheckDialog"
@success="handleBatchQuickRecheckSuccess"
/>
<update-address-form
v-model="updateAddressDialogVisible"
v-model:form="updateAddressForm"
@ -354,6 +361,7 @@ import UpdateOrderMetaForm from './form/UpdateOrderMetaForm.vue'
import CloneOrderForm from './form/CloneOrderForm.vue'
import ManualWaybillForm from './form/ManualWaybillForm.vue'
import SyncOrderIdsForm from './form/SyncOrderIdsForm.vue'
import BatchQuickRecheckForm from './form/BatchQuickRecheckForm.vue'
import UpdateAddressForm from './form/UpdateAddressForm.vue'
import BatchAsyncTaskForm from './form/BatchAsyncTaskForm.vue'
import ExpressWaybillPanel from './component/ExpressWaybillPanel.vue'
@ -657,6 +665,9 @@ const {
manualWaybillForm,
syncOrderIdsDialogVisible,
syncOrderIdsLoading,
batchQuickRecheckDialogVisible,
batchQuickRecheckSuggestedIds,
batchQuickRecheckSelectedRows,
updateAddressDialogVisible,
updateAddressLoading,
updateAddressOrderIds,
@ -677,12 +688,14 @@ const {
submitAllocateExpress,
submitUpdateAddress,
submitBatchAsyncTask,
handleBatchQuickRecheckSuccess,
resetAllocateDialog,
resetStorageAllocateDialog,
resetUpdateOrderMetaDialog,
resetCloneOrderDialog,
resetManualWaybillDialog,
resetSyncOrderIdsDialog,
resetBatchQuickRecheckDialog,
resetUpdateAddressDialog,
resetBatchAsyncTaskDialog
} = createPendingToolbarController({

View File

@ -397,6 +397,10 @@ export function createPendingToolbarController(params: {
const syncOrderIdsDialogVisible = ref(false)
const syncOrderIdsLoading = ref(false)
const batchQuickRecheckDialogVisible = ref(false)
const batchQuickRecheckSuggestedIds = ref<number[]>([])
const batchQuickRecheckSelectedRows = ref<any[]>([])
const updateAddressDialogVisible = ref(false)
const updateAddressLoading = ref(false)
const updateAddressOrderIds = ref<number[]>([])
@ -503,6 +507,7 @@ export function createPendingToolbarController(params: {
openCreateOrderDialog: params.openCreateOrderDialog,
openCloneOrderDialog,
openSyncOrderIdsDialog,
openBatchQuickRecheckDialog,
handleWaveSingleFetchByIds
},
getSelectedIds: params.getSelectedIds,
@ -792,6 +797,37 @@ export function createPendingToolbarController(params: {
syncOrderIdsDialogVisible.value = true
}
function openBatchQuickRecheckDialog() {
const rows = params.getSelectedRows()
if (!rows.length) {
ElMessage.warning('请先勾选需要批量复核的订单')
return
}
const ids = params.getSelectedIds()
if (!ids.length) {
ElMessage.error('选中行缺少订单 id,请刷新后重试')
return
}
batchQuickRecheckSuggestedIds.value = [...ids]
batchQuickRecheckSelectedRows.value = rows.map((row) => ({
id: row?.id ?? row?.order_id,
delivery_order_code: row?.delivery_order_code,
recheck_status: row?.recheck_status,
pick_status: row?.pick_status
}))
batchQuickRecheckDialogVisible.value = true
}
async function handleBatchQuickRecheckSuccess() {
params.clearSelection()
await params.loadData()
}
function resetBatchQuickRecheckDialog() {
batchQuickRecheckSuggestedIds.value = []
batchQuickRecheckSelectedRows.value = []
}
async function submitSyncOrderIds() {
if (syncOrderIdsLoading.value) return
const order_ids = params.getSelectedIds()
@ -1104,6 +1140,9 @@ export function createPendingToolbarController(params: {
manualWaybillForm,
syncOrderIdsDialogVisible,
syncOrderIdsLoading,
batchQuickRecheckDialogVisible,
batchQuickRecheckSuggestedIds,
batchQuickRecheckSelectedRows,
updateAddressDialogVisible,
updateAddressLoading,
updateAddressOrderIds,
@ -1124,12 +1163,14 @@ export function createPendingToolbarController(params: {
submitAllocateExpress,
submitUpdateAddress,
submitBatchAsyncTask,
handleBatchQuickRecheckSuccess,
resetAllocateDialog,
resetStorageAllocateDialog,
resetUpdateOrderMetaDialog,
resetCloneOrderDialog,
resetManualWaybillDialog,
resetSyncOrderIdsDialog,
resetBatchQuickRecheckDialog,
resetUpdateAddressDialog,
resetBatchAsyncTaskDialog
}

View File

@ -0,0 +1,333 @@
<template>
<el-dialog
v-model="visible"
title="散单复核列表"
width="1120px"
align-center
destroy-on-close
class="recheck-single-list-dialog"
:close-on-click-modal="!loading"
@closed="emit('closed')"
>
<!-- <el-alert
type="info"
:closable="false"
show-icon
class="list-alert"
title="散单模式待复核订单"
description="按订单维度查询(排除未拣货与已复核),支持关键词/波次号/复核状态/拣货状态筛选;选中后可批量快捷复核或加载到左侧复核面板。"
/> -->
<el-form :inline="true" size="small" class="filter-form" @submit.prevent="handleSearch">
<el-form-item label="关键词">
<el-input
v-model="filters.keyword"
clearable
placeholder="运单号/订单号"
style="width: 180px"
@keyup.enter="handleSearch"
/>
</el-form-item>
<el-form-item label="波次号">
<el-input
v-model="filters.wave_no"
clearable
placeholder="精确匹配"
style="width: 150px"
@keyup.enter="handleSearch"
/>
</el-form-item>
<el-form-item label="复核状态">
<el-select v-model="filters.recheck_status" clearable placeholder="全部" style="width: 120px">
<el-option
v-for="item in recheckStatusFilterOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="拣货状态">
<el-select v-model="filters.pick_status" clearable placeholder="全部" style="width: 120px">
<el-option
v-for="item in pickStatusFilterOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="loading" @click="handleSearch">查询</el-button>
<el-button :disabled="loading" @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<div class="table-toolbar">
<span class="toolbar-meta">共 {{ pagination.total }} 条</span>
<el-button
type="primary"
size="small"
plain
:disabled="!selectedRows.length"
@click="batchRecheckVisible = true"
>
批量快捷复核({{ selectedRows.length }})
</el-button>
</div>
<el-table
ref="tableRef"
:data="list"
border
size="small"
max-height="420"
v-loading="loading"
row-key="order_id"
empty-text="暂无待复核散单"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="46" :selectable="isRowSelectable" />
<el-table-column prop="order_id" label="订单 ID" width="90" />
<el-table-column prop="delivery_order_code" label="发货单号" min-width="150" show-overflow-tooltip />
<el-table-column prop="wave_no" label="波次号" min-width="120" show-overflow-tooltip />
<el-table-column prop="shop_nick" label="店铺" min-width="110" show-overflow-tooltip />
<el-table-column prop="logistics_name" label="快递" min-width="100" show-overflow-tooltip />
<el-table-column label="拣货状态" width="96" align="center">
<template #default="{ row }">
<el-tag :type="getRecheckListTagType('pick_status', row.pick_status)" size="small">
{{ translateRecheckListField('pick_status', row.pick_status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="复核状态" width="96" align="center">
<template #default="{ row }">
<el-tag :type="getRecheckListTagType('recheck_status', row.recheck_status)" size="small">
{{ translateRecheckListField('recheck_status', row.recheck_status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="items_count" label="SKU数" width="72" align="right" />
<el-table-column prop="items_total" label="件数" width="72" align="right" />
<el-table-column prop="pick_time" label="拣货时间" width="150" show-overflow-tooltip />
<el-table-column label="操作" width="100" fixed="right" align="center">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="handleLoadRecheck(row)">加载复核</el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination-bar">
<el-pagination
background
small
layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total"
:current-page="pagination.page"
:page-size="pagination.pageSize"
:page-sizes="[10, 20, 50, 100]"
@current-change="handlePageChange"
@size-change="handlePageSizeChange"
/>
</div>
<BatchQuickRecheckDialog
v-model="batchRecheckVisible"
:suggested-ids="batchRecheckSuggestedIds"
@success="handleBatchRecheckSuccess"
/>
<template #footer>
<el-button @click="visible = false">关闭</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { computed, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import {
queryRecheckOrderSingleList,
type RecheckOrderSingleListItem
} from '@/api/order.recheckorder/recheckOrder'
import BatchQuickRecheckDialog from '../component/BatchQuickRecheckDialog.vue'
import {
isRecheckOrderApiSuccess,
parseRecheckOrderSingleListResponse,
pickStatusFilterOptions,
recheckStatusFilterOptions,
translateRecheckListField,
getRecheckListTagType
} from '../recheck-config'
const visible = defineModel<boolean>({ default: false })
const emit = defineEmits<{
(e: 'closed'): void
(e: 'load-recheck', payload: { keyword: string; order_id?: number; delivery_order_code?: string }): void
(e: 'batch-recheck-success'): void
}>()
const loading = ref(false)
const list = ref<RecheckOrderSingleListItem[]>([])
const selectedRows = ref<RecheckOrderSingleListItem[]>([])
const tableRef = ref()
const batchRecheckVisible = ref(false)
const filters = reactive({
keyword: '',
wave_no: '',
recheck_status: '',
pick_status: ''
})
const pagination = reactive({
page: 1,
pageSize: 20,
total: 0
})
const batchRecheckSuggestedIds = computed(() =>
selectedRows.value
.map((row) => Number(row.order_id))
.filter((id) => Number.isFinite(id) && id > 0)
)
watch(
() => visible.value,
(open) => {
if (!open) return
pagination.page = 1
void loadList()
}
)
function buildWhere() {
const where: Record<string, string> = {}
const keyword = filters.keyword.trim()
const waveNo = filters.wave_no.trim()
if (keyword) where.keyword = keyword
if (waveNo) where.wave_no = waveNo
if (filters.recheck_status) where.recheck_status = filters.recheck_status
if (filters.pick_status) where.pick_status = filters.pick_status
return where
}
async function loadList() {
loading.value = true
try {
const res = await queryRecheckOrderSingleList({
where: buildWhere(),
pagination: {
page: pagination.page,
pageSize: pagination.pageSize
}
})
if (!isRecheckOrderApiSuccess(res)) {
throw new Error((res as any)?.message || '查询散单复核列表失败')
}
const parsed = parseRecheckOrderSingleListResponse(res)
list.value = parsed.list
pagination.total = parsed.pagination.total
pagination.page = parsed.pagination.page
pagination.pageSize = parsed.pagination.pageSize
} catch (error: any) {
list.value = []
pagination.total = 0
ElMessage.error(error?.message || '查询散单复核列表失败')
} finally {
loading.value = false
}
}
function handleSearch() {
pagination.page = 1
void loadList()
}
function handleReset() {
filters.keyword = ''
filters.wave_no = ''
filters.recheck_status = ''
filters.pick_status = ''
pagination.page = 1
void loadList()
}
function handlePageChange(page: number) {
pagination.page = page
void loadList()
}
function handlePageSizeChange(size: number) {
pagination.pageSize = size
pagination.page = 1
void loadList()
}
function handleSelectionChange(rows: RecheckOrderSingleListItem[]) {
selectedRows.value = rows
}
function isRowSelectable(row: RecheckOrderSingleListItem) {
return String(row.recheck_status ?? '').trim() !== 'fin'
}
function resolveScanKeyword(row: RecheckOrderSingleListItem) {
const deliveryCode = String(row.delivery_order_code ?? '').trim()
if (deliveryCode) return deliveryCode
const orderId = Number(row.order_id)
if (Number.isFinite(orderId) && orderId > 0) return String(orderId)
return ''
}
function handleLoadRecheck(row: RecheckOrderSingleListItem) {
const keyword = resolveScanKeyword(row)
if (!keyword) {
ElMessage.warning('该订单缺少可用于扫描的关键词')
return
}
emit('load-recheck', {
keyword,
order_id: row.order_id,
delivery_order_code: row.delivery_order_code
})
visible.value = false
}
function handleBatchRecheckSuccess() {
batchRecheckVisible.value = false
selectedRows.value = []
tableRef.value?.clearSelection?.()
emit('batch-recheck-success')
void loadList()
}
</script>
<style scoped lang="scss">
.list-alert {
margin-bottom: 12px;
}
.filter-form {
margin-bottom: 8px;
}
.table-toolbar {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 8px;
}
.toolbar-meta {
font-size: 12px;
color: #909399;
}
.pagination-bar {
display: flex;
justify-content: flex-end;
margin-top: 12px;
}
</style>

View File

@ -47,6 +47,9 @@
<el-button size="small" type="primary" plain @click="batchRecheckDialogVisible = true">
批量快捷复核
</el-button>
<el-button size="small" type="primary" plain @click="singleListDialogVisible = true">
散单复核列表
</el-button>
<el-button
v-if="!hasSelectedIntercept"
size="small"
@ -200,6 +203,12 @@
:suggested-ids="batchRecheckSuggestedIds"
@success="handleBatchQuickRecheckSuccess"
/>
<RecheckOrderSingleListForm
v-model="singleListDialogVisible"
@load-recheck="handleSingleListLoadRecheck"
@batch-recheck-success="handleSingleListBatchRecheckSuccess"
/>
</div>
</template>
@ -210,6 +219,7 @@ import type { FormInstance, FormRules } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import RecheckOrderPanel from './component/RecheckOrderPanel.vue'
import BatchQuickRecheckDialog from './component/BatchQuickRecheckDialog.vue'
import RecheckOrderSingleListForm from './form/RecheckOrderSingleListForm.vue'
import * as stationApi from '@/api/print/print'
import { getOrderPrintData } from '@/api/order.print/orderprint'
import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint'
@ -222,6 +232,10 @@ import {
scanTask,
confirmRecheck,
confirmIntercept,
unwrapScanOrderResponse,
normalizeScanOrderPanelRow,
normalizeScanOrderGroupWaveRow,
isOrderRecheckFinished,
type ConfirmRecheckResultShape,
type RecheckScanOrderParams,
type ScanOrderResultShape
@ -235,6 +249,8 @@ const SCAN_PARAM_KEYS: (keyof RecheckScanOrderParams)[] = [
'waybill_no',
'waybillCode',
'waybill_code',
'wave_no',
'waveNo',
'cart_code',
'cartCode'
]
@ -439,8 +455,19 @@ const panelScanMode = ref<'search' | 'recheck'>('search')
const panelTaskId = ref<number | string | undefined>(undefined)
const refreshTaskLoading = ref(false)
const batchRecheckDialogVisible = ref(false)
const singleListDialogVisible = ref(false)
const lastScanParams = ref<RecheckScanOrderParams | null>(null)
function handleSingleListLoadRecheck(payload: { keyword: string }) {
void executeScan({ keyword: payload.keyword })
}
function handleSingleListBatchRecheckSuccess() {
if (lastScanParams.value) {
void executeScan(lastScanParams.value)
}
}
function handlePanelSearch(keyword: string) {
void executeScan({ keyword })
}
@ -777,11 +804,7 @@ async function handleScanSubmit(condition?: unknown) {
}
function unwrapResponse(res: unknown): ScanOrderResultShape {
if (!res || typeof res !== 'object') return {}
const r = res as Record<string, unknown>
const d = r.data
if (d && typeof d === 'object' && !Array.isArray(d)) return d as ScanOrderResultShape
return r as ScanOrderResultShape
return unwrapScanOrderResponse(res)
}
function asRecord(v: unknown): Record<string, unknown> | null {
@ -941,104 +964,69 @@ function resolveTopOrderId(p: ScanOrderResultShape | null): number | undefined {
/** 从 scanOrder 响应提取 RecheckOrderPanel 所需数据 */
function updatePanelFromPayload(payload: ScanOrderResultShape) {
// 存储 task_id,供刷新任务数据使用
const tid = (payload as any)?.task_id
panelTaskId.value = tid != null && tid !== '' ? tid : undefined
const tid = payload.task_id
panelTaskId.value = tid != null ? tid : undefined
const rawList = asArray((payload as any).list)
const listType = String((payload as any)?.list_type ?? '').trim()
const rawList = asArray(payload.list)
const listType = String(payload.list_type ?? '').trim()
// 团购模式:list_type === 'group',列表项为波次(含聚合 stocks)
if (rawList.length && listType === 'group') {
const waves = rawList.map((w: any) => ({
...w,
_is_wave: true,
waybill_no: String(w.wave_no ?? '').trim(),
id: w.wave_id,
order_id: w.wave_id,
stock: Array.isArray(w.stocks) ? w.stocks.map((s: any) => ({
...s,
item_name: s.item_name || s.name || '',
barcode: s.barcodes?.[0] || s.item_code || '',
barcodes: Array.isArray(s.barcodes) ? s.barcodes : (s.barcode ? [s.barcode] : []),
plan_qty: s.plan_qty,
images: Array.isArray(s.images) ? s.images : [],
has_shared_barcode: !!s.has_shared_barcode
})) : [],
// 使用 wave 下的订单属性
recheck_status: String(w.recheck_status ?? (w.processed_orders >= w.total_orders ? 'fin' : '')).trim(),
is_reviewed: w.is_reviewed ?? (w.processed_orders >= w.total_orders && w.total_orders > 0)
}))
const waves = rawList.map((w) => normalizeScanOrderGroupWaveRow(w))
panelOrders.value = waves
panelTotalCount.value = (payload as any).total_orders ?? waves.reduce((sum, w) => sum + (Number(w.order_count) || 0), 0)
panelRemainingCount.value = (payload as any).unreviewed_count ?? waves.filter((w: any) => {
const status = String(w.recheck_status ?? w.is_reviewed ?? '').trim()
return status !== 'fin' && status !== 'true'
}).length
panelTotalCount.value =
payload.total_orders ?? waves.reduce((sum, w) => sum + (Number(w.order_count) || 0), 0)
panelRemainingCount.value =
payload.unreviewed_count ??
waves.filter((w) => !isOrderRecheckFinished(w)).length
panelActiveWaybill.value = ''
return
}
// 散单/波次命中:响应顶层有 list、total_orders、unreviewed_count
if (rawList.length) {
const orders = rawList.map((o: any) => ({
...o,
waybill_no: String(o.waybill_no ?? o.waybillCode ?? o.waybill_code ?? '').trim()
}))
const orders = rawList.map((o) => normalizeScanOrderPanelRow(o))
panelOrders.value = orders
panelTotalCount.value = (payload as any).total_orders ?? orders.length
panelRemainingCount.value = (payload as any).unreviewed_count ?? orders.filter((o: any) => {
const status = String(o.recheck_status ?? o.is_reviewed ?? '').trim()
return status !== 'fin' && status !== 'true'
}).length
panelTotalCount.value = payload.total_orders ?? orders.length
panelRemainingCount.value =
payload.unreviewed_count ?? orders.filter((o) => !isOrderRecheckFinished(o)).length
panelActiveWaybill.value = ''
return
}
if (payload.match_type === 'cart') {
// 车号命中:从 cart_match_view 提取订单列表
const orders = cartSelectableOrders.value
panelOrders.value = orders.map((o: any) => ({
...o,
waybill_no: String(o.waybill_no ?? o.waybillCode ?? o.waybill_code ?? '').trim()
}))
// 统计:总订单数 和 剩余未复核数(recheck_status !== 'fin')
const total = orders.length
const remaining = orders.filter((o: any) => {
const status = String(o.recheck_status ?? '').trim()
return status !== 'fin'
}).length
panelTotalCount.value = total
panelRemainingCount.value = remaining
// 如果只剩一个未复核订单,自动选中
if (remaining === 1) {
const unreviewed = orders.find((o: any) => {
const status = String(o.recheck_status ?? '').trim()
return status !== 'fin'
})
const orders = cartSelectableOrders.value.map((o) => normalizeScanOrderPanelRow(o))
panelOrders.value = orders
panelTotalCount.value = orders.length
panelRemainingCount.value = orders.filter((o) => !isOrderRecheckFinished(o)).length
if (panelRemainingCount.value === 1) {
const unreviewed = orders.find((o) => !isOrderRecheckFinished(o))
if (unreviewed) {
panelActiveWaybill.value = String(unreviewed.waybill_no ?? '').trim()
}
}
} else if (payload.match_type === 'waybill') {
// 运单命中:只包含一个订单
const order = asRecord(payload.order) || {}
const waybill = String(payload.waybill_no || order.waybill_no || '').trim()
panelOrders.value = [{
...order,
waybill_no: waybill,
waybillCode: waybill,
waybill_code: waybill
}]
panelTotalCount.value = 1
panelRemainingCount.value = 1
panelActiveWaybill.value = waybill
} else {
panelOrders.value = []
panelTotalCount.value = 0
panelRemainingCount.value = 0
panelActiveWaybill.value = ''
return
}
if (payload.match_type === 'waybill') {
const order = normalizeScanOrderPanelRow(asRecord(payload.order) || {})
const waybill = String(payload.waybill_no || order.waybill_no || '').trim()
panelOrders.value = [
{
...order,
waybill_no: waybill,
waybillCode: waybill,
waybill_code: waybill
}
]
panelTotalCount.value = 1
panelRemainingCount.value = isOrderRecheckFinished(order) ? 0 : 1
panelActiveWaybill.value = waybill
return
}
panelOrders.value = []
panelTotalCount.value = 0
panelRemainingCount.value = 0
panelActiveWaybill.value = ''
}
const activeOrderId = computed(() => selectedOrderId.value ?? resolveTopOrderId(scanPayload.value))
@ -1051,7 +1039,9 @@ const displayOrder = computed(() => {
const matchTypeLabel = computed(() => {
const t = scanPayload.value?.match_type
if (t === 'waybill') return '运单命中'
if (t === 'wave') return '波次命中'
if (t === 'cart') return '车号命中'
if (t === 'task') return '任务命中'
if (t != null && String(t) !== '') return String(t)
return ''
})
@ -1060,6 +1050,7 @@ const matchTypeTagType = computed(() => {
const t = scanPayload.value?.match_type
if (t === 'cart') return 'warning'
if (t === 'waybill') return 'success'
if (t === 'wave') return 'primary'
return 'info'
})
@ -1334,12 +1325,10 @@ function normalizeItemRow(raw: unknown): { scanned_qty: number; plan_qty: string
}
const itemsRows = computed(() => {
// 优先取选中行的 stock(散单/波次),其次 scanPayload.items
const selectedOrder = selectedOrderRow.value
let stockRaw = (selectedOrder as any)?.stock
// 兼容团购波次:原始数据用 stocks(复数)
const selectedOrder = selectedOrderRow.value as Record<string, unknown> | null
let stockRaw = selectedOrder?.stock
if (!Array.isArray(stockRaw) || !stockRaw.length) {
stockRaw = (selectedOrder as any)?.stocks
stockRaw = selectedOrder?.stocks
}
if (Array.isArray(stockRaw) && stockRaw.length) {
return stockRaw.map((item: any) => ({
@ -1354,9 +1343,14 @@ const itemsRows = computed(() => {
images: Array.isArray(item.images) ? item.images.filter(Boolean) : []
}))
}
const items = scanPayload.value?.items
if (!Array.isArray(items)) return []
return items.map(normalizeItemRow)
const detailItems = selectedOrder?.items
const payloadItems = scanPayload.value?.items
const items = Array.isArray(detailItems) ? detailItems : Array.isArray(payloadItems) ? payloadItems : null
if (Array.isArray(items)) {
return items.map(normalizeItemRow)
}
return []
})
const scannedCount = computed(() => {
@ -1438,7 +1432,8 @@ function itemsRowClassName({ row }: { row: any }) {
}
const expressRows = computed(() => {
const ex = scanPayload.value?.expresses
const selectedOrder = selectedOrderRow.value as Record<string, unknown> | null
const ex = selectedOrder?.expresses ?? scanPayload.value?.expresses
if (!Array.isArray(ex)) return []
return ex.filter((x) => x && typeof x === 'object' && !Array.isArray(x)) as Record<string, unknown>[]
})
@ -1465,7 +1460,8 @@ function normalizeLogRow(raw: unknown): { time: string; operator: string; action
}
const logRows = computed(() => {
const logs = scanPayload.value?.logs
const selectedOrder = selectedOrderRow.value as Record<string, unknown> | null
const logs = selectedOrder?.logs ?? scanPayload.value?.logs
if (!Array.isArray(logs)) return []
return logs.map(normalizeLogRow)
})

View File

@ -1,3 +1,76 @@
import type { RecheckOrderSingleListItem } from '@/api/order.recheckorder/recheckOrder'
import {
pickStatusFilterOptions,
recheckStatusFilterOptions,
translateOrderField,
getTagType
} from '@/views/order/orderManagement/config/order-common-config'
/** order.recheckOrder.queryRecheckOrderSingleList 列表列定义 */
export const recheckOrderSingleListColumns = [
{ prop: 'order_id', label: '订单 ID', width: '90' },
{ prop: 'delivery_order_code', label: '发货单号', minWidth: '150', showOverflowTooltip: true },
{ prop: 'wave_no', label: '波次号', minWidth: '120', showOverflowTooltip: true },
{ prop: 'shop_nick', label: '店铺', minWidth: '110', showOverflowTooltip: true },
{ prop: 'logistics_name', label: '快递', minWidth: '100', showOverflowTooltip: true },
{ prop: 'pick_status', label: '拣货状态', width: '96' },
{ prop: 'recheck_status', label: '复核状态', width: '96' },
{ prop: 'items_count', label: 'SKU数', width: '72', align: 'right' },
{ prop: 'items_total', label: '件数', width: '72', align: 'right' },
{ prop: 'items_weight', label: '重量', width: '80', align: 'right' },
{ prop: 'pick_time', label: '拣货时间', width: '150' },
{ prop: 'recheck_time', label: '复核时间', width: '150' }
]
export { pickStatusFilterOptions, recheckStatusFilterOptions }
export function isRecheckOrderApiSuccess(res: unknown) {
const r = res as { code?: number; flag?: string } | null | undefined
return Boolean(r && (r.code === 1 || r.code === 200 || r.flag === 'success'))
}
export function parseRecheckOrderSingleListResponse(res: unknown): {
list: RecheckOrderSingleListItem[]
pagination: {
page: number
pageSize: number
total: number
totalPages?: number
hasPrevious?: boolean
hasNext?: boolean
}
} {
const root = (res as any)?.data ?? res
const list = Array.isArray(root?.list)
? root.list
: Array.isArray(root)
? root
: []
const pg = root?.pagination && typeof root.pagination === 'object' ? root.pagination : {}
const page = Number(pg.page ?? root?.page ?? 1)
const pageSize = Number(pg.pageSize ?? root?.pageSize ?? 20)
const total = Number(pg.total ?? root?.total ?? list.length)
return {
list: list as RecheckOrderSingleListItem[],
pagination: {
page: Number.isFinite(page) && page > 0 ? page : 1,
pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : 20,
total: Number.isFinite(total) ? total : list.length,
totalPages: Number.isFinite(Number(pg.totalPages)) ? Number(pg.totalPages) : undefined,
hasPrevious: pg.hasPrevious,
hasNext: pg.hasNext
}
}
}
export function translateRecheckListField(field: string, value: unknown) {
return translateOrderField(field, value)
}
export function getRecheckListTagType(field: string, value: unknown) {
return getTagType(field, value)
}
/** 订单复核 ScanBox 筛选字段(对应 order.recheckOrder.scanOrder 入参别名) */
export const recheckAvailableFields = [
{
@ -16,6 +89,14 @@ export const recheckAvailableFields = [
operators: ['eq'],
defaultOperator: 'eq'
},
{
value: 'wave_no',
label: '波次号',
type: 'text',
placeholder: '请输入波次号',
operators: ['eq'],
defaultOperator: 'eq'
},
{
value: 'cart_code',
label: '车号',

View File

@ -15,36 +15,15 @@
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left" @wheel="handleToolbarWheel">
<div
class="toolbar-scroll-container"
ref="scrollContainerRef"
@mousedown="handleMouseDown"
@mousemove="handleMouseMove"
@mouseup="handleMouseUp"
@mouseleave="handleMouseUp"
>
<el-button size="small" type="primary" :loading="fallbackOrderListLoading" @click="loadData">查询</el-button>
<el-button size="small" @click="resetFallbackOrderCondition">重置</el-button>
<el-button size="small" @click="openColumnConfigPanel">字段设置</el-button>
<el-button
size="small"
type="warning"
:loading="waveStrategyQuickScanSubmitting"
@click="submitWaveStrategyQuickScan"
>
快速扫描
</el-button>
<el-button
size="small"
type="warning"
:disabled="!selectionRows.length"
:loading="singleOrderSubmitting"
@click="submitFallbackOrderFetchByIds"
>
按订单IDs抓取删单
</el-button>
</div>
<div class="toolbar-left">
<order-toolbar-button-group
:buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<div class="toolbar-right">
<span class="toolbar-switch-label">已选 {{ selectionRows.length }} 个订单</span>
@ -126,10 +105,13 @@ import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import {
waveScanBoxConfig,
fallbackOrderAvailableFields,
fallbackOrderColumns
fallbackOrderColumns,
fallbackOrderToolbarButtons
} from './config/wave-config'
import { safeInvoke } from '@/utils/safe-invoke'
import WaveStrategyQuickScanProgressDialog from './component/WaveStrategyQuickScanProgressDialog.vue'
@ -156,7 +138,6 @@ const props = withDefaults(defineProps<{
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const scrollContainerRef = ref<HTMLElement | null>(null)
const fallbackOrderListLoading = ref(false)
const singleOrderSubmitting = ref(false)
const waveStrategyQuickScanSubmitting = ref(false)
@ -203,34 +184,57 @@ const upperPaneFullStyle = computed(() => ({
overflow: 'hidden' as const
}))
const isDragging = ref(false)
const startX = ref(0)
const scrollLeft = ref(0)
const toolbarButtons = fallbackOrderToolbarButtons
const handleToolbarWheel = (e: WheelEvent) => {
if (scrollContainerRef.value) {
e.preventDefault()
scrollContainerRef.value.scrollLeft += e.deltaY
const buttonLoadingMap = computed(() => ({
loading: fallbackOrderListLoading.value,
waveStrategyQuickScanSubmitting: waveStrategyQuickScanSubmitting.value,
singleOrderSubmitting: singleOrderSubmitting.value
}))
const buttonDisabledMap = computed(() => ({
noSelection: selectionRows.value.length === 0
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value,
disabled: buttonDisabledMap.value
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
}
function resolveButtonDisabled(disabledKey?: string) {
if (!disabledKey) return false
return Boolean((buttonDisabledMap.value as Record<string, boolean>)[disabledKey])
}
function resolveButtonLabel(defaultLabel: string) {
return defaultLabel
}
const toolbarActionMap: Record<string, () => void> = {
loadData: () => {
void loadData()
},
resetFallbackOrderCondition: () => resetFallbackOrderCondition(),
openColumnConfigPanel: () => openColumnConfigPanel(),
submitWaveStrategyQuickScan: () => {
void submitWaveStrategyQuickScan()
},
submitFallbackOrderFetchByIds: () => {
void submitFallbackOrderFetchByIds()
}
}
const handleMouseDown = (e: MouseEvent) => {
if (!scrollContainerRef.value) return
isDragging.value = true
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
scrollLeft.value = scrollContainerRef.value.scrollLeft
}
const handleMouseMove = (e: MouseEvent) => {
if (!isDragging.value || !scrollContainerRef.value) return
e.preventDefault()
const x = e.pageX - scrollContainerRef.value.offsetLeft
const walk = (x - startX.value) * 1.5
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
}
const handleMouseUp = () => {
isDragging.value = false
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
const handler = toolbarActionMap[action]
if (!handler) return
safeInvoke(() => handler())
}
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
@ -722,26 +726,6 @@ onBeforeUnmount(() => {
color: var(--el-text-color-regular);
white-space: nowrap;
}
.toolbar-left {
cursor: grab;
&:active {
cursor: grabbing;
}
.toolbar-scroll-container {
display: flex;
align-items: center;
gap: 6px;
overflow-x: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
}
}
}
</style>

View File

@ -15,28 +15,15 @@
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left" @wheel="handleToolbarWheel">
<div
class="toolbar-scroll-container"
ref="scrollContainerRef"
@mousedown="handleMouseDown"
@mousemove="handleMouseMove"
@mouseup="handleMouseUp"
@mouseleave="handleMouseUp"
>
<el-button
v-for="button in toolbarButtons"
:key="button.key"
:size="button.size || 'small'"
:type="button.type"
:plain="button.plain"
:disabled="resolveButtonDisabled(button.disabledKey)"
:loading="resolveButtonLoading(button.loadingKey)"
@click="handleToolbarButtonClick(button.action)"
>
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
</el-button>
</div>
<div class="toolbar-left">
<order-toolbar-button-group
:buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<div class="toolbar-right">
<span class="toolbar-switch-label">仅待复核波次</span>
@ -838,7 +825,7 @@
<batch-receiving-print-dialog
v-model="outboundPrintDialogVisible"
:selection-rows="outboundPrintRows"
business-type="STOCKOUT"
business-type="OUTBOUND"
dialog-title="批量打印出库单"
queue-no-field="delivery_order_code"
document-label="出库单"
@ -863,6 +850,7 @@ import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import {
waveScanBoxConfig,
@ -979,7 +967,6 @@ const router = useRouter()
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const groupOrderTableRef = ref<any>(null)
const scrollContainerRef = ref<HTMLElement | null>(null)
const loading = ref(false)
const showInternalSourceWaves = ref(false)
const onlyTodoWaves = ref(false)
@ -1180,36 +1167,6 @@ function toggleDetailVisible() {
detailVisible.value = !detailVisible.value
}
const isDragging = ref(false)
const startX = ref(0)
const scrollLeft = ref(0)
const handleToolbarWheel = (e: WheelEvent) => {
if (scrollContainerRef.value) {
e.preventDefault()
scrollContainerRef.value.scrollLeft += e.deltaY
}
}
const handleMouseDown = (e: MouseEvent) => {
if (!scrollContainerRef.value) return
isDragging.value = true
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
scrollLeft.value = scrollContainerRef.value.scrollLeft
}
const handleMouseMove = (e: MouseEvent) => {
if (!isDragging.value || !scrollContainerRef.value) return
e.preventDefault()
const x = e.pageX - scrollContainerRef.value.offsetLeft
const walk = (x - startX.value) * 1.5
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
}
const handleMouseUp = () => {
isDragging.value = false
}
const buttonLoadingMap = computed(() => ({
loading: loading.value,
batchAutoGroupingLoading: batchAutoGroupingLoading.value,
@ -1241,6 +1198,14 @@ const buttonLabelMap = computed(() => ({
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value,
disabled: buttonDisabledMap.value,
labels: buttonLabelMap.value
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
@ -3893,26 +3858,6 @@ async function submitFallbackOrderFetchByIds() {
color: var(--el-text-color-regular);
white-space: nowrap;
}
.toolbar-left {
cursor: grab;
&:active {
cursor: grabbing;
}
.toolbar-scroll-container {
display: flex;
align-items: center;
gap: 6px;
overflow-x: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
}
}
}
</style>

View File

@ -15,28 +15,15 @@
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left" @wheel="handleToolbarWheel">
<div
class="toolbar-scroll-container"
ref="scrollContainerRef"
@mousedown="handleMouseDown"
@mousemove="handleMouseMove"
@mouseup="handleMouseUp"
@mouseleave="handleMouseUp"
>
<el-button
v-for="button in toolbarButtons"
:key="button.key"
:size="button.size || 'small'"
:type="button.type"
:plain="button.plain"
:disabled="resolveButtonDisabled(button.disabledKey)"
:loading="resolveButtonLoading(button.loadingKey)"
@click="handleToolbarButtonClick(button.action)"
>
{{ resolveButtonLabel(button.label, button.dynamicLabelKey) }}
</el-button>
</div>
<div class="toolbar-left">
<order-toolbar-button-group
:buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<div class="toolbar-right">
<span class="toolbar-switch-label">仅待复核波次</span>
@ -424,8 +411,8 @@
<batch-receiving-print-dialog
v-model="outboundPrintDialogVisible"
:selection-rows="outboundPrintRows"
business-type="STOCKOUT"
dialog-title="批量打印出库单"
business-type="OUTBOUND"
dialog-title="打印货单"
queue-no-field="delivery_order_code"
document-label="出库单"
hide-business-type-select
@ -460,6 +447,7 @@ import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import {
waveScanBoxConfig,
@ -547,7 +535,6 @@ const router = useRouter()
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const groupOrderTableRef = ref<any>(null)
const scrollContainerRef = ref<HTMLElement | null>(null)
const loading = ref(false)
const showInternalSourceWaves = ref(false)
const onlyTodoWaves = ref(false)
@ -681,36 +668,6 @@ function toggleDetailVisible() {
detailVisible.value = !detailVisible.value
}
const isDragging = ref(false)
const startX = ref(0)
const scrollLeft = ref(0)
const handleToolbarWheel = (e: WheelEvent) => {
if (scrollContainerRef.value) {
e.preventDefault()
scrollContainerRef.value.scrollLeft += e.deltaY
}
}
const handleMouseDown = (e: MouseEvent) => {
if (!scrollContainerRef.value) return
isDragging.value = true
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
scrollLeft.value = scrollContainerRef.value.scrollLeft
}
const handleMouseMove = (e: MouseEvent) => {
if (!isDragging.value || !scrollContainerRef.value) return
e.preventDefault()
const x = e.pageX - scrollContainerRef.value.offsetLeft
const walk = (x - startX.value) * 1.5
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
}
const handleMouseUp = () => {
isDragging.value = false
}
const buttonLoadingMap = computed(() => ({
loading: loading.value,
batchAutoGroupingLoading: batchAutoGroupingLoading.value,
@ -735,11 +692,19 @@ const buttonDisabledMap = computed(() => ({
const buttonLabelMap = computed(() => ({
batchPrintTotal: `批量打印(${selectedWaveOrderTotal.value})`,
batchOutboundPrintTotal: `批量打印出库单(${selectedWaveOrderTotal.value})`,
batchOutboundPrintTotal: `打印货单(${printableSelectionRows.value.length})`,
batchPlatformPrintTotal: `批量打印(平台)(${selectedWaveOrderTotal.value})`,
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value,
disabled: buttonDisabledMap.value,
labels: buttonLabelMap.value
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
@ -2612,26 +2577,6 @@ async function submitGroupOrderDialog() {
color: var(--el-text-color-regular);
white-space: nowrap;
}
.toolbar-left {
cursor: grab;
&:active {
cursor: grabbing;
}
.toolbar-scroll-container {
display: flex;
align-items: center;
gap: 6px;
overflow-x: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
}
}
}
</style>

View File

@ -15,28 +15,15 @@
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left" @wheel="handleToolbarWheel">
<div
class="toolbar-scroll-container"
ref="scrollContainerRef"
@mousedown="handleMouseDown"
@mousemove="handleMouseMove"
@mouseup="handleMouseUp"
@mouseleave="handleMouseUp"
>
<el-button
v-for="btn in pickTaskWaveToolbarButtons"
:key="btn.key"
:size="btn.size || 'small'"
:type="btn.type"
:plain="btn.plain"
:disabled="resolvePickToolbarDisabled(btn)"
:loading="resolvePickToolbarLoading(btn)"
@click="handlePickToolbarClick(btn.key)"
>
{{ resolvePickToolbarLabel(btn) }}
</el-button>
</div>
<div class="toolbar-left">
<order-toolbar-button-group
:buttons="pickTaskWaveToolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<div class="toolbar-right">
<span class="toolbar-switch-label">{{ pickTaskWaveListDefaults.toolbarHint }}</span>
@ -307,6 +294,9 @@
import { computed, onMounted, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import { safeInvoke } from '@/utils/safe-invoke'
import { useUserStore } from '@/stores/modules/user'
import {
orderWaveWavePickTaskCancel,
@ -330,9 +320,7 @@ import {
formatPickTaskSource,
getPickTaskStatusTagType,
getPickTaskReviewStatusTagType,
getPickTaskSourceTagType,
type PickTaskWaveToolbarButton,
type PickTaskWaveToolbarKey
getPickTaskSourceTagType
} from './config/wave-config'
const props = withDefaults(
@ -352,11 +340,7 @@ const emptyText = ref(pickTaskWaveListDefaults.emptyText)
const scanBox = ref<any>(null)
const presetTree = ref<unknown[]>([])
const splitStackRef = ref<HTMLElement | null>(null)
const scrollContainerRef = ref<HTMLElement | null>(null)
const queryTime = ref(0)
const isDragging = ref(false)
const startX = ref(0)
const scrollLeft = ref(0)
const cancelingTaskId = ref<number | string | null>(null)
const batchCancelLoading = ref(false)
const selectedTaskRows = ref<Array<Record<string, any>>>([])
@ -449,30 +433,56 @@ const taskDetailViewJson = computed(() => {
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
const handleToolbarWheel = (e: WheelEvent) => {
if (scrollContainerRef.value) {
e.preventDefault()
scrollContainerRef.value.scrollLeft += e.deltaY
const buttonLoadingMap = computed(() => ({
batchCancelLoading: batchCancelLoading.value
}))
const buttonDisabledMap = computed(() => ({
noSelection: selectedTaskRows.value.length === 0
}))
const buttonLabelMap = computed(() => ({
batchCancelTotal: `批量取消任务(${selectedTaskRows.value.length})`
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value,
disabled: buttonDisabledMap.value,
labels: buttonLabelMap.value
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
}
function resolveButtonDisabled(disabledKey?: string) {
if (!disabledKey) return false
return Boolean((buttonDisabledMap.value as Record<string, boolean>)[disabledKey])
}
function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
if (!dynamicLabelKey) return defaultLabel
return (buttonLabelMap.value as Record<string, string>)[dynamicLabelKey] || defaultLabel
}
const toolbarActionMap: Record<string, () => void> = {
loadData: () => {
void loadData()
},
handleSearch: () => handleSearch(),
openDetailQueryDialog: () => openDetailQueryDialog(),
handleBatchCancelTasks: () => {
void handleBatchCancelTasks()
}
}
const handleMouseDown = (e: MouseEvent) => {
if (!scrollContainerRef.value) return
isDragging.value = true
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
scrollLeft.value = scrollContainerRef.value.scrollLeft
}
const handleMouseMove = (e: MouseEvent) => {
if (!isDragging.value || !scrollContainerRef.value) return
e.preventDefault()
const x = e.pageX - scrollContainerRef.value.offsetLeft
const walk = (x - startX.value) * 1.5
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
}
const handleMouseUp = () => {
isDragging.value = false
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
const handler = toolbarActionMap[action]
if (!handler) return
safeInvoke(() => handler())
}
/**
@ -572,42 +582,6 @@ function toIdFilterValue(value: unknown): number | string | undefined {
return numeric !== undefined ? numeric : text
}
function resolvePickToolbarDisabled(btn: PickTaskWaveToolbarButton): boolean {
if (btn.key === 'batchCancel') return selectedTaskRows.value.length === 0
return false
}
function resolvePickToolbarLoading(btn: PickTaskWaveToolbarButton): boolean {
if (btn.key === 'batchCancel') return batchCancelLoading.value
return false
}
function resolvePickToolbarLabel(btn: PickTaskWaveToolbarButton): string {
if (btn.key === 'batchCancel') {
return `${btn.label}(${selectedTaskRows.value.length})`
}
return btn.label
}
function handlePickToolbarClick(key: PickTaskWaveToolbarKey) {
switch (key) {
case 'search':
handleSearch()
break
case 'detailQuery':
openDetailQueryDialog()
break
case 'batchCancel':
void handleBatchCancelTasks()
break
case 'refresh':
void loadData()
break
default:
break
}
}
function toNumber(value: unknown, fallback = 0): number {
const num = Number(value)
return Number.isFinite(num) ? num : fallback
@ -1048,26 +1022,6 @@ onMounted(() => {
color: var(--el-text-color-regular);
white-space: nowrap;
}
.toolbar-left {
cursor: grab;
&:active {
cursor: grabbing;
}
.toolbar-scroll-container {
display: flex;
align-items: center;
gap: 6px;
overflow-x: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
}
}
}

View File

@ -15,28 +15,24 @@
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left" @wheel="handleToolbarWheel">
<div
class="toolbar-scroll-container"
ref="scrollContainerRef"
@mousedown="handleMouseDown"
@mousemove="handleMouseMove"
@mouseup="handleMouseUp"
@mouseleave="handleMouseUp"
>
<el-button type="primary" size="small" :loading="loading" @click="loadData">刷新</el-button>
<el-button size="small" @click="openColumnConfigPanel">字段设置</el-button>
<el-button type="success" size="small" @click="openCreateWaveStrategyDialog">新建策略</el-button>
<el-switch
v-model="showWaveStrategyNextFetchOrderCount"
size="small"
active-text="显示下一波抓取数量"
inactive-text="隐藏下一波抓取数量"
@change="handleWaveStrategyNextFetchOrderCountChange"
/>
</div>
<div class="toolbar-left">
<order-toolbar-button-group
:buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<div class="toolbar-right">
<el-switch
v-model="showWaveStrategyNextFetchOrderCount"
size="small"
active-text="显示下一波抓取数量"
inactive-text="隐藏下一波抓取数量"
@change="handleWaveStrategyNextFetchOrderCountChange"
/>
<span class="toolbar-switch-label">当前仓库波次策略(wms_wave_strategy)</span>
</div>
</div>
@ -340,12 +336,15 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import {
waveScanBoxConfig,
waveStrategyAvailableFields,
waveStrategyColumns,
waveStrategyFormRules,
waveBooleanOptions
waveBooleanOptions,
waveStrategyToolbarButtons
} from './config/wave-config'
import { safeInvoke } from '@/utils/safe-invoke'
import * as indexApi from '@/api/index/index'
@ -374,7 +373,6 @@ const props = withDefaults(defineProps<{
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const scrollContainerRef = ref<HTMLElement | null>(null)
const loading = ref(false)
const queryTime = ref(0)
const tableSize = ref('small')
@ -438,34 +436,43 @@ const filteredColumns = computed(() => {
return list.value.filter((row: any) => matchWaveStrategy(row, where))
})
const isDragging = ref(false)
const startX = ref(0)
const scrollLeft = ref(0)
const toolbarButtons = waveStrategyToolbarButtons
const handleToolbarWheel = (e: WheelEvent) => {
if (scrollContainerRef.value) {
e.preventDefault()
scrollContainerRef.value.scrollLeft += e.deltaY
}
const buttonLoadingMap = computed(() => ({
loading: loading.value
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
}
const handleMouseDown = (e: MouseEvent) => {
if (!scrollContainerRef.value) return
isDragging.value = true
startX.value = e.pageX - scrollContainerRef.value.offsetLeft
scrollLeft.value = scrollContainerRef.value.scrollLeft
function resolveButtonDisabled() {
return false
}
const handleMouseMove = (e: MouseEvent) => {
if (!isDragging.value || !scrollContainerRef.value) return
e.preventDefault()
const x = e.pageX - scrollContainerRef.value.offsetLeft
const walk = (x - startX.value) * 1.5
scrollContainerRef.value.scrollLeft = scrollLeft.value - walk
function resolveButtonLabel(defaultLabel: string) {
return defaultLabel
}
const handleMouseUp = () => {
isDragging.value = false
const toolbarActionMap: Record<string, () => void> = {
loadData: () => {
void loadData()
},
openColumnConfigPanel: () => openColumnConfigPanel(),
openCreateWaveStrategyDialog: () => openCreateWaveStrategyDialog()
}
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
const handler = toolbarActionMap[action]
if (!handler) return
safeInvoke(() => handler())
}
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
@ -1092,26 +1099,6 @@ onMounted(() => {
color: var(--el-text-color-regular);
white-space: nowrap;
}
.toolbar-left {
cursor: grab;
&:active {
cursor: grabbing;
}
.toolbar-scroll-container {
display: flex;
align-items: center;
gap: 6px;
overflow-x: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
}
}
}
</style>

View File

@ -27,18 +27,14 @@
>
移出波次
</el-button>
<el-button
v-for="button in toolbarButtons"
:key="button.key"
:size="button.size || 'small'"
:type="button.type"
:plain="button.plain"
:disabled="resolveButtonDisabled(button.disabledKey)"
:loading="resolveButtonLoading(button.loadingKey)"
@click="handleToolbarButtonClick(button.action)"
>
{{ button.label }}
</el-button>
<order-toolbar-button-group
:buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<div class="pending-order-panel__toolbar-right">
@ -161,6 +157,7 @@ import * as indexApi from '@/api/index/index'
import AllocateExpressForm from '@/views/order/orderManagement/form/AllocateExpressForm.vue'
import StorageAllocateForm from '@/views/order/orderManagement/form/StorageAllocateForm.vue'
import SyncOrderIdsForm from '@/views/order/orderManagement/form/SyncOrderIdsForm.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import { createPendingToolbarController } from '@/views/order/orderManagement/utils/toolbar-actions'
import { buildOrderWhereConditions, sanitizeOrderListWhere } from '@/views/order/orderManagement/utils/order-index-helpers'
import {
@ -394,6 +391,22 @@ function resolveButtonDisabled(disabledKey?: string) {
return Boolean(disabledMap[disabledKey])
}
function resolveButtonLabel(defaultLabel: string) {
return defaultLabel
}
const toolbarLayoutKey = computed(() =>
JSON.stringify({
disabled: { hasNoSelection: !hasSelection.value },
loading: {
actionLoading: actionLoading.value,
storageAllocateLoading: storageAllocateLoading.value,
allocateLoading: allocateLoading.value,
syncOrderIdsLoading: syncOrderIdsLoading.value
}
})
)
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
const handler = actionMap[action]
if (!handler) return
@ -572,10 +585,12 @@ async function loadStoreOptions() {
}
.pending-order-panel__toolbar-left {
flex: 1;
min-width: 0;
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 8px;
overflow: hidden;
}
.pending-order-panel__toolbar-right {

View File

@ -59,22 +59,22 @@ export const waveAvailableFields = [
},
{label:'库位分配', value: 'storage_assignment_status', type: 'select', options: [
{ label: '未分配', value: '未分配' },
{ label: '部分分配', value: '部分分配' },
// { label: '部分分配', value: '部分分配' },
{ label: '已分配', value: '已分配' },
]},
{ label:'快递分配', value: 'express_assignment_status', type: 'select', options: [
{ label: '未分配', value: 'unassigned' },
{ label: '部分分配', value: 'partially_assigned' },
// { label: '部分分配', value: 'partially_assigned' },
{ label: '已分配', value: 'assigned' },
]},
{ label:'打印状态', value: 'print_assignment_status', type: 'select', options: [
{ label: '未打印', value: 'unprinted' },
{ label: '部分打印', value: 'partially_printed' },
// { label: '部分打印', value: 'partially_printed' },
{ label: '已打印', value: 'printed' },
]},
{ label: '复核状态', value: 'review_assignment_status', type: 'select', options: [
{ label: '未复核', value: 'unreviewed' },
{ label: '部分复核', value: 'partially_reviewed' },
// { label: '部分复核', value: 'partially_reviewed' },
{ label: '已复核', value: 'reviewed' },
]},
{ label: '创建人', value: 'creator', type: 'text' },
@ -327,6 +327,17 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
action: 'handleBatchPrint',
onlyForWaveType: 1
},
{
key: 'batchOutboundPrint',
label: '打印货单(0)',
dynamicLabelKey: 'batchOutboundPrintTotal',
type: 'info',
size: 'small',
disabledKey: 'batchOutboundPrintDisabled',
loadingKey: 'batchOutboundPrintLoading',
action: 'handleBatchOutboundPrint',
onlyForWaveType: 2
},
{
key: 'batchPlatformPrint',
label: '批量打印(平台)(0)',
@ -338,17 +349,6 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [
loadingKey: 'batchPlatformPrintLoading',
action: 'handleBatchPlatformPrint'
},
{
key: 'batchOutboundPrint',
label: '批量打印出库单(0)',
dynamicLabelKey: 'batchOutboundPrintTotal',
type: 'info',
plain: true,
size: 'small',
disabledKey: 'batchOutboundPrintDisabled',
loadingKey: 'batchOutboundPrintLoading',
action: 'handleBatchOutboundPrint'
},
{
key: 'printerComponentConnection',
label: '打印组件连接',
@ -701,23 +701,52 @@ export const pickTaskWaveDetailDialogDefaults = {
width: '920px'
}
export type PickTaskWaveToolbarKey = 'search' | 'detailQuery' | 'batchCancel' | 'refresh'
/** 拣货任务页工具栏按钮(action 与 WavePickTaskListPanel 内 toolbarActionMap 键一致) */
export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', size: 'small', action: 'loadData' },
{ key: 'search', label: '查询', type: 'primary', size: 'small', action: 'handleSearch' },
{ key: 'detailQuery', label: '按任务ID查详情', size: 'small', action: 'openDetailQueryDialog' },
{
key: 'batchCancel',
label: '批量取消任务',
dynamicLabelKey: 'batchCancelTotal',
type: 'danger',
size: 'small',
loadingKey: 'batchCancelLoading',
disabledKey: 'noSelection',
action: 'handleBatchCancelTasks'
}
]
export type PickTaskWaveToolbarButton = {
key: PickTaskWaveToolbarKey
label: string
type?: 'primary' | 'success' | 'warning' | 'danger' | 'info' | ''
plain?: boolean
size?: 'small' | 'default' | 'large'
}
/** 不符合波次策略订单页工具栏按钮 */
export const fallbackOrderToolbarButtons: ToolbarButtonConfig[] = [
{ key: 'search', label: '查询', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' },
{ key: 'reset', label: '重置', size: 'small', action: 'resetFallbackOrderCondition' },
{ key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' },
{
key: 'quickScan',
label: '快速扫描',
type: 'warning',
size: 'small',
loadingKey: 'waveStrategyQuickScanSubmitting',
action: 'submitWaveStrategyQuickScan'
},
{
key: 'fetchByIds',
label: '按订单IDs抓取删单',
type: 'warning',
size: 'small',
loadingKey: 'singleOrderSubmitting',
disabledKey: 'noSelection',
action: 'submitFallbackOrderFetchByIds'
}
]
/** 工具栏按钮顺序与类型(与散单页工具条同一套间距/滚动行为) */
export const pickTaskWaveToolbarButtons: PickTaskWaveToolbarButton[] = [
{ key: 'refresh', label: '刷新', size: 'small' },
{ key: 'search', label: '查询', type: 'primary', size: 'small' },
{ key: 'detailQuery', label: '按任务ID查详情', size: 'small' },
{ key: 'batchCancel', label: '批量取消任务', type: 'danger', size: 'small' },
/** 波次策略页工具栏按钮 */
export const waveStrategyToolbarButtons: ToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' },
{ key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' },
{ key: 'create', label: '新建策略', type: 'success', size: 'small', action: 'openCreateWaveStrategyDialog' }
]
/** 拣货任务 status 枚举(与 wavePickTaskList / wavePickTaskCancel 文档一致) */

View File

@ -18,106 +18,33 @@
<!-- 工具栏 -->
<div class="toolbar">
<div class="toolbar-left">
<el-button-group class="toolbar-btn-group">
<el-button
type="primary"
size="small"
:icon="Refresh"
@click="handleRefresh"
title="刷新"
:loading="loading"
>
刷新
<order-toolbar-button-group
:buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
<el-dropdown
v-if="hasPermission('stock.saveWarehouseStock')"
@command="handleBatchChange"
>
<el-button type="primary" :disabled="!hasSelection" size="small">
批量修改<el-icon class="el-icon--right"><ArrowDown /></el-icon>
</el-button>
<template v-if="hasPermission('stock.saveWarehouseStock')">
<el-button
type="primary"
size="small"
:icon="Plus"
@click="handleAdd"
title="添加商品"
>
添加
</el-button>
<el-button
type="danger"
size="small"
:icon="Delete"
@click="confirmBatchDelete"
title="批量删除"
:disabled="!hasSelection"
>
批量删除
</el-button>
<el-dropdown v-if="hasPermission('stock.saveWarehouseStock')" @command="handleBatchChange">
<el-button type="primary" :disabled="!hasSelection" size="small">
<el-icon><Edit /></el-icon>
批量修改<el-icon class="el-icon--right"><ArrowDown /></el-icon>
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="stock_unit">库存单位</el-dropdown-item>
<el-dropdown-item command="brand_name">品牌</el-dropdown-item>
<el-dropdown-item command="prohibited_id">违禁品类型</el-dropdown-item>
<el-dropdown-item command="gross_weight">毛重</el-dropdown-item>
<el-dropdown-item command="packing_requirements">打包要求</el-dropdown-item>
<el-dropdown-item command="managementFlags">管理标识</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="stock_unit">库存单位</el-dropdown-item>
<el-dropdown-item command="brand_name">品牌</el-dropdown-item>
<el-dropdown-item command="prohibited_id">违禁品类型</el-dropdown-item>
<el-dropdown-item command="gross_weight">毛重</el-dropdown-item>
<el-dropdown-item command="packing_requirements">打包要求</el-dropdown-item>
<el-dropdown-item command="managementFlags">管理标识</el-dropdown-item>
</el-dropdown-menu>
</template>
<el-button
size="small"
type="warning"
@click="handleClearData"
title="清空当前筛选数据"
>
清空数据
</el-button>
<el-button
v-if="hasPermission('warehouseExport')"
type="success"
size="small"
:icon="Download"
@click="handleExport"
title="导出"
:loading="exportLoading"
>
导出
</el-button>
<el-button
size="small"
type="primary"
plain
:icon="Upload"
@click="openImportDialog"
title="导入"
>
导入
</el-button>
<el-button
size="small"
@click="openColumnConfigPanel"
title="字段设置"
>
字段设置
</el-button>
<el-button
size="small"
@click="toggleDetailVisible"
:title="detailVisible ? '隐藏详情' : '显示详情'"
>
{{ detailVisible ? '隐藏详情' : '显示详情' }}
</el-button>
</el-button-group>
</el-dropdown>
</div>
<div class="toolbar-right">
@ -305,13 +232,14 @@
import { ref, reactive, computed, onMounted, onBeforeUnmount, shallowRef, markRaw } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import {
Refresh, Plus, Delete, DeleteFilled, Edit, Download, Upload,
ArrowDown, User, InfoFilled
DeleteFilled, ArrowDown, User, InfoFilled
} from '@element-plus/icons-vue'
// Components
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import Info from './component/info.vue'
import Images from '@/components/ImagesUpload/index.vue'
import ErpStock from './component/erpStock.vue'
@ -321,7 +249,7 @@ import Log from './component/log.vue'
import Add from './component/add.vue'
import Recycle from './component/recycle.vue'
import ImportDialog from './component/ImportDialog.vue'
import { stockColumns, availableFields as stockAvailableFields, stockBatchConfig } from './stock-config'
import { stockColumns, availableFields as stockAvailableFields, stockBatchConfig, stockToolbarButtons } from './stock-config'
// API
import * as stockApi from '@/api/stock/stock'
@ -333,6 +261,7 @@ import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
// Utils
import { parseTime } from '@/utils/index'
import { buildStockQuery } from '@/utils/stockQueryBuilder'
import { safeInvoke } from '@/utils/safe-invoke'
// import { labelInner } from 'echarts/types/src/label/labelStyle.js'
const userStore = useUserStore()
@ -451,6 +380,69 @@ const availableFields = reactive(JSON.parse(JSON.stringify(stockAvailableFields)
const hasSelection = computed(() => selectionIds.value.length > 0)
const toolbarButtons = computed(() =>
stockToolbarButtons.filter((button) => {
if (!button.permissionKey) return true
return hasPermission(button.permissionKey)
})
)
const buttonLoadingMap = computed(() => ({
loading: loading.value,
exportLoading: exportLoading.value
}))
const buttonDisabledMap = computed(() => ({
hasNoSelection: !hasSelection.value
}))
const buttonLabelMap = computed(() => ({
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value,
disabled: buttonDisabledMap.value,
labels: buttonLabelMap.value,
permissions: toolbarButtons.value.map((button) => button.key).join(',')
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
}
function resolveButtonDisabled(disabledKey?: string) {
if (!disabledKey) return false
return Boolean((buttonDisabledMap.value as Record<string, boolean>)[disabledKey])
}
function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
if (!dynamicLabelKey) return defaultLabel
return (buttonLabelMap.value as Record<string, string>)[dynamicLabelKey] || defaultLabel
}
const toolbarActionMap: Record<string, () => void> = {
loadData: () => {
handleRefresh()
},
handleAdd: () => handleAdd(),
confirmBatchDelete: () => confirmBatchDelete(),
handleClearData: () => handleClearData(),
handleExport: () => handleExport(),
openImportDialog: () => openImportDialog(),
openColumnConfigPanel: () => openColumnConfigPanel(),
toggleDetailVisible: () => toggleDetailVisible()
}
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
const handler = toolbarActionMap[action]
if (!handler) return
safeInvoke(() => handler())
}
const batchDialogTitle = computed(() => {
const config = (batchConfig as any)[batchDialogCommand.value]
return config?.title ? `批量修改${config.title}` : '批量修改'
@ -965,12 +957,33 @@ function formatDateTime(value: string | number | null | undefined) {
overflow: hidden;
.toolbar {
padding: 5px;
border-bottom: 1px solid #ebeef5;
margin-bottom: 3px;
padding: 6px 10px;
border: 1px solid #ebeef5;
display: flex;
justify-content: space-between;
align-items: center;
background-color: #fff;
min-width: 0;
overflow: hidden;
.toolbar-left {
flex: 1;
min-width: 0;
display: flex;
align-items: center;
gap: 10px;
overflow: hidden;
}
.toolbar-right {
flex: 0 0 auto;
margin-left: 10px;
display: flex;
align-items: center;
justify-content: flex-end;
gap: 10px;
}
}
.upper-wrapper {

View File

@ -1,3 +1,4 @@
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
// 格式化数字
const formatNumber = (num: any, digits = 0) => {
@ -246,6 +247,12 @@ export const availableFields = [
label: '是否有图片',
type: 'boolean',
},
{
value: 'has_bound_item',
label: '外部商品绑定',
type: 'boolean',
placeholder: '请选择是否已绑定外部商品'
},
{
value: 'item_code',
label: '商品编码',
@ -485,3 +492,48 @@ export const stockFormRules = {
}
]
}
/** 商品列表主工具栏按钮(action 与 stock/index.vue 内 toolbarActionMap 键一致) */
export type StockToolbarButtonConfig = ToolbarButtonConfig & {
permissionKey?: string
}
export const stockToolbarButtons: StockToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' },
{
key: 'add',
label: '添加',
type: 'primary',
size: 'small',
permissionKey: 'stock.saveWarehouseStock',
action: 'handleAdd'
},
{
key: 'batchDelete',
label: '批量删除',
type: 'danger',
size: 'small',
permissionKey: 'stock.saveWarehouseStock',
disabledKey: 'hasNoSelection',
action: 'confirmBatchDelete'
},
{ key: 'clearData', label: '清空数据', type: 'warning', size: 'small', action: 'handleClearData' },
{
key: 'export',
label: '导出',
type: 'success',
size: 'small',
permissionKey: 'warehouseExport',
loadingKey: 'exportLoading',
action: 'handleExport'
},
{ key: 'import', label: '导入', type: 'primary', plain: true, size: 'small', action: 'openImportDialog' },
{ key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' },
{
key: 'toggleDetail',
label: '显示详情',
dynamicLabelKey: 'detailToggleLabel',
size: 'small',
action: 'toggleDetailVisible'
}
]

View File

@ -19,7 +19,7 @@
<el-button size="small" type="primary" @click="loadData">刷新</el-button>
<!-- <el-button size="small" @click="handleCreateEntry">新建入库单</el-button> -->
<el-button size="small" :disabled="!hasSelection" @click="confirmBatchCancel">批量作废</el-button>
<el-button size="small" :loading="exportLoading" @click="handleExport">导出</el-button>
<el-button size="small" :disabled="!hasSelection" :loading="exportLoading" @click="handleExport">导出</el-button>
<el-button size="small" @click="handleImport">导入</el-button>
<el-button size="small" @click="openColumnConfigPanel">字段设置</el-button>
<el-button size="small" @click="toggleDetailVisible">{{ detailVisible ? '隐藏详情' : '显示详情' }}</el-button>
@ -95,12 +95,32 @@
<template #column-is_batch_mgmt_enabled="{ row }">
<div style="text-align:center">
<el-tag :type="(row.is_batch_mgmt_enabled === true || String(row.is_batch_mgmt_enabled).toLowerCase() === 'y' || String(row.is_batch_mgmt_enabled) === '1') ? 'success' : 'info'" size="small">
{{ (row.is_batch_mgmt_enabled === true || String(row.is_batch_mgmt_enabled).toLowerCase() === 'y' || String(row.is_batch_mgmt_enabled) === '1') ? '是' : '否' }}
<el-tag :type="isInventoryFlagEnabled(row.is_batch_mgmt_enabled) ? 'success' : 'info'" size="small">
{{ formatInventoryFlagLabel(row.is_batch_mgmt_enabled) }}
</el-tag>
</div>
</template>
<template #column-is_shelf_life_mgmt="{ row }">
<div style="text-align:center">
<el-tag :type="isInventoryFlagEnabled(row.is_shelf_life_mgmt) ? 'success' : 'info'" size="small">
{{ formatInventoryFlagLabel(row.is_shelf_life_mgmt) }}
</el-tag>
</div>
</template>
<template #column-remaining_threshold_days="{ row }">
<span>{{ formatInventoryOptionalText(row.remaining_threshold_days) }}</span>
</template>
<template #column-first_inbound_time="{ row }">
<span>{{ row.first_inbound_time || '--' }}</span>
</template>
<template #column-inventory_type="{ row }">
<span>{{ formatInventoryTypeLabel(row.inventory_type) }}</span>
</template>
<template #column-batch_count="{ row }">
<div style="text-align:center">{{ row.batch_count || 0 }}</div>
</template>
@ -174,8 +194,15 @@ import * as inventoryApi from '@/api/storage.inventory/inventory'
import {
availableFields,
formatInventorySpaceLabel,
formatInventoryBarcodes,
formatInventoryFlagLabel,
formatInventoryOptionalText,
formatInventoryTypeLabel,
inventoryExportColumns,
isInventoryFlagEnabled,
productstockColums,
} from './inventory-config'
import { exportUpperTableRows } from '@/views/order/orderManagement/utils/export'
import entrydetail from './component/panelstockdetail.vue'
import log from './component/log.vue'
@ -328,6 +355,9 @@ async function loadData() {
stock_id: item.stock_id,
item_code: item.stock?.item_code || '',
item_name: item.stock?.item_name || '',
barcodes: formatInventoryBarcodes(item.stock?.barcodes),
sku_property: formatInventoryOptionalText(item.stock?.sku_property),
stock_unit: formatInventoryOptionalText(item.stock?.stock_unit),
batch_no: item.batch_no || item.batch?.batch_no || '',
production_date: item.production_date || item.batch?.production_date || '',
expiry_date: item.expiry_date || item.batch?.expiry_date || '',
@ -341,8 +371,11 @@ async function loadData() {
quantity: item.quantity,
available_quantity: item.available_quantity,
locked_quantity: item.locked_quantity,
first_inbound_time: item.first_inbound_time || '',
last_inbound_time: item.last_inbound_time,
batch_count: Number(item.batch_count || 0),
is_shelf_life_mgmt: item.stock?.is_shelf_life_mgmt ?? '',
remaining_threshold_days: item.stock?.remaining_threshold_days ?? '',
is_batch_mgmt_enabled: item.stock?.is_batch_mgmt_enabled,
inventory_warning_level: item.inventory_warning_level || '',
inventory_warning_color: item.inventory_warning_color || '',
@ -513,11 +546,30 @@ async function confirmBatchCancel() {
}
async function handleExport() {
if (!selectionRows.value.length) {
ElMessage.warning('请先勾选要导出的库存')
return
}
exportLoading.value = true
setTimeout(() => {
exportLoading.value = false
try {
exportUpperTableRows({
rows: selectionRows.value,
columns: inventoryExportColumns,
fileName: `库存列表-${Date.now()}.xlsx`,
transformCell: (prop, value) => {
if (prop === 'is_shelf_life_mgmt') return formatInventoryFlagLabel(value)
if (prop === 'remaining_threshold_days') return formatInventoryOptionalText(value)
if (prop === 'inventory_type') return formatInventoryTypeLabel(value)
return value
}
})
ElMessage.success('导出成功')
}, 1000)
} catch (e) {
console.error('导出 Excel 失败:', e)
ElMessage.error('导出失败')
} finally {
exportLoading.value = false
}
}
function handleImport() {

View File

@ -33,21 +33,128 @@ export function formatInventorySpaceLabel(space?: Record<string, any> | null, fa
return name || fallback
}
/** 解析商品条码并过滤空值 */
export function normalizeInventoryBarcodesList(value: unknown): string[] {
if (value === null || value === undefined || value === '') return []
if (Array.isArray(value)) {
return value
.map((item) => String(item ?? '').trim())
.filter(Boolean)
}
if (typeof value === 'string') {
const text = value.trim()
if (!text || text === '[""]' || text === '[]') return []
if (text.startsWith('[') && text.endsWith(']')) {
try {
const parsed = JSON.parse(text)
if (Array.isArray(parsed)) {
return parsed
.map((item) => String(item ?? '').trim())
.filter(Boolean)
}
} catch {
// ignore invalid json
}
}
if (text.includes('|')) {
return text.split('|').map((item) => item.trim()).filter(Boolean)
}
return [text]
}
const text = String(value).trim()
return text ? [text] : []
}
/** 商品条码展示:数组用 | 连接,忽略空条码 */
export function formatInventoryBarcodes(value: unknown): string {
const items = normalizeInventoryBarcodesList(value)
return items.length ? items.join('|') : '--'
}
/** 是否类字段(Y/N、0/1、boolean)转是/否 */
export function isInventoryFlagEnabled(value: unknown): boolean {
return value === true || String(value).toLowerCase() === 'y' || String(value) === '1'
}
export function formatInventoryFlagLabel(value: unknown): string {
if (value === null || value === undefined || value === '') return '--'
return isInventoryFlagEnabled(value) ? '是' : '否'
}
export function formatInventoryOptionalText(value: unknown): string {
if (value === null || value === undefined || value === '') return '--'
return String(value)
}
const inventoryTypeLabelMap: Record<string, string> = {
ZP: '正品',
CC: '次品',
JS: '机损',
XS: '箱损',
ZT: '在途',
DJ: '冻结',
FP: '分配'
}
export function formatInventoryTypeLabel(value: unknown): string {
const key = String(value ?? '').trim()
if (!key) return '--'
return inventoryTypeLabelMap[key] || key
}
const inventoryBarcodesColumn = {
prop: 'barcodes',
label: '商品条码',
width: '150',
showOverflowTooltip: true
}
/** 库存列表选中导出列 */
export const inventoryExportColumns = [
{ prop: 'store_name', label: '货主' },
{ prop: 'item_code', label: '商品编码' },
{ prop: 'item_name', label: '商品名称' },
{ ...inventoryBarcodesColumn },
{ prop: 'sku_property', label: '规格' },
{ prop: 'stock_unit', label: '单位' },
{ prop: 'space_code', label: '库位名称' },
{ prop: 'space_id', label: '库位ID' },
{ prop: 'inventory_type', label: '库存类型' },
{ prop: 'quantity', label: '总数量' },
{ prop: 'available_quantity', label: '可用数量' },
{ prop: 'locked_quantity', label: '锁定数量' },
{ prop: 'batch_count', label: '批次数' },
{ prop: 'first_inbound_time', label: '首次入库时间' },
{ prop: 'last_inbound_time', label: '最后入库时间' },
{ prop: 'is_shelf_life_mgmt', label: '保质期管理' },
{ prop: 'remaining_threshold_days', label: '临期阈值(天)' }
]
export const productstockColums = [
{ prop: 'stock_id', label: '商品ID', width: '100' },
{ prop: 'item_code', label: '商品编码', width: '150' },
{ prop: 'item_name', label: '商品名称', width: '200' },
{ ...inventoryBarcodesColumn },
{ prop: 'sku_property', label: '规格', width: '140', showOverflowTooltip: true },
{ prop: 'stock_unit', label: '单位', width: '80' },
{ prop: 'production_date', label: '生产日期', width: '120' },
{ prop: 'expiry_date', label: '到期日期', width: '120' },
{ prop: 'shelf_life_days', label: '保质期', width: '100' },
{ prop: 'sale_ban_period', label: '禁售期', width: '110' },
{ prop: 'space_code', label: '库位名称', width: '150' },
{ prop: 'space_id', label: '库位ID', width: '90' },
{ prop: 'store_name', label: '货主', width: '120' },
{ prop: 'inventory_type', label: '库存类型', width: '100' },
{ prop: 'quantity', label: '总数量', width: '100' },
{ prop: 'available_quantity', label: '可用数量', width: '100' },
{ prop: 'locked_quantity', label: '锁定数量', width: '100' },
{ prop: 'first_inbound_time', label: '首次入库时间', width: '160' },
{ prop: 'last_inbound_time', label: '最后入库时间', width: '160' },
{ prop: 'is_shelf_life_mgmt', label: '保质期管理', width: '100' },
{ prop: 'remaining_threshold_days', label: '临期阈值(天)', width: '110' },
{ prop: 'is_batch_mgmt_enabled', label: '批次管理', width: '100' },
{ prop: 'batch_count', label: '批次数', width: '80' }
]

View File

@ -8,33 +8,15 @@
<div class="main-content">
<div class="toolbar">
<div class="toolbar-left">
<el-button size="small" type="primary" @click="loadData">刷新</el-button>
<el-button size="small" type="primary" @click="handleCreateReceiving">添加收货单</el-button>
<!-- <el-button type="success" size="small" icon="el-icon-delete" @click="confirmcomplete" title="入库单入库"
:disabled="!hasSelection" class="toolbar-btn">
入库单入库
</el-button> -->
<el-button size="small" :loading="exportLoading" @click="handleExport">导出</el-button>
<el-button size="small" @click="openColumnConfigPanel">字段设置</el-button>
<el-button size="small" @click="toggleDetailVisible">{{ detailVisible ? '隐藏详情' : '显示详情' }}</el-button>
<el-button type="primary" size="small" icon="el-icon-delete" @click="confirmcomplete" title="一键入库"
:disabled="!hasSelection" class="toolbar-btn">
完成收货
</el-button>
<el-button size="small" :disabled="!hasSelection" @click="confirmBatchCancel">批量作废</el-button>
<el-button type="warning" size="small" :disabled="!hasSelection" @click="handleRejectReceiving">批量驳回</el-button>
<el-button type="primary" size="small" :disabled="!hasSelection" :loading="reviewLoading" @click="handleReviewReceiving">批量审核</el-button>
<el-button type="success" size="small" :disabled="selectionRows.length !== 1" :loading="quickPutawayLoading" @click="handleQuickPutaway">快捷入库</el-button>
<el-button type="info" size="small" icon="el-icon-printer" @click="handleOpenPrintDialog" title="打印收货单"
:disabled="!hasSelection" class="toolbar-btn">
打印收货单
</el-button>
<order-toolbar-button-group
:buttons="toolbarButtons"
:resolve-disabled="resolveButtonDisabled"
:resolve-loading="resolveButtonLoading"
:resolve-label="resolveButtonLabel"
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
</div>
<!-- <div class="toolbar-right">
<el-input size="small" placeholder="搜索收货单号" v-model="quickSearch" style="width:220px" @keyup.enter.native="onQuickSearch" />
</div> -->
</div>
<div class="split-stack" ref="splitStackRef">
@ -318,6 +300,8 @@ import { useRoute } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import BatchReceivingPrintDialog from '@/components/BatchReceivingPrintDialog.vue'
import Details from './component/DetailsPanel.vue'
import StorageComp from './component/Storage.vue'
@ -337,10 +321,12 @@ import {
storageStatusConfig,
deliveryMethodConfig,
loadingMethodConfig,
addReceivingFields
addReceivingFields,
receivingToolbarButtons
} from './receiving-config'
import * as XLSX from 'xlsx'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import { safeInvoke } from '@/utils/safe-invoke'
const scanBox = ref<any>(null)
const route = useRoute()
@ -376,6 +362,7 @@ const list = ref<any[]>([])
const loading = ref(false)
const exportLoading = ref(false)
const quickPutawayLoading = ref(false)
const reviewLoading = ref(false)
const queryTime = ref(0)
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
@ -406,6 +393,81 @@ const selectedRow = computed(() => {
return list.value.find((i: any) => i.id === selectedReceivingId.value) || null
})
const toolbarButtons = receivingToolbarButtons
const buttonLoadingMap = computed(() => ({
loading: loading.value,
exportLoading: exportLoading.value,
reviewLoading: reviewLoading.value,
quickPutawayLoading: quickPutawayLoading.value
}))
const buttonDisabledMap = computed(() => ({
hasNoSelection: !hasSelection.value,
singleSelectionOnly: selectionRows.value.length !== 1
}))
const buttonLabelMap = computed(() => ({
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情'
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
loading: buttonLoadingMap.value,
disabled: buttonDisabledMap.value,
labels: buttonLabelMap.value
})
)
function resolveButtonLoading(loadingKey?: string) {
if (!loadingKey) return false
return Boolean((buttonLoadingMap.value as Record<string, boolean>)[loadingKey])
}
function resolveButtonDisabled(disabledKey?: string) {
if (!disabledKey) return false
return Boolean((buttonDisabledMap.value as Record<string, boolean>)[disabledKey])
}
function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
if (!dynamicLabelKey) return defaultLabel
return (buttonLabelMap.value as Record<string, string>)[dynamicLabelKey] || defaultLabel
}
const toolbarActionMap: Record<string, () => void> = {
loadData: () => {
void loadData()
},
handleCreateReceiving: () => handleCreateReceiving(),
handleExport: () => {
void handleExport()
},
openColumnConfigPanel: () => openColumnConfigPanel(),
toggleDetailVisible: () => toggleDetailVisible(),
confirmcomplete: () => {
void confirmcomplete()
},
confirmBatchCancel: () => {
void confirmBatchCancel()
},
handleRejectReceiving: () => handleRejectReceiving(),
handleReviewReceiving: () => {
void handleReviewReceiving()
},
handleQuickPutaway: () => {
void handleQuickPutaway()
},
handleOpenPrintDialog: () => {
void handleOpenPrintDialog()
}
}
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
const handler = toolbarActionMap[action]
if (!handler) return
safeInvoke(() => handler())
}
function toggleDetailVisible() {
detailVisible.value = !detailVisible.value
}
@ -443,8 +505,10 @@ async function loadData() {
const where = currentCondition.value || {}
// console.log('当前筛选条件:', where)
// 固定条件:入库状态只显示待入库或部分入库(始终强制,不受预设或用户筛选覆盖)
where.storage_status = { operator: 'in', value: ['none', 'partial'], type: 'select' }
// 默认只显示待入库或部分入库;用户通过 scan-box 选择入库状态时按其筛选
if (!where.storage_status) {
where.storage_status = { operator: 'in', value: ['none', 'partial'], type: 'select' }
}
const params: any = {
pagination: { page: pagination.currentPage, pageSize: pagination.pageSize },
@ -881,9 +945,6 @@ async function confirmBatchCancel() {
}
}
// 审核收货单相关
const reviewLoading = ref(false)
async function handleReviewReceiving() {
if (!selectionRows.value.length) {
ElMessage.warning('请先选择要审核的收货单')
@ -1513,20 +1574,33 @@ async function handleExport() {
overflow: hidden;
.toolbar {
padding: 5px;
border-bottom: 1px solid #ebeef5;
margin-bottom: 3px;
padding: 6px 10px;
border: 1px solid #ebeef5;
display: flex;
justify-content: space-between;
align-items: center;
background-color: #fff;
}
min-width: 0;
overflow: hidden;
.toolbar-right {
display: flex;
flex-direction: row;
gap: 15px;
height: 30px;
align-items: center;
.toolbar-left {
flex: 1;
min-width: 0;
display: flex;
align-items: center;
gap: 10px;
overflow: hidden;
}
.toolbar-right {
flex: 0 0 auto;
margin-left: 10px;
display: flex;
align-items: center;
justify-content: flex-end;
gap: 10px;
}
}
.split-stack {

View File

@ -1,3 +1,5 @@
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
export const statusConfig = {
receiving: { text: '收货中', tagType: 'warning' },
completed: { text: '已完成', tagType: 'success' },
@ -138,7 +140,8 @@ export const availableFields = [
{ value: 'detail_status', label: '匹配状态', type: 'select', options: Object.entries(detailStatusConfig).map(([v, c]) => ({ value: v, label: c.text })) },
{ value: 'storage_status', label: '入库状态', type: 'select', options: [
{ value: 'none', label: '待入库' },
{ value: 'partial', label: '部分入库' }
{ value: 'partial', label: '部分入库' },
{ value: 'all', label: '已入库' }
] },
{
value: 'is_review',
@ -442,3 +445,67 @@ export const addReceivingFields = [
{ prop: 'tracking_number', label: '物流单号', type: 'input' },
{ prop: 'remark', label: '备注', type: 'textarea' }
]
/** 收货单列表主工具栏按钮(action 与 receiving/index.vue 内 toolbarActionMap 键一致) */
export const receivingToolbarButtons: ToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' },
{ key: 'create', label: '添加收货单', type: 'primary', size: 'small', action: 'handleCreateReceiving' },
{ key: 'export', label: '导出', size: 'small', loadingKey: 'exportLoading', action: 'handleExport' },
{ key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' },
{
key: 'toggleDetail',
label: '显示详情',
dynamicLabelKey: 'detailToggleLabel',
size: 'small',
action: 'toggleDetailVisible'
},
{
key: 'complete',
label: '完成收货',
type: 'primary',
size: 'small',
disabledKey: 'hasNoSelection',
action: 'confirmcomplete'
},
{
key: 'batchCancel',
label: '批量作废',
size: 'small',
disabledKey: 'hasNoSelection',
action: 'confirmBatchCancel'
},
{
key: 'reject',
label: '批量驳回',
type: 'warning',
size: 'small',
disabledKey: 'hasNoSelection',
action: 'handleRejectReceiving'
},
{
key: 'review',
label: '批量审核',
type: 'primary',
size: 'small',
disabledKey: 'hasNoSelection',
loadingKey: 'reviewLoading',
action: 'handleReviewReceiving'
},
{
key: 'quickPutaway',
label: '快捷入库',
type: 'success',
size: 'small',
disabledKey: 'singleSelectionOnly',
loadingKey: 'quickPutawayLoading',
action: 'handleQuickPutaway'
},
{
key: 'print',
label: '打印收货单',
type: 'info',
size: 'small',
disabledKey: 'hasNoSelection',
action: 'handleOpenPrintDialog'
}
]

View File

@ -263,7 +263,9 @@ import {
settingWarehouseGetFieldMeta,
settingWarehouseSaveSettings,
unwrapSettingWarehousePayload,
type SettingWarehouseSaveSettingsParams,
buildSaveSettingsRequest,
normalizeGetSettingsPayload,
normalizeSaveSettingsPayload,
type SettingWarehouseSaveSettingsPayload,
type SettingWarehouseSettingsPayload
} from '@/api/setting.warehouse/settingwarehouse'
@ -320,6 +322,51 @@ const FALLBACK_FIELDS: NormalizedField[] = [
type: 'boolean',
description:
'开启后允许按外部系统传入的快递编码进行处理(如无匹配仍以业务校验为准);默认关闭。'
},
{
key: 'auto_outbound_rules',
label: '自动出库规则',
type: 'object',
description: '全部条件满足时自动标记待出库。',
itemFields: [
{ key: 'enabled', label: '启用自动出库', type: 'boolean', description: '默认关闭' },
{
key: 'require_recheck',
label: '要求已复核',
type: 'boolean',
description: 'recheck_status=fin,默认开启'
},
{
key: 'require_pack',
label: '要求已打包',
type: 'boolean',
description: 'pack_status=fin,默认开启'
},
{
key: 'require_weigh',
label: '要求已称重',
type: 'boolean',
description: 'weighing_weight>0,默认开启'
},
{
key: 'require_sync',
label: '要求已同步',
type: 'boolean',
description: 'sync_status=fin,默认开启'
},
{
key: 'require_print',
label: '要求已打印',
type: 'boolean',
description: 'print_status=fin,默认开启'
},
{
key: 'require_pick',
label: '要求已拣货',
type: 'boolean',
description: 'pick_status=fin,默认开启'
}
]
}
]
@ -459,6 +506,22 @@ function cloneValue<T>(value: T): T {
function ensureFieldDefaults(target: Record<string, unknown>, fields: NormalizedField[]) {
for (const f of fields) {
if (f.type === 'object' && f.itemFields?.length) {
const current = target[f.key]
const obj =
current && typeof current === 'object' && !Array.isArray(current)
? { ...(current as Record<string, unknown>) }
: ({} as Record<string, unknown>)
for (const sub of f.itemFields) {
if (!(sub.key in obj)) {
if (sub.type === 'boolean') obj[sub.key] = sub.defaultValue === true
else if (sub.defaultValue !== undefined) obj[sub.key] = cloneValue(sub.defaultValue)
}
}
target[f.key] = obj
continue
}
if (!(f.key in target)) {
if (f.defaultValue !== undefined) {
target[f.key] = cloneValue(f.defaultValue)
@ -583,12 +646,13 @@ function onObjectFieldChange(fieldKey: string, subKey: string, value: unknown) {
subjectConfig[fieldKey] = obj
}
function applySettingsPayload(settingsRes: SettingWarehouseSettingsPayload | Record<string, any>) {
const wid = settingsRes.warehouse_id
warehouseId.value = typeof wid === 'number' ? wid : wid != null ? Number(wid) : null
if (!Number.isFinite(warehouseId.value as number)) warehouseId.value = null
function applySettingsPayload(settingsRes: SettingWarehouseSettingsPayload | Record<string, unknown>) {
const normalized = normalizeGetSettingsPayload(settingsRes as Record<string, unknown>)
const cfg = cloneSubjectConfig(settingsRes.subject_config)
const wid = normalized.warehouse_id
warehouseId.value = typeof wid === 'number' && wid > 0 ? wid : null
const cfg = cloneSubjectConfig(normalized.subject_config)
Object.keys(subjectConfig).forEach((k) => delete subjectConfig[k])
Object.assign(subjectConfig, cfg)
ensureFieldDefaults(subjectConfig, displayFields.value)
@ -638,9 +702,9 @@ async function loadAll() {
throw new Error(settingsRes?.message || '获取仓库设置失败(getSettings)')
}
const settingsPayload = unwrapSettingWarehousePayload(
settingsRes as Record<string, unknown>
) as SettingWarehouseSettingsPayload
const settingsPayload = normalizeGetSettingsPayload(
unwrapSettingWarehousePayload(settingsRes as Record<string, unknown>)
)
applySettingsPayload(settingsPayload)
const metaPayload = unwrapSettingWarehousePayload(metaRes as Record<string, unknown>)
@ -704,12 +768,10 @@ async function handleSave() {
saving.value = true
try {
const body: SettingWarehouseSaveSettingsParams = {
subject_config: payloadConfig
}
if (cacheWarehouseId.value != null && Number.isFinite(cacheWarehouseId.value)) {
body.cache_warehouse_id = cacheWarehouseId.value
}
const body = buildSaveSettingsRequest({
subject_config: payloadConfig,
cache_warehouse_id: cacheWarehouseId.value
})
const res = await settingWarehouseSaveSettings(body)
if (!res || !okCode(res.code)) {
@ -718,9 +780,9 @@ async function handleSave() {
ElMessage.success(res.message || '保存成功')
const savePayload = unwrapSettingWarehousePayload(
res as Record<string, unknown>
) as SettingWarehouseSaveSettingsPayload
const savePayload = normalizeSaveSettingsPayload(
unwrapSettingWarehousePayload(res as Record<string, unknown>)
)
applySettingsPayload(savePayload)
const cleared = savePayload.cache_cleared_warehouse_id

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,11 @@
# 接口
- 更新时间: 2026-06-15 09:45:23
- 更新时间: 2026-06-16 10:39:51
- 扫描目录: `src\api`
- 模块数: 41
- API 文件数: 41
- 接口数: 356
- 已启用: 319
- 接口数: 358
- 已启用: 321
- 占位接口: 2
## 模块统计
@ -25,7 +25,7 @@
| order.outboundorder | 1 | 3 | 3 | 0 |
| order.pendingorder | 1 | 27 | 25 | 0 |
| order.print | 1 | 4 | 4 | 0 |
| order.recheckorder | 1 | 7 | 5 | 0 |
| order.recheckorder | 1 | 8 | 6 | 0 |
| order.revieworder | 1 | 3 | 3 | 0 |
| order.wave | 1 | 30 | 28 | 0 |
| pick | 1 | 4 | 4 | 0 |
@ -35,7 +35,7 @@
| setting.account | 1 | 7 | 7 | 0 |
| setting.express | 1 | 7 | 7 | 0 |
| setting.expressinterface | 1 | 6 | 6 | 0 |
| setting.packagematerial | 1 | 5 | 5 | 0 |
| setting.packagematerial | 1 | 6 | 6 | 0 |
| setting.packagesupplier | 1 | 5 | 5 | 0 |
| setting.permission | 1 | 4 | 4 | 0 |
| setting.platform | 1 | 5 | 5 | 0 |
@ -152,6 +152,7 @@
| order.recheckorder | batchQuickRecheck | order.recheckOrder.batchQuickRecheck | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
| order.recheckorder | confirmIntercept | order.recheckOrder.confirmIntercept | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
| order.recheckorder | confirmRecheck | order.recheckOrder.confirmRecheck | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
| order.recheckorder | queryRecheckOrderSingleList | order.recheckOrder.queryRecheckOrderSingleList | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
| order.recheckorder | scanOrder | order.recheckOrder.scanOrder | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
| order.recheckorder | scanTask | order.recheckOrder.scanTask | POST | 是 | 否 | order.recheckorder/recheckOrder.ts | |
| order.recheckorder | scanWaybill | order.recheckOrder.scanWaybill | POST | 否 | 否 | order.recheckorder/recheckOrder.ts | |
@ -252,6 +253,7 @@
| setting.packagematerial | packageMaterialDelete | setting.packageMaterial.delete | POST | 是 | 否 | setting.packagematerial/packagematerial.ts | |
| setting.packagematerial | packageMaterialGet | setting.packageMaterial.get | POST | 是 | 否 | setting.packagematerial/packagematerial.ts | |
| setting.packagematerial | packageMaterialList | setting.packageMaterial.list | POST | 是 | 否 | setting.packagematerial/packagematerial.ts | |
| setting.packagematerial | packageMaterialSearch | setting.packageMaterial.search | POST | 是 | 否 | setting.packagematerial/packagematerial.ts | |
| setting.packagematerial | packageMaterialUpdate | setting.packageMaterial.update | POST | 是 | 否 | setting.packagematerial/packagematerial.ts | |
| setting.packagesupplier | packageSupplierCreate | setting.packageSupplier.create | POST | 是 | 否 | setting.packagesupplier/packagesupplier.ts | |
| setting.packagesupplier | packageSupplierDelete | setting.packageSupplier.delete | POST | 是 | 否 | setting.packagesupplier/packagesupplier.ts | |

View File

@ -8,17 +8,12 @@
}
},
{
"method": "order.deliveryOrder.list",
"method": "storage.inventory.list",
"body": {}
},
{
"method": "order.deliveryOrder.detail",
"method": "",
"body": {
"id": 120948,
"ids": [
120948
],
"tableType": "dispatch"
}
}
],

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -12,139 +12,50 @@
"label": "全部"
}
},
"totalInterfaceCount": 315,
"totalInterfaceCount": 317,
"changes": {
"summary": {
"moduleAdded": 0,
"moduleDeleted": 0,
"moduleUpdated": 4,
"interfaceAdded": 2,
"moduleUpdated": 1,
"interfaceAdded": 0,
"interfaceDeleted": 0,
"interfaceParamsUpdated": 1,
"interfaceResponseUpdated": 4
"interfaceResponseUpdated": 0
},
"moduleUpdates": {
"added": [],
"deleted": [],
"updated": [
{
"moduleName": "订单工作台入口模块",
"moduleKey": "order.index",
"folder": "order.index",
"previousModuleName": "订单工作台入口模块",
"previousModuleKey": "order.index",
"interfaceChanges": {
"addedMethods": [
"order.bindExpressPackageMaterialByWaybill"
],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.detail"
]
}
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"folder": "order.recheckorder",
"previousModuleName": "订单复核模块",
"previousModuleKey": "order.recheckOrder",
"interfaceChanges": {
"addedMethods": [
"order.recheckOrder.batchQuickRecheck"
],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.recheckOrder.scanOrder"
]
}
},
{
"moduleName": "订单配送模块",
"moduleKey": "order.deliveryOrder",
"folder": "order.deliveryorder",
"previousModuleName": "订单配送模块",
"previousModuleKey": "order.deliveryOrder",
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.deliveryOrder.detail"
]
}
},
{
"moduleName": "仓库设置模块",
"moduleKey": "setting.warehouse",
"folder": "setting.warehouse",
"previousModuleName": "仓库设置模块",
"previousModuleKey": "setting.warehouse",
"moduleName": "商品模块",
"moduleKey": "stock",
"folder": "stock",
"previousModuleName": "商品模块",
"previousModuleKey": "stock",
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [
"setting.warehouse.saveSettings"
"stock.warehouse.list"
],
"responseUpdatedMethods": [
"setting.warehouse.getSettings"
]
"responseUpdatedMethods": []
}
}
]
},
"interfaceUpdates": {
"added": [
{
"moduleName": "订单工作台入口模块",
"moduleKey": "order.index",
"folder": "order.index",
"method": "order.bindExpressPackageMaterialByWaybill"
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"folder": "order.recheckorder",
"method": "order.recheckOrder.batchQuickRecheck"
}
],
"added": [],
"deleted": [],
"paramsUpdated": [
{
"moduleName": "仓库设置模块",
"moduleKey": "setting.warehouse",
"folder": "setting.warehouse",
"method": "setting.warehouse.saveSettings"
"moduleName": "商品模块",
"moduleKey": "stock",
"folder": "stock",
"method": "stock.warehouse.list"
}
],
"responseUpdated": [
{
"moduleName": "订单工作台入口模块",
"moduleKey": "order.index",
"folder": "order.index",
"method": "order.detail"
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"folder": "order.recheckorder",
"method": "order.recheckOrder.scanOrder"
},
{
"moduleName": "订单配送模块",
"moduleKey": "order.deliveryOrder",
"folder": "order.deliveryorder",
"method": "order.deliveryOrder.detail"
},
{
"moduleName": "仓库设置模块",
"moduleKey": "setting.warehouse",
"folder": "setting.warehouse",
"method": "setting.warehouse.getSettings"
}
]
"responseUpdated": []
}
},
"interfaces": [
@ -5722,6 +5633,57 @@
}
]
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"moduleFolder": "order.recheckorder",
"method": "order.recheckOrder.queryRecheckOrderSingleList",
"title": "散单模式复核列表查询,按订单维度返回待复核订单(排除 pick_status='none' 和 recheck_status='fin'),支持分页与关键词/波次号/复核状态筛选。与 recheckOrderList 不同:本方法仅处理散单模式,不包含团购分支。",
"description": "散单模式复核列表查询,按订单维度返回待复核订单(排除 pick_status='none' 和 recheck_status='fin'),支持分页与关键词/波次号/复核状态筛选。与 recheckOrderList 不同:本方法仅处理散单模式,不包含团购分支。",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,
"status": {
"isUsed": false,
"isPlaceholder": false
},
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "where",
"type": "object",
"required": false,
"description": "筛选条件。支持 keyword(运单号/订单号模糊搜索)、wave_no(精确匹配)、recheck_status、pick_status"
},
{
"name": "pagination",
"type": "object",
"required": false,
"description": "分页参数,支持 page / pageSize(默认 page=1, pageSize=20)"
}
],
"response": [
{
"name": "list",
"type": "array",
"required": true,
"description": "散单复核订单列表,每项含 order_id、delivery_order_code、order_type、wave_id、wave_no、pick_status、recheck_status、shop_nick、logistics_name、items_count、items_total、items_weight、weight_type、status、create_at、pick_time、recheck_time"
},
{
"name": "pagination",
"type": "object",
"required": true,
"description": "分页信息,含 page、pageSize、total、totalPages、hasPrevious、hasNext"
}
]
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
@ -7605,7 +7567,7 @@
"name": "list",
"type": "array",
"required": true,
"description": "分组列表,items 示例见实现:包含 item_detail_machine/item_snapshot/group_count 等字段"
"description": "分组列表,每项包含 item_detail、item_detail_machine、item_detail_machine_snapshot、item_snapshot、group、group_count、items_total、items_weight(总重量kg,取组内首单 items_weight)、store_id、store_ids、logistics_name、distinguish_express、first_order_time、last_order_time、status_summary 等字段;若指定 return_order_ids=true 则额外包含 order_ids"
},
{
"name": "pagination",
@ -7842,7 +7804,7 @@
"name": "list",
"type": "array",
"required": true,
"description": "散单候选分组列表,items 示例见实现:包含 item_detail_machine/item_snapshot/group_count 等字段;返回的 group_count 均小于 same_order_quantity(或仓库配置的 min_group_order_fetch_quantity)。"
"description": "散单候选分组列表,每项包含 item_detail、item_detail_machine、item_detail_machine_snapshot、item_snapshot、group、group_count、items_total、items_weight(总重量kg,取组内首单 items_weight)、store_id、store_ids、logistics_name、distinguish_express、first_order_time、last_order_time、status_summary 等字段;返回的 group_count 均小于 same_order_quantity(或仓库配置的 min_group_order_fetch_quantity);若指定 return_order_ids=true 则额外包含 order_ids"
},
{
"name": "pagination",
@ -11739,6 +11701,45 @@
"params": [],
"response": []
},
{
"moduleName": "包材管理模块",
"moduleKey": "setting.packageMaterial",
"moduleFolder": "setting.packagematerial",
"method": "setting.packageMaterial.search",
"title": "包材关键字搜索,按 material_code / material_name 模糊匹配,最多返回 50 条(仅返回启用中的包材)",
"description": "包材关键字搜索,按 material_code / material_name 模糊匹配,最多返回 50 条(仅返回启用中的包材)",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,
"status": {
"isUsed": false,
"isPlaceholder": false
},
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "keyword",
"type": "string",
"required": false,
"description": "搜索关键字,模糊匹配 material_code、material_name;为空时返回前 50 条启用中的包材"
}
],
"response": [
{
"name": "data[]",
"type": "array",
"required": true,
"description": "包材列表,每项包含 id(包材ID)、material_code(包材编码)、material_name(包材名称)、material_type(包材类型)、spec(规格)、status(状态)"
}
]
},
{
"moduleName": "包材管理模块",
"moduleKey": "setting.packageMaterial",
@ -14107,7 +14108,7 @@
"name": "where",
"type": "object",
"required": false,
"description": "统一 where 条件对象;推荐使用 { operator, value, type } 标准结构,历史简写会在 main 中自动标准化;支持 quickWhere、barcode、prohibited_type 等商品筛选字段。示例:where.barcode={operator:like,value:69}; where.prohibited_type={operator:eq,value:liquid}。"
"description": "统一 where 条件对象;推荐使用 { operator, value, type } 标准结构,历史简写会在 main 中自动标准化;支持 quickWhere、barcode、prohibited_type、has_bound_item 等商品筛选字段。示例:where.barcode={operator:like,value:69}; where.prohibited_type={operator:eq,value:liquid}; where.has_bound_item={operator:eq,value:true}(已绑定外部商品)/ where.has_bound_item={operator:eq,value:false}(未绑定外部商品)。"
}
],
"response": []

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -13,139 +13,50 @@
}
},
"moduleCount": 41,
"totalInterfaceCount": 315,
"totalInterfaceCount": 317,
"changes": {
"summary": {
"moduleAdded": 0,
"moduleDeleted": 0,
"moduleUpdated": 4,
"interfaceAdded": 2,
"moduleUpdated": 1,
"interfaceAdded": 0,
"interfaceDeleted": 0,
"interfaceParamsUpdated": 1,
"interfaceResponseUpdated": 4
"interfaceResponseUpdated": 0
},
"moduleUpdates": {
"added": [],
"deleted": [],
"updated": [
{
"moduleName": "订单工作台入口模块",
"moduleKey": "order.index",
"folder": "order.index",
"previousModuleName": "订单工作台入口模块",
"previousModuleKey": "order.index",
"interfaceChanges": {
"addedMethods": [
"order.bindExpressPackageMaterialByWaybill"
],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.detail"
]
}
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"folder": "order.recheckorder",
"previousModuleName": "订单复核模块",
"previousModuleKey": "order.recheckOrder",
"interfaceChanges": {
"addedMethods": [
"order.recheckOrder.batchQuickRecheck"
],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.recheckOrder.scanOrder"
]
}
},
{
"moduleName": "订单配送模块",
"moduleKey": "order.deliveryOrder",
"folder": "order.deliveryorder",
"previousModuleName": "订单配送模块",
"previousModuleKey": "order.deliveryOrder",
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.deliveryOrder.detail"
]
}
},
{
"moduleName": "仓库设置模块",
"moduleKey": "setting.warehouse",
"folder": "setting.warehouse",
"previousModuleName": "仓库设置模块",
"previousModuleKey": "setting.warehouse",
"moduleName": "商品模块",
"moduleKey": "stock",
"folder": "stock",
"previousModuleName": "商品模块",
"previousModuleKey": "stock",
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [
"setting.warehouse.saveSettings"
"stock.warehouse.list"
],
"responseUpdatedMethods": [
"setting.warehouse.getSettings"
]
"responseUpdatedMethods": []
}
}
]
},
"interfaceUpdates": {
"added": [
{
"moduleName": "订单工作台入口模块",
"moduleKey": "order.index",
"folder": "order.index",
"method": "order.bindExpressPackageMaterialByWaybill"
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"folder": "order.recheckorder",
"method": "order.recheckOrder.batchQuickRecheck"
}
],
"added": [],
"deleted": [],
"paramsUpdated": [
{
"moduleName": "仓库设置模块",
"moduleKey": "setting.warehouse",
"folder": "setting.warehouse",
"method": "setting.warehouse.saveSettings"
"moduleName": "商品模块",
"moduleKey": "stock",
"folder": "stock",
"method": "stock.warehouse.list"
}
],
"responseUpdated": [
{
"moduleName": "订单工作台入口模块",
"moduleKey": "order.index",
"folder": "order.index",
"method": "order.detail"
},
{
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"folder": "order.recheckorder",
"method": "order.recheckOrder.scanOrder"
},
{
"moduleName": "订单配送模块",
"moduleKey": "order.deliveryOrder",
"folder": "order.deliveryorder",
"method": "order.deliveryOrder.detail"
},
{
"moduleName": "仓库设置模块",
"moduleKey": "setting.warehouse",
"folder": "setting.warehouse",
"method": "setting.warehouse.getSettings"
}
]
"responseUpdated": []
}
},
"modules": [
@ -153,7 +64,7 @@
"moduleName": "包材管理模块",
"moduleKey": "setting.packageMaterial",
"folder": "setting.packagematerial",
"interfaceCount": 5,
"interfaceCount": 6,
"interfaces": [
{
"method": "setting.packageMaterial.create"
@ -169,6 +80,9 @@
},
{
"method": "setting.packageMaterial.list"
},
{
"method": "setting.packageMaterial.search"
}
]
},
@ -640,7 +554,7 @@
"moduleName": "订单复核模块",
"moduleKey": "order.recheckOrder",
"folder": "order.recheckorder",
"interfaceCount": 6,
"interfaceCount": 7,
"interfaces": [
{
"method": "order.recheckOrder.scanOrder"
@ -659,6 +573,9 @@
},
{
"method": "order.recheckOrder.batchQuickRecheck"
},
{
"method": "order.recheckOrder.queryRecheckOrderSingleList"
}
]
},

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -26,9 +26,7 @@
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.deliveryOrder.detail"
]
"responseUpdatedMethods": []
}
}
},

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -23,14 +23,10 @@
"moduleAdded": false,
"moduleRenamed": false,
"interfaceChanges": {
"addedMethods": [
"order.bindExpressPackageMaterialByWaybill"
],
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.detail"
]
"responseUpdatedMethods": []
}
}
},

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-05 09:15:19",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-20 08:59:09",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -16,21 +16,17 @@
"name": "订单复核模块",
"key": "order.recheckOrder",
"folder": "order.recheckorder",
"interfaceCount": 6
"interfaceCount": 7
},
"changes": {
"fromPreviousSnapshot": {
"moduleAdded": false,
"moduleRenamed": false,
"interfaceChanges": {
"addedMethods": [
"order.recheckOrder.batchQuickRecheck"
],
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [],
"responseUpdatedMethods": [
"order.recheckOrder.scanOrder"
]
"responseUpdatedMethods": []
}
}
},
@ -502,6 +498,54 @@
"description": "失败数量"
}
]
},
{
"method": "order.recheckOrder.queryRecheckOrderSingleList",
"title": "散单模式复核列表查询,按订单维度返回待复核订单(排除 pick_status='none' 和 recheck_status='fin'),支持分页与关键词/波次号/复核状态筛选。与 recheckOrderList 不同:本方法仅处理散单模式,不包含团购分支。",
"description": "散单模式复核列表查询,按订单维度返回待复核订单(排除 pick_status='none' 和 recheck_status='fin'),支持分页与关键词/波次号/复核状态筛选。与 recheckOrderList 不同:本方法仅处理散单模式,不包含团购分支。",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,
"status": {
"isUsed": false,
"isPlaceholder": false
},
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "where",
"type": "object",
"required": false,
"description": "筛选条件。支持 keyword(运单号/订单号模糊搜索)、wave_no(精确匹配)、recheck_status、pick_status"
},
{
"name": "pagination",
"type": "object",
"required": false,
"description": "分页参数,支持 page / pageSize(默认 page=1, pageSize=20)"
}
],
"response": [
{
"name": "list",
"type": "array",
"required": true,
"description": "散单复核订单列表,每项含 order_id、delivery_order_code、order_type、wave_id、wave_no、pick_status、recheck_status、shop_nick、logistics_name、items_count、items_total、items_weight、weight_type、status、create_at、pick_time、recheck_time"
},
{
"name": "pagination",
"type": "object",
"required": true,
"description": "分页信息,含 page、pageSize、total、totalPages、hasPrevious、hasNext"
}
]
}
]
}

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": "2026-04-17 19:16:50"
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-04 09:11:04",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -908,7 +908,7 @@
"name": "list",
"type": "array",
"required": true,
"description": "分组列表,items 示例见实现:包含 item_detail_machine/item_snapshot/group_count 等字段"
"description": "分组列表,每项包含 item_detail、item_detail_machine、item_detail_machine_snapshot、item_snapshot、group、group_count、items_total、items_weight(总重量kg,取组内首单 items_weight)、store_id、store_ids、logistics_name、distinguish_express、first_order_time、last_order_time、status_summary 等字段;若指定 return_order_ids=true 则额外包含 order_ids"
},
{
"name": "pagination",
@ -1112,7 +1112,7 @@
"name": "list",
"type": "array",
"required": true,
"description": "散单候选分组列表,items 示例见实现:包含 item_detail_machine/item_snapshot/group_count 等字段;返回的 group_count 均小于 same_order_quantity(或仓库配置的 min_group_order_fetch_quantity)。"
"description": "散单候选分组列表,每项包含 item_detail、item_detail_machine、item_detail_machine_snapshot、item_snapshot、group、group_count、items_total、items_weight(总重量kg,取组内首单 items_weight)、store_id、store_ids、logistics_name、distinguish_express、first_order_time、last_order_time、status_summary 等字段;返回的 group_count 均小于 same_order_quantity(或仓库配置的 min_group_order_fetch_quantity);若指定 return_order_ids=true 则额外包含 order_ids"
},
{
"name": "pagination",

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-09 09:52:14",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-04 17:23:48",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-06-03 16:55:40",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-17 19:37:49",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-17 20:21:27",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-29 09:07:53",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -16,7 +16,7 @@
"name": "包材管理模块",
"key": "setting.packageMaterial",
"folder": "setting.packagematerial",
"interfaceCount": 5
"interfaceCount": 6
},
"changes": {
"fromPreviousSnapshot": {
@ -274,6 +274,42 @@
],
"params": [],
"response": []
},
{
"method": "setting.packageMaterial.search",
"title": "包材关键字搜索,按 material_code / material_name 模糊匹配,最多返回 50 条(仅返回启用中的包材)",
"description": "包材关键字搜索,按 material_code / material_name 模糊匹配,最多返回 50 条(仅返回启用中的包材)",
"endpoint": "/system",
"authRequired": false,
"loginRequired": true,
"status": {
"isUsed": false,
"isPlaceholder": false
},
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "keyword",
"type": "string",
"required": false,
"description": "搜索关键字,模糊匹配 material_code、material_name;为空时返回前 50 条启用中的包材"
}
],
"response": [
{
"name": "data[]",
"type": "array",
"required": true,
"description": "包材列表,每项包含 id(包材ID)、material_code(包材编码)、material_name(包材名称)、material_type(包材类型)、spec(规格)、status(状态)"
}
]
}
]
}

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-29 09:07:53",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-17 19:16:50",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-04-16 11:15:05",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-04 09:11:04",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {
@ -25,12 +25,8 @@
"interfaceChanges": {
"addedMethods": [],
"deletedMethods": [],
"paramsUpdatedMethods": [
"setting.warehouse.saveSettings"
],
"responseUpdatedMethods": [
"setting.warehouse.getSettings"
]
"paramsUpdatedMethods": [],
"responseUpdatedMethods": []
}
}
},

View File

@ -6,7 +6,7 @@
},
"status": "active",
"createdAt": "2026-05-25 17:05:16",
"updatedAt": "2026-06-15 09:13:10",
"updatedAt": "2026-06-16 17:38:59",
"deletedAt": null,
"restoredAt": null
}

View File

@ -1,6 +1,6 @@
{
"generatedAt": "2026-06-15 09:13:10",
"generatedAtLocal": "2026-06-15 09:13:10",
"generatedAt": "2026-06-16 17:38:59",
"generatedAtLocal": "2026-06-16 17:38:59",
"source": "remote",
"filter": {
"platform": {

Some files were not shown because too many files have changed in this diff Show More