This commit is contained in:
yin 2026-09-02 18:02:26 +08:00
parent 12b26d5eb0
commit 9d5b179059
32 changed files with 669 additions and 308 deletions

18
package-lock.json generated
View File

@ -97,6 +97,7 @@
"integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/code-frame": "^7.29.0",
"@babel/generator": "^7.29.0",
@ -2067,6 +2068,7 @@
"resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
"integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"@types/lodash": "*"
}
@ -2208,6 +2210,7 @@
"integrity": "sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "8.58.2",
"@typescript-eslint/types": "8.58.2",
@ -2791,6 +2794,7 @@
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@ -3188,6 +3192,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@ -4490,6 +4495,7 @@
"integrity": "sha512-+L0vBFYGIpSNIt/KWTpFonPrqYvgKw1eUI5Vn7mEogrQcWtWYtNQ7dNqC+px/J0idT3BAkiWrhfS7k+Tum8TUA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.8.0",
"@eslint-community/regexpp": "^4.12.2",
@ -6343,13 +6349,15 @@
"version": "4.17.23",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
"integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/lodash-es": {
"version": "4.17.23",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
"integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/lodash-unified": {
"version": "1.0.3",
@ -7176,6 +7184,7 @@
"resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz",
"integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==",
"license": "MIT",
"peer": true,
"dependencies": {
"@vue/devtools-api": "^7.7.7"
},
@ -7251,6 +7260,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"nanoid": "^3.3.11",
"picocolors": "^1.1.1",
@ -9029,6 +9039,7 @@
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"devOptional": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@ -9306,6 +9317,7 @@
"integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"esbuild": "^0.27.0",
"fdir": "^6.5.0",
@ -9552,6 +9564,7 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.29.tgz",
"integrity": "sha512-BZqN4Ze6mDQVNAni0IHeMJ5mwr8VAJ3MQC9FmprRhcBYENw+wOAAjRj8jfmN6FLl0j96OXbR+CjWhmAmM+QGnA==",
"license": "MIT",
"peer": true,
"dependencies": {
"@vue/compiler-dom": "3.5.29",
"@vue/compiler-sfc": "3.5.29",
@ -9591,6 +9604,7 @@
"integrity": "sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"debug": "^4.4.0",
"eslint-scope": "^8.2.0 || ^9.0.0",

View File

@ -127,3 +127,100 @@ export function packingForceRecord(data: PackingForceRecordParams): Promise<Pack
isSystemApi: true,
} as any)
}
/** order.packing.export 请求参数(where/sort 语义与 order.packing.list 一致;warehouse_id 由服务端从 ctx.user.store_id 注入,禁止前端传入) */
export type PackingExportParams = {
/** 查询条件,语义与 order.packing.list 的 where 一致(支持 {operator,value,type} 标准结构或直接值;字段含 status/pack_mode/waybill_code/wave_no/order_id/workbench_id/quickWhere/has_video/video_enable/start_time/end_time/create_time 等);禁止传 warehouse_id/warehouseId(服务端注入) */
where?: Record<string, unknown>
/** 排序参数,语义与 order.packing.list 的 sort 一致:sortField 白名单 id/order_id/warehouse_id/workbench_id/wave_id/pack_quantity/pack_mode/status/start_time/end_time/create_time/update_time,sortOrder asc/desc,默认 create_time desc */
sort?: {
sortField?: string
sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC'
}
}
/** order.packing.export 响应(提交成功即返回任务受理信息) */
export type PackingExportResponse = {
/** 任务 ID(后端生成,格式 packing_export_{warehouseId}_{timestamp}_{random}) */
task_id: string
/** 任务状态:submitted/running/success/failed/not_found(提交成功时为 submitted) */
status: string
/** 当前进度百分比(0-100),提交时返回 0 */
progress: number
/** 当前已处理记录数(打包任务条数) */
current_count: number
/** 总记录数(若有) */
total_count: number
/** 任务提示信息 */
message: string
/** 任务执行结果(提交时为 null;后台完成后为上传信息对象,含 filename/url/fileKey/cdnUrl/cosUrl/current_count/total_count/sheet_count) */
result: Record<string, unknown> | null
/** 失败时的错误信息(非失败时为空字符串) */
error: string
/** 任务更新时间(Unix 毫秒时间戳) */
update_time: number
code?: number
}
/** order.packing.export:提交打包任务导出任务(异步,返回 task_id;导出进度/下载经 order.packing.exportTaskProgress 查询)。免权限免日志免鉴权口径与 order.export 一致。 */
export function packingExport(data: PackingExportParams = {}): Promise<PackingExportResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'order.packing.export',
v,
timestamp: new Date().getTime(),
},
data,
isSystemApi: true,
} as any)
}
/** order.packing.exportTaskProgress 请求参数 */
export type PackingExportTaskProgressParams = {
/** 任务 ID(下划线写法,兼容) */
task_id?: string
/** 任务 ID(驼峰写法,兼容) */
taskId?: string
}
/** order.packing.exportTaskProgress 响应 */
export type PackingExportTaskProgressResponse = {
/** 任务 ID(缺失时为空字符串,status=not_found) */
task_id: string
/** 任务状态:submitted/running/success/failed/not_found */
status: string
/** 进度百分比(0-100) */
progress: number
/** 当前已处理记录数(打包任务条数) */
current_count: number
/** 总记录数 */
total_count: number
/** 任务提示信息 */
message: string
/** 任务执行结果对象(完成后含 filename/url/fileKey/cdnUrl/cosUrl 等;未完成或 not_found 时为 null) */
result: Record<string, unknown> | null
/** 失败时的错误信息(非失败时为空字符串) */
error: string
/** 任务完成后下载链接(从 result.url/cdnUrl/cosUrl/fileKey 兜底取);未完成或不存在时为空字符串 */
download_url: string
/** 最近一次状态更新时间(Unix 毫秒时间戳) */
update_time: number
code?: number
}
/** order.packing.exportTaskProgress:按 task_id 查询打包任务导出任务进度。免权限免日志口径与 order.exportTaskProgress 一致。 */
export function packingExportTaskProgress(data: PackingExportTaskProgressParams): Promise<PackingExportTaskProgressResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'order.packing.exportTaskProgress',
v,
timestamp: new Date().getTime(),
},
data,
isSystemApi: true,
} as any)
}

View File

@ -187,3 +187,85 @@ export function packingForceRecord(data: PackingForceRecordParams): Promise<{
isSystemApi: true
} as any)
}
/** order.packing.export 请求参数(where/sort 语义与 order.packing.list 一致;warehouse_id 由服务端注入,禁止前端传入) */
export type PackingExportParams = {
/** 查询条件,语义与 order.packing.list 的 where 一致;禁止传 warehouse_id/warehouseId(服务端注入) */
where?: Record<string, any>
/** 排序参数:sortField + sortOrder(asc/desc) */
sort?: PackingListSort
}
/** order.packing.export 响应(提交成功即返回任务受理信息) */
export type PackingExportResponse = {
/** 任务 ID(后端生成,格式 packing_export_{warehouseId}_{timestamp}_{random}) */
task_id: string
/** 任务状态:submitted/running/success/failed/not_found(提交成功时为 submitted) */
status: string
/** 当前进度百分比(0-100),提交时返回 0 */
progress: number
/** 当前已处理记录数(打包任务条数) */
current_count: number
/** 总记录数 */
total_count: number
/** 任务提示信息 */
message: string
/** 任务执行结果(提交时为 null;完成后为上传信息对象) */
result: Record<string, unknown> | null
/** 失败时的错误信息 */
error: string
/** 任务更新时间(Unix 毫秒时间戳) */
update_time: number
}
/**
* order.packing.export:提交打包任务导出任务(异步,立即返回 task_id)
* 后台异步生成单 Sheet Excel 并上传,导出进度/下载经 order.packing.exportTaskProgress 查询;免权限免日志口径与 order.export 一致
*/
export function packingExport(data: PackingExportParams = {}): Promise<{
code: number
message: string
data: PackingExportResponse
}> {
return request({
url: '/system',
method: 'post',
params: {
method: 'order.packing.export',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}
/** order.packing.exportTaskProgress 请求参数 */
export type PackingExportTaskProgressParams = {
/** 任务 ID(下划线写法,兼容) */
task_id?: string
/** 任务 ID(驼峰写法,兼容) */
taskId?: string
}
/**
* order.packing.exportTaskProgress:按 task_id 查询打包任务导出任务进度
* 上传完成后返回 download_url;task_id 缺失或缓存未命中时 status=not_found(正常响应);免权限免日志口径与 order.exportTaskProgress 一致
*/
export function packingExportTaskProgress(data: PackingExportTaskProgressParams): Promise<{
code: number
message: string
data: PackingExportResponse & { download_url: string }
}> {
return request({
url: '/system',
method: 'post',
params: {
method: 'order.packing.exportTaskProgress',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -95,47 +95,56 @@ export function generateTaskProgress(
export interface DeliveryPlanSaveParams {
/** 货主ID(必填,正整数;<=0 报错) */
store_id: number
/** 计划名称(可选,仅展示字段,不参与幂等/关联逻辑;未传不覆盖,null/空串/全空白归一化为 null 清空;非空 trim 后 ≤100 字符,超长报错) */
/** 计划名称(可选,仅展示字段,不参与幂等/关联逻辑;未传不覆盖既有值,null/空串/全空白归一化为 null 显式清空;非空 trim 后 ≤100 字符,超长报错) */
name?: string | null
/** 报表定义ID(必填,正整数;须为已启用 is_enabled=1 的报表定义;与 reportId 二选一,均传优先 reportId) */
report_id: number
/** 报表定义ID(与 reportId 二选一,均传时优先 reportId;须为已启用 is_enabled=1 的报表定义) */
report_id?: number
/** 报表定义ID驼峰别名(兼容,优先级高于 report_id) */
reportId?: number
/** 每日投递时间点数组(HH:mm 24 小时制,非空;自动去重并升序) */
/** 每日投递时间点数组(HH:mm 24 小时制,非空;自动去重并按升序排序;支持 JSON 字符串数组) */
schedule_times: string[]
/** 投递渠道:仅支持 inbox,默认 inbox;wecom/link 已弃用 */
/** 投递渠道:仅支持 inbox(默认 inbox);wecom/link 已弃用,传入非法渠道报错;历史 wecom/link 计划在投递时按 inbox 兜底执行 */
channel?: string
/** 补投宽限分钟(0-1440),默认 60 */
/** 补投宽限分钟(0-1440),默认 60;越界值夹取到 0-1440 */
late_grace_minutes?: number
/** 备注(最长 500 字符) */
/** 备注(最长 500 字符,超出截断) */
remark?: string
/** 文本通知模板(≤500,标签 {time}/{url}/{report_name}/{biz_date}) */
/** 文本通知模板(≤500 字符,超出报错;标签白名单 {time}/{url}/{report_name}/{biz_date},含白名单外标签报错并列出非法标签;空值视为未启用清空配置;仅入参存在时生效,未传不修改既有配置) */
notify_template?: string
/** 通知群ID数组(wms_inbox_group.id,正整数去重 ≤20) */
/** 通知群ID数组(wms_inbox_group.id,正整数去重升序 ≤20;保存时校验存在性,软删群报错并列出缺失 ID,被屏蔽群仍可选中;支持 JSON 字符串数组;空数组视为不选择群)。该群同时作为报表文件消息投递目标:配置后文件消息仅逐群投递到这些群;未配置时回退货主默认站内信群 */
notify_group_ids?: number[]
/** 通知成员ID数组(外部 IM 用户 ID,去重 ≤100) */
/** 通知成员ID数组(外部 IM 用户 ID,非空字符串去重 ≤100;推送时 user_id 支持数组整体透传不循环拆发;支持 JSON 字符串数组;空数组视为不选择成员) */
notify_member_ids?: string[]
}
export interface DeliveryPlanItem {
/** 投递计划ID */
id: number
/** 货主ID */
store_id: number
/** 货主名称(列表/详情展示) */
store_name?: string
/** 计划名称 */
/** 计划名称(未设置时为空字符串) */
name: string
/** 关联的报表定义ID(wms_report_definition.id) */
report_definition_id: number
/** 关联报表名称(前端由 report_definition_id 关联填充) */
report_name?: string
/** 每日投递时间点数组(HH:mm,去重升序) */
schedule_times: string[]
/** 投递渠道:inbox(渠道已收敛,仅支持 inbox) */
channel: string
/** 是否启用:0=停用 1=启用 */
enabled: number
/** 补投宽限分钟(0-1440) */
late_grace_minutes: number
/** 备注 */
remark: string
/** 文本通知模板(未配置时为空字符串) */
notify_template: string
/** 通知群ID数组(wms_inbox_group.id,去重升序;未选择时 null);同时为报表文件消息投递目标群(配置后文件消息仅投递这些群,未配置时回退货主默认站内信群) */
notify_group_ids: number[] | null
/** 通知成员ID数组(外部 IM 用户 ID,去重;未选择时 null) */
notify_member_ids: string[] | null
created_at: string
updated_at: string

View File

@ -140,7 +140,7 @@
import { ref, reactive, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
import { Search, Refresh } from '@element-plus/icons-vue'
import { storeWarehouseWarehouseList } from '@/api/storeWarehouse.warehouse/storeWarehouse'
import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'

View File

@ -84,8 +84,8 @@ export interface FieldDefinition {
// ============================================================
export const VALUE_MAPS: Record<string, Record<string, string>> = {
status: {
'0': '待处理', '1': '打包中', '2': '已完成', '3': '异常',
'待处理': '待处理', '打包中': '打包中', '已完成': '已完成', '异常': '异常'
'0': '未打包', '1': '打包中', '2': '已打包',
'未打包': '未打包', '打包中': '打包中', '已打包': '已打包'
},
pack_mode: {
'1': '散单', '2': '团购',
@ -163,10 +163,9 @@ export function calcPackDuration(startTime: any, endTime: any): string {
export const TAG_RESOLVERS: Record<string, (val: any) => string> = {
resolveStatusTag(v) {
const s = Number(v)
if (s === 0) return 'info' // 待处理
if (s === 0) return 'info' // 未打包
if (s === 1) return 'warning' // 打包中
if (s === 2) return 'success' // 已完成
if (s === 3) return 'danger' // 异常
if (s === 2) return 'success' // 已打包
return 'info'
},
resolvePackModeTag(v) {
@ -252,7 +251,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
table: { width: 100, align: 'center' },
slot: { type: 'tag', tagResolver: 'resolveStatusTag', translateField: 'status' },
detailLabel: '任务状态',
filterParamMap: { '待处理': '0', '打包中': '1', '已完成': '2', '异常': '3' }
filterParamMap: { '未打包': '0', '打包中': '1', '已打包': '2' }
},
start_time: {
key: 'start_time',

View File

@ -274,6 +274,20 @@
</el-button>
</template>
</el-dialog>
<!-- 打包任务导出进度(order.packing.export + order.packing.exportTaskProgress) -->
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="打包任务导出进度"
:loading="exportLoading"
:progress-percent="exportProgressPercent"
:progress-status="exportProgressStatus"
:status-label="exportStatusLabel"
:task-id="exportTaskProgress.taskId"
:message="exportTaskProgress.message"
:error="exportTaskProgress.error"
:update-time="exportTaskProgress.updateTime"
/>
</div>
</template>
@ -281,7 +295,7 @@
import { ref, reactive, computed, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import dayjs from 'dayjs'
import { packingList, packingGet, packingSetEndTime, packingForceRecord, type PackingTaskItem, type PackingListSort } from '@/api/order/packing/index'
import { packingList, packingGet, packingSetEndTime, packingForceRecord, packingExport, packingExportTaskProgress, type PackingTaskItem, type PackingListSort } from '@/api/order/packing/index'
import {
packingColumns,
createAvailableFields,
@ -303,6 +317,8 @@ import VideoListDialog from './components/VideoListDialog.vue'
import VideoPlayerDialog from './components/VideoPlayerDialog.vue'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import { safeInvoke } from '@/utils/safe-invoke'
import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
// ─── 列配置 ─────────────────────────────────────────────────────────────────
const columns = packingColumns
@ -361,9 +377,29 @@ const queryForm = reactive({
const whereConditions = ref<Record<string, any>>({})
// ─── 打包任务导出(order.packing.export + order.packing.exportTaskProgress) ──
// 下拉选项:导出选中(按勾选任务ID导出)/ 导出全部(按当前排序全量导出)
// 传参逻辑参考 express/returnUnpack:where/sort 语义与 order.packing.list 一致,warehouse_id 服务端注入禁止前端传
const {
exportLoading,
exportDialogVisible,
exportTaskProgress,
exportProgressPercent,
exportProgressStatus,
exportStatusLabel,
submitExportTask,
resumeExportTaskFromStorage,
hasPendingExportTask
} = useAsyncExportTask({
storageKey: 'data:packingflow:exportTaskId',
submitExport: (payload) => packingExport(payload as any),
queryProgress: (params) => packingExportTaskProgress(params)
})
// ─── 工具栏状态管理 ────────────────────────────────────────────────────────
const buttonLoadingMap = computed(() => ({
loading: loading.value
loading: loading.value,
exportLoading: exportLoading.value
}))
const buttonDisabledMap = computed(() => ({}))
@ -398,7 +434,9 @@ function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
const toolbarActionMap: Record<string, () => void> = {
loadData: () => { void loadData() },
openColumnConfigPanel: () => openColumnConfigPanel(),
toggleDetailVisible: () => toggleDetailVisible()
toggleDetailVisible: () => toggleDetailVisible(),
handleExportSelected: () => { void handleExportSelected() },
handleExportAll: () => { void handleExportAll() }
}
function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
@ -411,6 +449,60 @@ function handleSelectionChange(rows: PackingTaskItem[]) {
selectionRows.value = rows || []
}
// ─── 导出处理(导出选中 / 导出全部)───────────────────────────────────────
/** 构建导出参数:selected=true 仅按勾选任务运单号(waybill_code)过滤;false 全量导出并透传当前排序;where 格式结构与 order.packing.list 一致 */
function buildPackingExportPayload(selected: boolean): Record<string, any> {
const payload: Record<string, any> = {}
if (selected) {
const waybillCodes = selectionRows.value
.map((row) => row?.waybill_code)
.filter((v: any) => v !== undefined && v !== null && String(v).trim() !== '')
if (waybillCodes.length) {
payload.where = { waybill_code: { operator: 'in', value: waybillCodes } }
}
}
if (sortState.value?.sortField) {
payload.sort = {
sortField: sortState.value.sortField,
sortOrder: String(sortState.value.sortOrder || 'desc').toLowerCase()
}
}
return payload
}
async function handleExportSelected() {
if (!selectionRows.value.length) {
ElMessage.warning('请先勾选要导出的打包任务')
return
}
if (hasPendingExportTask()) {
ElMessage.warning('检测到未完成导出任务,请等待当前任务完成后再试')
resumeExportTaskFromStorage()
return
}
const waybillCodes = selectionRows.value
.map((row) => row?.waybill_code)
.filter((v: any) => v !== undefined && v !== null && String(v).trim() !== '')
if (!waybillCodes.length) {
ElMessage.warning('选中的记录无有效运单号')
return
}
await submitExportTask(buildPackingExportPayload(true))
}
async function handleExportAll() {
if (!list.value.length) {
ElMessage.warning('当前无数据可导出')
return
}
if (hasPendingExportTask()) {
ElMessage.warning('检测到未完成导出任务,请等待当前任务完成后再试')
resumeExportTaskFromStorage()
return
}
await submitExportTask(buildPackingExportPayload(false))
}
function openColumnConfigPanel() {
tableRef.value?.openColumnConfig?.()
}
@ -523,17 +615,21 @@ const selectedRow = ref<PackingTaskItem | null>(null)
const detailLoading = ref(false)
const detail = ref<PackingTaskItem>({})
function handleRowClick(row: PackingTaskItem) {
function handleRowClick(row: PackingTaskItem | null) {
// current-change 在分页/数据刷新清空选中时会以 null 触发,仅清空选中,不加载详情
selectedRow.value = row
loadDetail(row)
if (!row) return
void loadDetail(row)
}
async function openDetail(row: PackingTaskItem) {
function openDetail(row: PackingTaskItem | null) {
if (!row) return
selectedRow.value = row
loadDetail(row)
void loadDetail(row)
}
async function loadDetail(row: PackingTaskItem) {
async function loadDetail(row: PackingTaskItem | null | undefined) {
if (!row || row.id == null) return
detailLoading.value = true
try {
const res = await packingGet(Number(row.id))
@ -545,11 +641,11 @@ async function loadDetail(row: PackingTaskItem) {
return
}
detail.value = res.data ?? row
currentVideos.value = (detail.value.videos as VideoItem[]) || []
currentVideos.value = ((detail.value?.videos || []) as VideoItem[])
} catch (e: any) {
ElMessage.error(e?.message || '获取详情异常')
detail.value = row
currentVideos.value = (row.videos as VideoItem[]) || []
currentVideos.value = ((row.videos || []) as VideoItem[])
} finally {
detailLoading.value = false
}

View File

@ -7,6 +7,19 @@ import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/o
export const packingflowToolbarButtons: ToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' },
{
key: 'export',
label: '导出',
category: 'setting',
size: 'small',
loadingKey: 'exportLoading',
action: 'handleExportSelected',
buttonType: 'dropdown',
dropdownOptions: [
{ label: '导出选中', action: 'handleExportSelected' },
{ label: '导出全部', action: 'handleExportAll', divided: true }
],
},
{ key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' },
{
key: 'toggleDetail',
@ -38,12 +51,11 @@ export interface PackModeConfigItem {
// 状态配置
// =============================================================================
/** 任务状态映射 */
/** 任务状态映射(仅三态:未打包/打包中/已打包,无错误状态) */
export const statusConfig: StatusConfigMap = {
0: { text: '待处理', tagType: 'info' },
0: { text: '未打包', tagType: 'info' },
1: { text: '打包中', tagType: 'warning' },
2: { text: '已完成', tagType: 'success' },
3: { text: '异常', tagType: 'danger' }
2: { text: '已打包', tagType: 'success' }
}
/** 打包模式映射 */
@ -231,10 +243,9 @@ export const baseAvailableFields = [
type: 'select' as const,
options: [
{ label: '全部', value: undefined },
{ label: '待处理', value: 0 },
{ label: '未打包', value: 0 },
{ label: '打包中', value: 1 },
{ label: '已完成', value: 2 },
{ label: '异常', value: 3 }
{ label: '已打包', value: 2 }
]
}),
packingScanField('workflow', {

View File

@ -5,14 +5,14 @@ import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/o
// 对齐 returnUnpack.list 接口文档 where 参数
// ============================================================
export const returnUnpackAvailableFields = [
{
value: 'unpack_no',
label: '拆包单号',
type: 'text',
placeholder: '拆包单号模糊搜索',
operators: ['like'],
defaultOperator: 'like',
},
// {
// value: 'unpack_no',
// label: '拆包单号',
// type: 'text',
// placeholder: '拆包单号模糊搜索',
// operators: ['like'],
// defaultOperator: 'like',
// },
{
value: 'waybill_code',
label: '退回运单号',

View File

@ -101,7 +101,7 @@ export const VALUE_MAPS: Record<string, Record<string, string>> = {
'true': '是', 'false': '否'
},
packStatus: {
'未打包': '未打包', '已打包': '已打包', '打包中': '打包中'
'未打包': '未打包', '打包中': '打包中', '已打包': '已打包'
}
}

View File

@ -56,15 +56,15 @@
@selection-change="onSelectionChange"
>
<template #column-order_status="{ row }">
<el-tag :type="getTagType('order_status', row.order_status)" size="small">
<span :class="getStatusTextClass(getTagType('order_status', row.order_status))">
{{ translateOrderField('order_status', row.order_status) }}
</el-tag>
</span>
</template>
<template #column-status="{ row }">
<el-tag :type="getTagType('status', row.status)" size="small">
<span :class="getStatusTextClass(getTagType('status', row.status))">
{{ translateOrderField('status', row.status) }}
</el-tag>
</span>
</template>
<template #empty>
@ -149,6 +149,7 @@ import {
type ToolbarButtonConfig,
translateOrderField,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions,
fillStoreScanFieldOptions,
extractStoreListFromResponse

View File

@ -12,9 +12,9 @@
:span="field.span || 1"
>
<template v-if="field.tag">
<el-tag :type="getTagType(field.prop, getFieldRawValue(field.prop))" size="small">
<span :class="getStatusTextClass(getTagType(field.prop, getFieldRawValue(field.prop)))">
{{ displayFieldValue(field) }}
</el-tag>
</span>
</template>
<template v-else-if="field.multiline">
<div class="field-multiline" :title="displayFieldValue(field)">
@ -41,6 +41,7 @@ import {
COMMON_TRANSLATIONS,
formatOrderTime,
getTagType,
getStatusTextClass,
orderDetailCompactSections,
orderDetailFullSections,
translateOrderField,
@ -226,6 +227,8 @@ onBeforeUnmount(() => {
</script>
<style scoped lang="scss">
@use "../styles/order-sub.scss";
.pending-order-detail {
padding: 10px;
box-sizing: border-box;

View File

@ -1253,9 +1253,8 @@ export const pickStatusFilterOptions = [
export const packStatusFilterOptions = [
{ label: '未打包', value: 'none' },
// { label: '打包中', value: 'padding' },
{ label: '打包中', value: 'padding' },
{ label: '已打包', value: 'fin' },
{ label: '错误', value: 'error' },
]
export const printStatusFilterOptions = [

View File

@ -56,15 +56,15 @@
@selection-change="onSelectionChange"
>
<template #column-order_status="{ row }">
<el-tag :type="getTagType('order_status', row.order_status)" size="small">
<span :class="getStatusTextClass(getTagType('order_status', row.order_status))">
{{ translateOrderField('order_status', row.order_status) }}
</el-tag>
</span>
</template>
<template #column-status="{ row }">
<el-tag :type="getTagType('status', row.status)" size="small">
<span :class="getStatusTextClass(getTagType('status', row.status))">
{{ translateOrderField('status', row.status) }}
</el-tag>
</span>
</template>
<template #empty>
@ -145,6 +145,7 @@ import {
type ToolbarButtonConfig,
translateOrderField,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions,
fillStoreScanFieldOptions,
extractStoreListFromResponse

View File

@ -62,87 +62,87 @@
@selection-change="onSelectionChange"
>
<template #column-is_urgency="{ row }">
<el-tag :type="getTagType('is_urgency', row.is_urgency)" size="small">
<span :class="getStatusTextClass(getTagType('is_urgency', row.is_urgency))">
{{ translateOrderField('is_urgency', row.is_urgency) }}
</el-tag>
</span>
</template>
<template #column-post_status="{ row }">
<el-tag :type="getTagType('post_status', row.post_status)" size="small">
<span :class="getStatusTextClass(getTagType('post_status', row.post_status))">
{{ translateOrderField('post_status', row.post_status) }}
</el-tag>
</span>
</template>
<template #column-storage_status="{ row }">
<el-tag :type="getTagType('storage_status', row.storage_status)" size="small">
<span :class="getStatusTextClass(getTagType('storage_status', row.storage_status))">
{{ translateOrderField('storage_status', row.storage_status) }}
</el-tag>
</span>
</template>
<template #column-print_status="{ row }">
<el-tag :type="getTagType('print_status', row.print_status)" size="small">
<span :class="getStatusTextClass(getTagType('print_status', row.print_status))">
{{ translateOrderField('print_status', row.print_status) }}
</el-tag>
</span>
</template>
<template #column-pick_status="{ row }">
<el-tag :type="getTagType('pick_status', row.pick_status)" size="small">
<span :class="getStatusTextClass(getTagType('pick_status', row.pick_status))">
{{ translateOrderField('pick_status', row.pick_status) }}
</el-tag>
</span>
</template>
<template #column-pack_status="{ row }">
<el-tag :type="getTagType('pack_status', row.pack_status)" size="small">
<span :class="getStatusTextClass(getTagType('pack_status', row.pack_status))">
{{ translateOrderField('pack_status', row.pack_status) }}
</el-tag>
</span>
</template>
<template #column-sync_status="{ row }">
<el-tag :type="getTagType('sync_status', row.sync_status)" size="small">
<span :class="getStatusTextClass(getTagType('sync_status', row.sync_status))">
{{ translateOrderField('sync_status', row.sync_status) }}
</el-tag>
</span>
</template>
<template #column-outbound_status="{ row }">
<el-tag :type="getTagType('outbound_status', row.outbound_status)" size="small">
<span :class="getStatusTextClass(getTagType('outbound_status', row.outbound_status))">
{{ translateOrderField('outbound_status', row.outbound_status) }}
</el-tag>
</span>
</template>
<template #column-inspection_status="{ row }">
<el-tag :type="getTagType('inspection_status', row.inspection_status)" size="small">
<span :class="getStatusTextClass(getTagType('inspection_status', row.inspection_status))">
{{ translateOrderField('inspection_status', row.inspection_status) }}
</el-tag>
</span>
</template>
<template #column-recheck_status="{ row }">
<el-tag :type="getTagType('recheck_status', resolveOrderRecheckStatus(row))" size="small">
<span :class="getStatusTextClass(getTagType('recheck_status', resolveOrderRecheckStatus(row)))">
{{ translateOrderField('recheck_status', resolveOrderRecheckStatus(row)) }}
</el-tag>
</span>
</template>
<template #column-claim_status="{ row }">
<el-tag :type="getTagType('claim_status', row.claim_status)" size="small">
<span :class="getStatusTextClass(getTagType('claim_status', row.claim_status))">
{{ translateOrderField('claim_status', row.claim_status) }}
</el-tag>
</span>
</template>
<template #column-lock_status="{ row }">
<el-tag :type="getTagType('lock_status', row.lock_status)" size="small">
<span :class="getStatusTextClass(getTagType('lock_status', row.lock_status))">
{{ translateOrderField('lock_status', row.lock_status) }}
</el-tag>
</span>
</template>
<template #column-invoice_flag="{ row }">
<el-tag :type="getTagType('invoice_flag', row.invoice_flag)" size="small">
<span :class="getStatusTextClass(getTagType('invoice_flag', row.invoice_flag))">
{{ translateOrderField('invoice_flag', row.invoice_flag) }}
</el-tag>
</span>
</template>
<template #column-intercept_status="{ row }">
<el-tag v-if="row.intercept_status && row.intercept_status !== 'none'" type="danger" size="small">
<span v-if="row.intercept_status && row.intercept_status !== 'none'" class="ut-status-text ut-status-text--danger">
{{ translateInterceptStatus(row.intercept_status) }}
</el-tag>
</span>
<span v-else style="color:#909399">—</span>
</template>
@ -306,6 +306,7 @@ import {
translateOrderField,
translateInterceptStatus,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions,
fillStoreScanFieldOptions,
extractStoreListFromResponse

View File

@ -56,15 +56,15 @@
@selection-change="onSelectionChange"
>
<template #column-order_status="{ row }">
<el-tag :type="getTagType('order_status', row.order_status)" size="small">
<span :class="getStatusTextClass(getTagType('order_status', row.order_status))">
{{ translateOrderField('order_status', row.order_status) }}
</el-tag>
</span>
</template>
<template #column-status="{ row }">
<el-tag :type="getTagType('status', row.status)" size="small">
<span :class="getStatusTextClass(getTagType('status', row.status))">
{{ translateOrderField('status', row.status) }}
</el-tag>
</span>
</template>
<template #empty>
@ -145,6 +145,7 @@ import {
type ToolbarButtonConfig,
translateOrderField,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions,
fillStoreScanFieldOptions,
extractStoreListFromResponse

View File

@ -56,64 +56,64 @@
@selection-change="onSelectionChange"
>
<template #column-is_urgency="{ row }">
<el-tag :type="getTagType('is_urgency', row.is_urgency)" size="small">
<span :class="getStatusTextClass(getTagType('is_urgency', row.is_urgency))">
{{ translateOrderField('is_urgency', row.is_urgency) }}
</el-tag>
</span>
</template>
<template #column-sync_status="{ row }">
<el-tag :type="getTagType('sync_status', row.sync_status)" size="small">
<span :class="getStatusTextClass(getTagType('sync_status', row.sync_status))">
{{ translateOrderField('sync_status', row.sync_status) }}
</el-tag>
</span>
</template>
<template #column-recheck_status="{ row }">
<el-tag :type="getTagType('recheck_status', resolveOrderRecheckStatus(row))" size="small">
<span :class="getStatusTextClass(getTagType('recheck_status', resolveOrderRecheckStatus(row)))">
{{ translateOrderField('recheck_status', resolveOrderRecheckStatus(row)) }}
</el-tag>
</span>
</template>
<template #column-storage_status="{ row }">
<el-tag :type="getTagType('storage_status', row.storage_status)" size="small">
<span :class="getStatusTextClass(getTagType('storage_status', row.storage_status))">
{{ translateOrderField('storage_status', row.storage_status) }}
</el-tag>
</span>
</template>
<template #column-intercept_status="{ row }">
<el-tag v-if="row.intercept_status && row.intercept_status !== 'none'" type="danger" size="small">
<span v-if="row.intercept_status && row.intercept_status !== 'none'" class="ut-status-text ut-status-text--danger">
{{ translateInterceptStatus(row.intercept_status) }}
</el-tag>
</span>
<span v-else style="color:#909399">—</span>
</template>
<template #column-post_status="{ row }">
<el-tag :type="getTagType('post_status', row.post_status)" size="small">
<span :class="getStatusTextClass(getTagType('post_status', row.post_status))">
{{ translateOrderField('post_status', row.post_status) }}
</el-tag>
</span>
</template>
<template #column-print_status="{ row }">
<el-tag :type="getTagType('print_status', row.print_status)" size="small">
<span :class="getStatusTextClass(getTagType('print_status', row.print_status))">
{{ translateOrderField('print_status', row.print_status) }}
</el-tag>
</span>
</template>
<template #column-pick_status="{ row }">
<el-tag :type="getTagType('pick_status', row.pick_status)" size="small">
<span :class="getStatusTextClass(getTagType('pick_status', row.pick_status))">
{{ translateOrderField('pick_status', row.pick_status) }}
</el-tag>
</span>
</template>
<template #column-pack_status="{ row }">
<el-tag :type="getTagType('pack_status', row.pack_status)" size="small">
<span :class="getStatusTextClass(getTagType('pack_status', row.pack_status))">
{{ translateOrderField('pack_status', row.pack_status) }}
</el-tag>
</span>
</template>
<template #column-lock_status="{ row }">
<el-tag :type="getTagType('lock_status', row.lock_status)" size="small">
<span :class="getStatusTextClass(getTagType('lock_status', row.lock_status))">
{{ translateOrderField('lock_status', row.lock_status) }}
</el-tag>
</span>
</template>
<template #column-order_flag="{ row }">
@ -392,6 +392,7 @@ import {
translateOrderField,
translateInterceptStatus,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions,
fillStoreScanFieldOptions,
extractStoreListFromResponse

View File

@ -62,51 +62,51 @@
>
<template #column-post_status="{ row }">
<el-tag :type="getTagType('post_status', row.post_status)" size="small">
<span :class="getStatusTextClass(getTagType('post_status', row.post_status))">
{{ translateOrderField('post_status', row.post_status) }}
</el-tag>
</span>
</template>
<template #column-storage_status="{ row }">
<el-tag :type="getTagType('storage_status', row.storage_status)" size="small">
<span :class="getStatusTextClass(getTagType('storage_status', row.storage_status))">
{{ translateOrderField('storage_status', row.storage_status) }}
</el-tag>
</span>
</template>
<template #column-print_status="{ row }">
<el-tag :type="getTagType('print_status', row.print_status)" size="small">
<span :class="getStatusTextClass(getTagType('print_status', row.print_status))">
{{ translateOrderField('print_status', row.print_status) }}
</el-tag>
</span>
</template>
<template #column-pick_status="{ row }">
<el-tag :type="getTagType('pick_status', row.pick_status)" size="small">
<span :class="getStatusTextClass(getTagType('pick_status', row.pick_status))">
{{ translateOrderField('pick_status', row.pick_status) }}
</el-tag>
</span>
</template>
<template #column-pack_status="{ row }">
<el-tag :type="getTagType('pack_status', row.pack_status)" size="small">
<span :class="getStatusTextClass(getTagType('pack_status', row.pack_status))">
{{ translateOrderField('pack_status', row.pack_status) }}
</el-tag>
</span>
</template>
<template #column-sync_status="{ row }">
<el-tag :type="getTagType('sync_status', row.sync_status)" size="small">
<span :class="getStatusTextClass(getTagType('sync_status', row.sync_status))">
{{ translateOrderField('sync_status', row.sync_status) }}
</el-tag>
</span>
</template>
<template #column-is_urgency="{ row }">
<el-tag :type="getTagType('is_urgency', row.is_urgency)" size="small">
<span :class="getStatusTextClass(getTagType('is_urgency', row.is_urgency))">
{{ translateOrderField('is_urgency', row.is_urgency) }}
</el-tag>
</span>
</template>
<template #column-outbound_status="{ row }">
<el-tag :type="getTagType('outbound_status', row.outbound_status)" size="small">
<span :class="getStatusTextClass(getTagType('outbound_status', row.outbound_status))">
{{ translateOrderField('outbound_status', row.outbound_status) }}
</el-tag>
</span>
</template>
</upper-table>
</div>
@ -200,6 +200,7 @@ import {
type ToolbarButtonConfig,
translateOrderField,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions,
fillStoreScanFieldOptions,
extractStoreListFromResponse

View File

@ -58,33 +58,33 @@
>
<template #column-sync_status="{ row }">
<el-tag :type="getTagType('sync_status', row.sync_status)" size="small">
<span :class="getStatusTextClass(getTagType('sync_status', row.sync_status))">
{{ translateOrderField('sync_status', row.sync_status) }}
</el-tag>
</span>
</template>
<template #column-status="{ row }">
<el-tag :type="getTagType('status', row.status)" size="small">
<span :class="getStatusTextClass(getTagType('status', row.status))">
{{ translateOrderField('status', row.status) }}
</el-tag>
</span>
</template>
<template #column-recheck_status="{ row }">
<el-tag :type="getTagType('recheck_status', resolveOrderRecheckStatus(row))" size="small">
<span :class="getStatusTextClass(getTagType('recheck_status', resolveOrderRecheckStatus(row)))">
{{ translateOrderField('recheck_status', resolveOrderRecheckStatus(row)) }}
</el-tag>
</span>
</template>
<template #column-lock_status="{ row }">
<el-tag :type="getTagType('lock_status', row.lock_status)" size="small">
<span :class="getStatusTextClass(getTagType('lock_status', row.lock_status))">
{{ translateOrderField('lock_status', row.lock_status) }}
</el-tag>
</span>
</template>
<template #column-is_urgency="{ row }">
<el-tag :type="getTagType('is_urgency', row.is_urgency)" size="small">
<span :class="getStatusTextClass(getTagType('is_urgency', row.is_urgency))">
{{ translateOrderField('is_urgency', row.is_urgency) }}
</el-tag>
</span>
</template>
<template #empty>
@ -194,6 +194,7 @@ import {
type ToolbarButtonConfig,
translateOrderField,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions,
fillStoreScanFieldOptions,
extractStoreListFromResponse

View File

@ -71,15 +71,15 @@
</template>
<template #column-wave_type="{ row }">
<el-tag size="small" type="info">
<span :class="getStatusTextClass('info')">
{{ getWaveTypeText(row) }}
</el-tag>
</span>
</template>
<template #column-wave_status="{ row }">
<el-tag size="small" :type="getStatusTagType(row)">
<span :class="getStatusTextClass(getStatusTagType(row))">
{{ getStatusText(row) }}
</el-tag>
</span>
</template>
<template #column-total_orders="{ row }">
@ -95,33 +95,33 @@
</template>
<template #column-storage_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(getStorageAssignmentStatusText(row))">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(getStorageAssignmentStatusText(row)))">
{{ getStorageAssignmentStatusText(row) }}
</el-tag>
</span>
</template>
<template #column-express_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.express_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.express_assignment_status))">
{{ formatWaveExpressAssignmentStatusLabel(row.express_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-print_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.print_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.print_assignment_status))">
{{ formatWavePrintAssignmentStatusLabel(row.print_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-pick_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.pick_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.pick_assignment_status))">
{{ formatWavePickAssignmentStatusLabel(row.pick_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-review_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.review_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.review_assignment_status))">
{{ formatWaveReviewAssignmentStatusLabel(row.review_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-unreviewed_order_count="{ row }">
@ -129,15 +129,15 @@
</template>
<template #column-distinguish_express="{ row }">
<el-tag size="small" :type="Number(row?.distinguish_express) ? 'warning' : 'info'">
<span :class="getStatusTextClass(Number(row?.distinguish_express) ? 'warning' : 'info')">
{{ Number(row?.distinguish_express) ? '是' : '否' }}
</el-tag>
</span>
</template>
<template #column-source="{ row }">
<el-tag size="small" :type="getWaveSourceTagType(row.source)">
<span :class="getStatusTextClass(getWaveSourceTagType(row.source))">
{{ formatWaveSource(row.source) }}
</el-tag>
</span>
</template>
<template #column-logistics_code="{ row }">
@ -881,6 +881,7 @@ 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 { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import {
waveUpperTableDefaults,
waveAvailableFields,

View File

@ -71,15 +71,15 @@
</template>
<template #column-wave_type="{ row }">
<el-tag size="small" type="info">
<span :class="getStatusTextClass('info')">
{{ getWaveTypeText(row) }}
</el-tag>
</span>
</template>
<template #column-wave_status="{ row }">
<el-tag size="small" :type="getStatusTagType(row)">
<span :class="getStatusTextClass(getStatusTagType(row))">
{{ getStatusText(row) }}
</el-tag>
</span>
</template>
<template #column-total_orders="{ row }">
@ -95,33 +95,33 @@
</template>
<template #column-storage_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(getStorageAssignmentStatusText(row))">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(getStorageAssignmentStatusText(row)))">
{{ getStorageAssignmentStatusText(row) }}
</el-tag>
</span>
</template>
<template #column-express_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.express_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.express_assignment_status))">
{{ formatWaveExpressAssignmentStatusLabel(row.express_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-print_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.print_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.print_assignment_status))">
{{ formatWavePrintAssignmentStatusLabel(row.print_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-pick_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.pick_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.pick_assignment_status))">
{{ formatWavePickAssignmentStatusLabel(row.pick_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-review_assignment_status="{ row }">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.review_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.review_assignment_status))">
{{ formatWaveReviewAssignmentStatusLabel(row.review_assignment_status) }}
</el-tag>
</span>
</template>
<template #column-unreviewed_order_count="{ row }">
@ -129,15 +129,15 @@
</template>
<template #column-distinguish_express="{ row }">
<el-tag size="small" :type="Number(row?.distinguish_express) ? 'warning' : 'info'">
<span :class="getStatusTextClass(Number(row?.distinguish_express) ? 'warning' : 'info')">
{{ Number(row?.distinguish_express) ? '是' : '否' }}
</el-tag>
</span>
</template>
<template #column-source="{ row }">
<el-tag size="small" :type="getWaveSourceTagType(row.source)">
<span :class="getStatusTextClass(getWaveSourceTagType(row.source))">
{{ formatWaveSource(row.source) }}
</el-tag>
</span>
</template>
<template #column-logistics_code="{ row }">
@ -480,6 +480,7 @@ 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 { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import {
waveUpperTableDefaults,
waveAvailableFields,

View File

@ -58,27 +58,27 @@
@selection-change="handleSelectionChange"
>
<template #column-status="{ row }">
<el-tag size="small" :type="getPickTaskStatusTagType(row.status)">
<span :class="getStatusTextClass(getPickTaskStatusTagType(row.status))">
{{ formatPickTaskStatus(row.status) }}
</el-tag>
</span>
</template>
<template #column-review_status="{ row }">
<el-tag size="small" :type="getPickTaskReviewStatusTagType(row.review_status)">
<span :class="getStatusTextClass(getPickTaskReviewStatusTagType(row.review_status))">
{{ formatPickTaskReviewStatus(row.review_status) }}
</el-tag>
</span>
</template>
<template #column-pick_mode="{ row }">
<el-tag size="small" type="info">
<span :class="getStatusTextClass('info')">
{{ formatPickTaskPickMode(row.pick_mode) }}
</el-tag>
</span>
</template>
<template #column-source="{ row }">
<el-tag size="small" :type="getPickTaskSourceTagType(row.source)">
<span :class="getStatusTextClass(getPickTaskSourceTagType(row.source))">
{{ formatPickTaskSource(row.source) }}
</el-tag>
</span>
</template>
<template #column-wave_no="{ row }">
@ -204,9 +204,9 @@
<el-table-column prop="box_no" label="箱号" width="80" align="center" />
<el-table-column label="状态" width="100" align="center">
<template #default="{ row: waveRow }">
<el-tag size="small" :type="getWaveStatusTagType(waveRow.status)">
<span :class="getStatusTextClass(getWaveStatusTagType(waveRow.status))">
{{ getWaveStatusText(waveRow.status) }}
</el-tag>
</span>
</template>
</el-table-column>
<el-table-column label="绑定时间" min-width="168" show-overflow-tooltip>
@ -242,6 +242,7 @@ 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 { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import { safeInvoke } from '@/utils/safe-invoke'
import { useUserStore } from '@/stores/modules/user'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'

View File

@ -60,23 +60,23 @@
@refresh="loadData"
>
<template #column-strategy_type="{ row }">
<el-tag v-if="row.strategy_type != null" size="small" :type="row.strategy_type == 2 ? 'warning' : 'primary'">
<span v-if="row.strategy_type != null" :class="getStatusTextClass(row.strategy_type == 2 ? 'warning' : 'primary')">
{{ ({ 1: '散单', 2: '团购' } as Record<number, string>)[Number(row.strategy_type)] ?? row.strategy_type }}
</el-tag>
</span>
<span v-else>—</span>
</template>
<template #column-status="{ row }">
<el-tag v-if="row.status != null" size="small" :type="row.status == 1 ? 'success' : 'danger'">
<span v-if="row.status != null" :class="getStatusTextClass(row.status == 1 ? 'success' : 'danger')">
{{ ({ 1: '启用', 0: '停用' } as Record<number, string>)[Number(row.status)] ?? row.status }}
</el-tag>
</span>
<span v-else>—</span>
</template>
<template #column-batch_mode="{ row }">
<el-tag v-if="row.batch_mode != null" size="small" type="info">
<span v-if="row.batch_mode != null" :class="getStatusTextClass('info')">
{{ ({ 0: '团购', 1: '单品单件', 2: '先拣后分', 3: '边拣边分', 4: '边拣边分H型', 5: '播种墙', 6: '流利架' } as Record<number, string>)[Number(row.batch_mode)] ?? row.batch_mode }}
</el-tag>
</span>
<span v-else>—</span>
</template>
@ -121,16 +121,16 @@
</template>
<template #column-require_same_express="{ row }">
<el-tag v-if="row.require_same_express != null" size="small" :type="row.require_same_express ? 'success' : 'info'">
<span v-if="row.require_same_express != null" :class="getStatusTextClass(row.require_same_express ? 'success' : 'info')">
{{ row.require_same_express ? '是' : '否' }}
</el-tag>
</span>
<span v-else>—</span>
</template>
<template #column-allow_cross_owner="{ row }">
<el-tag v-if="row.allow_cross_owner != null" size="small" :type="row.allow_cross_owner ? 'warning' : 'info'">
<span v-if="row.allow_cross_owner != null" :class="getStatusTextClass(row.allow_cross_owner ? 'warning' : 'info')">
{{ row.allow_cross_owner ? '是' : '否' }}
</el-tag>
</span>
<span v-else>—</span>
</template>
@ -369,6 +369,7 @@ 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 { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import {
waveScanBoxConfig,
waveStrategyAvailableFields,

View File

@ -62,60 +62,57 @@
@selection-change="onSelectionChange"
>
<template #column-is_urgency="{ row }">
<el-tag :type="getTagType('is_urgency', row.is_urgency)" size="small">
<span :class="getStatusTextClass(getTagType('is_urgency', row.is_urgency))">
{{ translateOrderField('is_urgency', row.is_urgency) }}
</el-tag>
</span>
</template>
<template #column-post_status="{ row }">
<el-tag :type="getTagType('post_status', row.post_status)" size="small">
<span :class="getStatusTextClass(getTagType('post_status', row.post_status))">
{{ translateOrderField('post_status', row.post_status) }}
</el-tag>
</span>
</template>
<template #column-storage_status="{ row }">
<el-tag :type="getTagType('storage_status', row.storage_status)" size="small">
<span :class="getStatusTextClass(getTagType('storage_status', row.storage_status))">
{{ translateOrderField('storage_status', row.storage_status) }}
</el-tag>
</span>
</template>
<template #column-print_status="{ row }">
<el-tag :type="getTagType('print_status', row.print_status)" size="small">
<span :class="getStatusTextClass(getTagType('print_status', row.print_status))">
{{ translateOrderField('print_status', row.print_status) }}
</el-tag>
</span>
</template>
<template #column-pick_status="{ row }">
<el-tag :type="getTagType('pick_status', row.pick_status)" size="small">
<span :class="getStatusTextClass(getTagType('pick_status', row.pick_status))">
{{ translateOrderField('pick_status', row.pick_status) }}
</el-tag>
</span>
</template>
<template #column-pack_status="{ row }">
<el-tag :type="getTagType('pack_status', row.pack_status)" size="small">
<span :class="getStatusTextClass(getTagType('pack_status', row.pack_status))">
{{ translateOrderField('pack_status', row.pack_status) }}
</el-tag>
</span>
</template>
<template #column-sync_status="{ row }">
<el-tag :type="getTagType('sync_status', row.sync_status)" size="small">
<span :class="getStatusTextClass(getTagType('sync_status', row.sync_status))">
{{ translateOrderField('sync_status', row.sync_status) }}
</el-tag>
</span>
</template>
<template #column-recheck_status="{ row }">
<el-tag :type="getTagType('recheck_status', resolveOrderRecheckStatus(row))" size="small">
<span :class="getStatusTextClass(getTagType('recheck_status', resolveOrderRecheckStatus(row)))">
{{ translateOrderField('recheck_status', resolveOrderRecheckStatus(row)) }}
</el-tag>
</span>
</template>
<template #column-intercept_status="{ row }">
<el-tag
:type="getInterceptStatusTagType(resolveOrderInterceptStatus(row))"
size="small"
>
<span :class="getStatusTextClass(getInterceptStatusTagType(resolveOrderInterceptStatus(row)))">
{{ translateInterceptStatus(resolveOrderInterceptStatus(row)) }}
</el-tag>
</span>
</template>
<template #empty>
@ -203,6 +200,7 @@ import {
translateInterceptStatus,
getInterceptStatusTagType,
getTagType,
getStatusTextClass,
fillExpressCompanyScanFieldOptions
} from '@/views/order/orderManagement/config/order-common-config'
@ -621,6 +619,8 @@ async function loadStoreOptions() {
</script>
<style scoped lang="scss">
@use "../../orderManagement/styles/order-sub.scss";
.pending-order-panel {
display: flex;
gap: 12px;

View File

@ -7,10 +7,10 @@
<el-descriptions :column="4" border size="small" class="detail-descriptions">
<el-descriptions-item label="波次编号">{{ getWaveCode(row) }}</el-descriptions-item>
<el-descriptions-item label="波次类型">
<el-tag size="small" type="info">{{ getWaveTypeText(row) }}</el-tag>
<span :class="getStatusTextClass('info')">{{ getWaveTypeText(row) }}</span>
</el-descriptions-item>
<el-descriptions-item label="波次状态">
<el-tag size="small" :type="getStatusTagType(row)">{{ getStatusText(row) }}</el-tag>
<span :class="getStatusTextClass(getStatusTagType(row))">{{ getStatusText(row) }}</span>
</el-descriptions-item>
<el-descriptions-item label="仓库ID">{{ row.warehouse_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="总订单数">{{ row.total_orders ?? getOrderCount(row) }}</el-descriptions-item>
@ -19,14 +19,14 @@
<el-descriptions-item label="快递编码">{{ row.logistics_code || '—' }}</el-descriptions-item>
<el-descriptions-item label="快递">{{ row.logistics_name || '—' }}</el-descriptions-item>
<el-descriptions-item label="区分快递">
<el-tag size="small" :type="Number(row?.distinguish_express) ? 'warning' : 'info'">
<span :class="getStatusTextClass(Number(row?.distinguish_express) ? 'warning' : 'info')">
{{ Number(row?.distinguish_express) ? '是' : '否' }}
</el-tag>
</span>
</el-descriptions-item>
<el-descriptions-item label="来源">
<el-tag size="small" :type="getWaveSourceTagType(row.source)">
<span :class="getStatusTextClass(getWaveSourceTagType(row.source))">
{{ formatWaveSource(row.source) }}
</el-tag>
</span>
</el-descriptions-item>
<el-descriptions-item label="创建人">{{ row.creator || row.creator_name || '—' }}</el-descriptions-item>
<el-descriptions-item label="商品类型">{{ row.item_part_type || '—' }}</el-descriptions-item>
@ -39,29 +39,29 @@
<div class="section-title">分配状态</div>
<el-descriptions :column="3" border size="small" class="detail-descriptions">
<el-descriptions-item label="库位分配状态">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(getStorageAssignmentStatusText(row))">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(getStorageAssignmentStatusText(row)))">
{{ getStorageAssignmentStatusText(row) }}
</el-tag>
</span>
</el-descriptions-item>
<el-descriptions-item label="快递分配状态">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.express_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.express_assignment_status))">
{{ formatWaveExpressAssignmentStatusLabel(row.express_assignment_status) }}
</el-tag>
</span>
</el-descriptions-item>
<el-descriptions-item label="打印分配状态">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.print_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.print_assignment_status))">
{{ formatWavePrintAssignmentStatusLabel(row.print_assignment_status) }}
</el-tag>
</span>
</el-descriptions-item>
<el-descriptions-item label="拣货状态">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.pick_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.pick_assignment_status))">
{{ formatWavePickAssignmentStatusLabel(row.pick_assignment_status) }}
</el-tag>
</span>
</el-descriptions-item>
<el-descriptions-item label="复核状态">
<el-tag size="small" :type="getWaveAssignmentAggregateTagType(row.review_assignment_status)">
<span :class="getStatusTextClass(getWaveAssignmentAggregateTagType(row.review_assignment_status))">
{{ formatWaveReviewAssignmentStatusLabel(row.review_assignment_status) }}
</el-tag>
</span>
</el-descriptions-item>
<el-descriptions-item label="未复核订单数">{{ row.unreviewed_order_count ?? '—' }}</el-descriptions-item>
</el-descriptions>
@ -90,6 +90,7 @@
<script setup lang="ts">
import { computed } from 'vue'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import {
waveStatusTextMap,
waveStorageAssignmentStatusTextMap,
@ -209,6 +210,8 @@ function formatDateTime(value: string | number | null | undefined) {
</script>
<style scoped lang="scss">
@use "../../orderManagement/styles/order-sub.scss";
.wave-batch-detail {
height: 100%;
overflow-y: auto;

View File

@ -351,7 +351,7 @@ export const waveStrategyColumns = [
{ prop: 'group_batch_max_orders', label: '团购单波最大', width: 120, align: 'center' },
{ prop: 'warehouse_id', label: '仓库ID', width: 90, align: 'center' },
{ prop: 'creator_name', label: '创建人', width: 100, align: 'center' },
{ prop: 'allowed_expresses', label: '允许快递', minWidth: 130 },
// { prop: 'allowed_expresses', label: '允许快递', minWidth: 130 },
{ prop: 'allowed_provinces', label: '允许省份', minWidth: 130 },
{ prop: 'allowed_platforms', label: '允许平台', minWidth: 130 },
{ prop: 'create_time', label: '创建时间', minWidth: 168 },

View File

@ -21,6 +21,11 @@
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
<el-divider direction="vertical" />
<WarehouseSelect
v-model="queryForm.warehouse_id"
@change="handleWarehouseChange"
/>
</div>
</div>
@ -292,14 +297,6 @@ const availableFields: any[] = [
placeholder: '商品编码/名称/条码',
group: '基础信息'
},
{
label: '全部仓库',
value: 'warehouse_id',
type: 'custom',
component: WarehouseSelect,
props: { width: '100%' },
group: '基础信息'
},
{
label: '商品名称',
value: 'item_name',
@ -670,7 +667,6 @@ function handleConditionChange(condition: any) {
function handleReset() {
queryForm.keyword = ''
queryForm.warehouse_id = undefined
currentCondition.value = {}
if (scanBox.value?.reset) {
scanBox.value.reset()
@ -691,6 +687,12 @@ function handleSizeChange(size: number) {
loadList()
}
/** toolbar 全部仓库切换:重置到第一页并刷新列表 */
function handleWarehouseChange() {
pagination.currentPage = 1
loadList()
}
function handleRowClick(row: any) {
selectedRow.value = row
loadImages(row)

View File

@ -25,6 +25,11 @@
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
<el-divider direction="vertical" />
<WarehouseSelect
v-model="warehouseFilterId"
@change="handleWarehouseChange"
/>
</div>
</div>
@ -321,25 +326,14 @@ const route = useRoute()
const initialConditions = ref<any>(null)
const currentCondition = ref<any>(null)
const currentConditionRaw = ref<any>(null)
/** toolbar 全部仓库筛选值(独立于 scan-box 条件,空值=全部仓库) */
const warehouseFilterId = ref<number | string | null>(null)
const presetTree = ref<any[]>([])
// 货主侧:移除货主筛选项,添加仓库筛选(插入到第一个基础信息分类中)
const availableFieldsRef = reactive((() => {
const fields = JSON.parse(JSON.stringify(availableFields)).filter((f: any) => f.value !== 'store_id')
// 在入库单号之后插入全部仓库
const idx = fields.findIndex((f: any) => f.value === 'entry_order_code')
if (idx !== -1) {
fields.splice(idx + 1, 0, {
label: '全部仓库',
value: 'warehouse_id',
type: 'custom',
component: WarehouseSelect,
props: { width: '100%' },
group: '基础信息'
})
}
return fields
})())
// 货主侧:移除货主筛选项(全部仓库已移出 scan-box,作为 toolbar 特殊选项)
const availableFieldsRef = reactive(
JSON.parse(JSON.stringify(availableFields)).filter((f: any) => f.value !== 'store_id')
)
const activeTab = ref('details')
@ -541,12 +535,26 @@ onMounted(() => {
}
})
/** toolbar 全部仓库过滤:与 scan-box 仓库条件等价的 eq 条件并入 where */
function applyWarehouseToWhere(where: Record<string, any>) {
const v = warehouseFilterId.value
if (v === null || v === undefined || v === '') return
where.warehouse_id = { operator: 'eq', value: v, type: 'number' }
}
/** toolbar 全部仓库切换:重置到第一页并刷新 */
function handleWarehouseChange() {
pagination.currentPage = 1
loadData()
}
async function loadData() {
if (loading.value) return
loading.value = true
const start = Date.now()
try {
const where = currentCondition.value || normalizeToWhere(scanBox.value?.getConditions?.() || {})
applyWarehouseToWhere(where)
const params: StorageEntryListParams = {
pagination: {
@ -646,6 +654,7 @@ function handlePageSizeChange(size: number) {
function buildExportPayload() {
const where = currentCondition.value || normalizeToWhere(scanBox.value?.getConditions?.() || {})
applyWarehouseToWhere(where)
const payload: any = { where }
if (currentSort.prop) {
payload.sort = {

View File

@ -26,6 +26,11 @@
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
<el-divider direction="vertical" />
<WarehouseSelect
v-model="warehouseFilterId"
@change="handleWarehouseChange"
/>
</div>
</div>
@ -200,23 +205,10 @@ import {
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const presetTree = ref<any[]>([])
// 货主侧:移除货主筛选项,添加仓库筛选(插入到第一个基础信息分类中)
const availableFieldsRef = reactive((() => {
const fields = JSON.parse(JSON.stringify(availableFields)).filter((f: any) => f.value !== 'store_id')
// 在商品ID之后插入全部仓库
const idx = fields.findIndex((f: any) => f.value === 'stock_id')
if (idx !== -1) {
fields.splice(idx + 1, 0, {
label: '全部仓库',
value: 'warehouse_id',
type: 'custom',
component: WarehouseSelect,
props: { width: '100%' },
group: '基础信息'
})
}
return fields
})())
// 货主侧:移除货主筛选项(全部仓库已移出 scan-box,作为 toolbar 特殊选项)
const availableFieldsRef = reactive(
JSON.parse(JSON.stringify(availableFields)).filter((f: any) => f.value !== 'store_id')
)
const settingsStore = useSettingsStore()
const userStore = useUserStore()
@ -263,6 +255,8 @@ const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const tableSize = ref('small')
const columns = ref(defaultColumns)
const currentCondition = ref<any>(null)
/** toolbar 全部仓库筛选值(独立于 scan-box 条件,空值=全部仓库) */
const warehouseFilterId = ref<number | string | null>(null)
const currentSort = reactive({ prop: 'created_at', order: 'DESC' })
const selectedIds = ref<number[]>([])
@ -422,6 +416,19 @@ async function loadFilterData() {
}
}
/** toolbar 全部仓库过滤:与 scan-box 仓库条件等价的过滤并入 where */
function applyWarehouseToWhere(where: Record<string, any>) {
const v = warehouseFilterId.value
if (v === null || v === undefined || v === '') return
where.warehouse_id = v
}
/** toolbar 全部仓库切换:重置到第一页并刷新 */
function handleWarehouseChange() {
pagination.currentPage = 1
loadList()
}
async function loadList() {
if (loading.value) return
const storeId = userStore.user?.store_id
@ -434,6 +441,7 @@ async function loadList() {
const start = Date.now()
try {
const where: Record<string, any> = { ...(currentCondition.value || {}) }
applyWarehouseToWhere(where)
const res: any = await stockTransactionStoreList({
where: Object.keys(where).length > 0 ? where : undefined,
@ -534,6 +542,7 @@ function buildExportPayload(mode: 'all' | 'selected'): Record<string, unknown> {
where.ids = selectedIds.value
} else if (mode === 'all') {
Object.assign(where, currentCondition.value || {})
applyWarehouseToWhere(where)
}
return {
store_id: storeId ? Number(storeId) : undefined,

View File

@ -25,6 +25,11 @@
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
<el-divider direction="vertical" />
<WarehouseSelect
v-model="warehouseFilterId"
@change="handleWarehouseChange"
/>
</div>
</div>
@ -183,6 +188,8 @@ const route = useRoute()
const initialConditions = ref<any>(null)
const currentCondition = ref<any>(null)
const currentConditionRaw = ref<any>(null)
/** toolbar 全部仓库筛选值(独立于 scan-box 条件,空值=全部仓库) */
const warehouseFilterId = ref<number | string | null>(null)
const {
splitStackRef,
@ -287,23 +294,10 @@ function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) {
handler()
}
// 货主侧:移除货主筛选项,添加仓库筛选(插入到第一个基础信息分类中)
const availableFieldsRef = reactive((() => {
const fields = JSON.parse(JSON.stringify(availableFields)).filter((f: any) => f.value !== 'store_id')
// 在收货单号之后插入全部仓库
const idx = fields.findIndex((f: any) => f.value === 'receiving_number')
if (idx !== -1) {
fields.splice(idx + 1, 0, {
label: '全部仓库',
value: 'warehouse_id',
type: 'custom',
component: WarehouseSelect,
props: { width: '100%' },
group: '基础信息'
})
}
return fields
})())
// 货主侧:移除货主筛选项(全部仓库已移出 scan-box,作为 toolbar 特殊选项)
const availableFieldsRef = reactive(
JSON.parse(JSON.stringify(availableFields)).filter((f: any) => f.value !== 'store_id')
)
const activeTab = ref('details')
@ -445,6 +439,19 @@ onMounted(() => {
}
})
/** toolbar 全部仓库过滤:与 scan-box 仓库条件等价的 eq 条件并入 where */
function applyWarehouseToWhere(where: Record<string, any>) {
const v = warehouseFilterId.value
if (v === null || v === undefined || v === '') return
where.warehouse_id = { operator: 'eq', value: v }
}
/** toolbar 全部仓库切换:重置到第一页并刷新 */
function handleWarehouseChange() {
pagination.currentPage = 1
loadData()
}
async function loadData() {
if (loading.value) return
loading.value = true
@ -452,6 +459,7 @@ async function loadData() {
try {
const rawCondition = currentConditionRaw.value ?? scanBox.value?.getConditions?.() ?? {}
const where = currentCondition.value || normalizeToWhere(rawCondition)
applyWarehouseToWhere(where)
const topParams = extractTopLevelParams(rawCondition)
const params: any = {
@ -552,6 +560,7 @@ function handlePageSizeChange(size: number) {
function buildExportPayload() {
const where = currentCondition.value || normalizeToWhere(scanBox.value?.getConditions?.() || {})
applyWarehouseToWhere(where)
const payload: any = { where }
if (currentSort.prop) {
payload.sort = {

View File

@ -19,6 +19,11 @@
<ExportModeDropdown :loading="exportLoading" @action="handleExportAction" />
<el-button size="small" @click="openColumnConfigPanel">字段设置</el-button>
<el-button size="small" @click="toggleDetailVisible">{{ detailVisible ? '隐藏详情' : '显示详情' }}</el-button>
<el-divider direction="vertical" />
<WarehouseSelect
v-model="warehouseFilterId"
@change="handleWarehouseChange"
/>
<!-- <span class="toolbar-title">库存报表</span>
<el-tag size="small" type="info">共 {{ pagination.total }} 条</el-tag> -->
<template v-if="pagination.total > 0">
@ -138,24 +143,11 @@ const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
const presetTree = ref<any[]>([])
const availableFieldsRef = reactive((() => {
const fields = JSON.parse(JSON.stringify(reportScanBoxAvailableFields)).filter(
const availableFieldsRef = reactive(
JSON.parse(JSON.stringify(reportScanBoxAvailableFields)).filter(
(f: any) => f.value !== 'store_id' && f.value !== 'by_space'
)
// 在关键字之后插入全部仓库(基础信息分组)
const idx = fields.findIndex((f: any) => f.value === 'keyword')
if (idx !== -1) {
fields.splice(idx + 1, 0, {
label: '全部仓库',
value: 'warehouse_id',
type: 'custom',
component: WarehouseSelect,
props: { width: '100%' },
group: '基础信息'
})
}
return fields
})())
)
const settingsStore = useSettingsStore()
const shortcutExpanded = computed(() => settingsStore.shortcutExpanded)
@ -230,6 +222,8 @@ const currentSort = reactive<{ prop: string; order: '' | 'ascending' | 'descendi
const selectedRid = ref<string | null>(null)
const currentConditionRaw = ref<any>({})
/** toolbar 全部仓库筛选值(独立于 scan-box 条件,空值=全部仓库) */
const warehouseFilterId = ref<number | string | null>(null)
const selectedRow = computed(() => fullList.value.find((r) => r.__rid === selectedRid.value) || null)
@ -311,8 +305,22 @@ function buildSortPayload(): StockReportSearchBody['sort'] | undefined {
}
}
/** toolbar 全部仓库过滤:并入报表查询 where(直接值,与报表后端约定一致) */
function applyWarehouseToWhere(where: Record<string, any>) {
const v = warehouseFilterId.value
if (v === null || v === undefined || v === '') return
where.warehouse_id = v
}
/** toolbar 全部仓库切换:重置到第一页并刷新 */
function handleWarehouseChange() {
pagination.currentPage = 1
loadData()
}
function buildReportQueryPayload(): StockReportSearchBody {
const where = normalizeScanConditionToReportWhere(currentConditionRaw.value)
applyWarehouseToWhere(where)
const sort = buildSortPayload()
const body: StockReportSearchBody = {}
if (Object.keys(where).length > 0) {

View File

@ -192,8 +192,8 @@
<script setup lang="ts">
import { ref, reactive, onMounted, computed } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { storeWarehouseWarehouseList } from '@/api/storeWarehouse.warehouse/storeWarehouse'
import { storeWarehouseUnbind, storeWarehouseRename, storeWarehouseConfirmSign } from '@/api/storeWarehouse.store/storeWarehouse'
import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse'
import { storeWarehouseUnbind, storeWarehouseRename, storeWarehouseConfirmSign } from '@/api/storewarehouse.store/storeWarehouse'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'