diff --git a/src/api/camera/camera.ts b/src/api/camera/camera.ts new file mode 100644 index 00000000..646b5ba3 --- /dev/null +++ b/src/api/camera/camera.ts @@ -0,0 +1,96 @@ +import request from '@/utils/request' + +const v = '1.0' + +/** 摄像头列表(仓库隔离,分页+筛选) */ +export function list(data?: { + pagination?: { page?: number; pageSize?: number } + where?: { server_id?: number; custom_name?: string; status?: number } +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.list', + v, + timestamp: new Date().getTime() + }, + data: data || {}, + isSystemApi: true + } as any) +} + +/** 摄像头详情 */ +export function detail(data: { id: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.detail', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 新增摄像头 */ +export function create(data: { + server_id: number + channel_id: number + channel_name?: string + custom_name?: string + status?: number + remark?: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.create', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 更新摄像头 */ +export function update(data: { + id: number + server_id?: number + channel_id?: number + channel_name?: string + custom_name?: string + status?: number + remark?: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.update', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 删除摄像头(软删除) */ +export function del(data: { id: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera.delete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/api/camera_server/camera_server.ts b/src/api/camera_server/camera_server.ts new file mode 100644 index 00000000..1beacb36 --- /dev/null +++ b/src/api/camera_server/camera_server.ts @@ -0,0 +1,102 @@ +import request from '@/utils/request' + +const v = '1.0' + +/** 录像服务器列表(仓库隔离,分页+筛选) */ +export function list(data?: { + pagination?: { page?: number; pageSize?: number } + where?: { name?: string; status?: number } +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera_server.list', + v, + timestamp: new Date().getTime() + }, + data: data || {}, + isSystemApi: true + } as any) +} + +/** 录像服务器详情 */ +export function detail(data: { id: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera_server.detail', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 新增录像服务器 */ +export function create(data: { + name: string + brand?: string + public_ip?: string + internal_ip?: string + port?: number + username?: string + password?: string + status?: number + remark?: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera_server.create', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 更新录像服务器 */ +export function update(data: { + id: number + name?: string + brand?: string + public_ip?: string + internal_ip?: string + port?: number + username?: string + password?: string + status?: number + remark?: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera_server.update', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 删除录像服务器(软删除) */ +export function del(data: { id: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'camera_server.delete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts index 6ad647fd..9aee220a 100644 --- a/src/api/workbench/workbench.ts +++ b/src/api/workbench/workbench.ts @@ -108,3 +108,21 @@ export function checkBarcode(data: { isSystemApi: true } as any) } + +/** 工作台业务入口(免登录免鉴权,入参 name + data,业务逻辑待实现) */ +export function business(data: { + name: string + data?: Record +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'workbench.business', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/views/mode/components/ColumnCellRenderer.vue b/src/views/mode/components/ColumnCellRenderer.vue new file mode 100644 index 00000000..4711251e --- /dev/null +++ b/src/views/mode/components/ColumnCellRenderer.vue @@ -0,0 +1,67 @@ + + + + diff --git a/src/views/mode/components/TabArea.vue b/src/views/mode/components/TabArea.vue new file mode 100644 index 00000000..288ec6f1 --- /dev/null +++ b/src/views/mode/components/TabArea.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/mode/config/components/DetailPanel.vue b/src/views/mode/config/components/DetailPanel.vue new file mode 100644 index 00000000..816093ee --- /dev/null +++ b/src/views/mode/config/components/DetailPanel.vue @@ -0,0 +1,96 @@ + + + + + + diff --git a/src/views/mode/config/components/LogPanel.vue b/src/views/mode/config/components/LogPanel.vue new file mode 100644 index 00000000..229c8ea1 --- /dev/null +++ b/src/views/mode/config/components/LogPanel.vue @@ -0,0 +1,165 @@ + + + + + + diff --git a/src/views/mode/config/template-config.ts b/src/views/mode/config/template-config.ts new file mode 100644 index 00000000..6f2ad576 --- /dev/null +++ b/src/views/mode/config/template-config.ts @@ -0,0 +1,318 @@ +/** + * 【页面模板】配置文件 + * + * ===== 快速上手 ===== + * 1. 复制整个 views/mode/ 文件夹,重命名为你的页面名 + * 2. 修改本文件中的 tabPages 配置(标签页名称、列、筛选字段) + * 3. 替换 index.vue 中的 defineOptions name + * 4. 在 index.vue 的 loadData() 中接入真实接口 + * 5. 在 router/map.ts 中添加路由 + * + * ===== 结构说明 ===== + * - PAGE_CONFIG → 全局开关(是否显示 TabArea、单页模式等) + * - tabPages → 标签页列表,每个标签页独立配置列/筛选/明细 + * - resolveTabConfig → 将原始配置展开为组件可用的完整配置 + */ + +import type { Component } from 'vue' +import DetailPanel from './components/DetailPanel.vue' +import LogPanel from './components/LogPanel.vue' + +// ============================================================ +// 〇、全局页面配置 +// ============================================================ +export const PAGE_CONFIG = { + /** 是否显示顶部多标签栏(false 时所有标签页通过右侧按钮切换) */ + showTabArea: true, + /** 单页模式:不显示标签栏,仅一个标签页内容 */ + singlePage: false +} + +// ============================================================ +// 一、表格列配置 +// ============================================================ +export interface ColumnConfig { + prop: string + label: string + minWidth?: number + width?: number + fixed?: 'left' | 'right' | boolean + align?: 'left' | 'center' | 'right' + sortable?: boolean + showOverflowTooltip?: boolean +} + +// ============================================================ +// 二、列插槽(Slot)配置 —— 自定义单元格渲染 +// ============================================================ +export interface ColumnSlotConfig { + /** 渲染类型 */ + type: 'tag' | 'text' + /** tag 颜色:固定值 或 值→颜色映射 */ + tagType?: string | Record + /** 翻译映射表(值→显示文本),如 { '1': '启用', '0': '禁用' } */ + translateMap?: Record + /** 格式化类型 */ + format?: 'datetime' +} + +// ============================================================ +// 三、ScanBox 筛选字段配置 +// ============================================================ +export interface ScanBoxFieldConfig { + label: string + value: string + type: 'text' | 'select' | 'daterange' | 'number' + options?: { label: string; value: any }[] + group?: string +} + +// ============================================================ +// 四、明细面板配置 +// ============================================================ +export interface DetailFieldConfig { + key: string + label: string + span?: number + renderType?: 'text' | 'tag' + tagType?: string | Record + translateMap?: Record +} + +export interface DetailSectionConfig { + title: string + columnCount: number + fields: DetailFieldConfig[] +} + +export interface DetailTabConfig { + name: string + label: string + componentKey: string + component?: Component +} + +// ============================================================ +// 五、标签页原始配置(声明式,resolveTabConfig 展开) +// ============================================================ +export interface TabPageRawConfig { + /** 标签页唯一标识 */ + name: string + /** 标签页显示名称 */ + label: string + /** ScanBox 缓存 key(不同标签页用不同 key 避免串数据) */ + scanBoxCacheKey: string + /** ScanBox 筛选字段 */ + scanBoxFields: ScanBoxFieldConfig[] + /** UpperTable 列配置 */ + tableColumns: ColumnConfig[] + /** UpperTable 标题 */ + tableTitle: string + /** 列插槽配置(key=列prop) */ + columnSlots?: Record + /** 明细面板分组 */ + detailSections: DetailSectionConfig[] + /** 明细面板标签页(默认仅"明细") */ + detailTabs?: { name: string; label: string; componentKey: string }[] +} + +// ============================================================ +// 六、展开后的完整配置(index.vue 直接使用) +// ============================================================ +export interface TabPageConfig { + name: string + label: string + scanBoxCacheKey: string + scanBoxFields: ScanBoxFieldConfig[] + upperTable: { + title: string + columns: ColumnConfig[] + } + columnSlots: Record + detailConfig: DetailSectionConfig[] + detailTabs: DetailTabConfig[] +} + +// ============================================================ +// 七、resolveTabConfig —— 展开原始配置 +// ============================================================ +export function resolveTabConfig(raw: TabPageRawConfig): TabPageConfig { + const defaultDetailComponent = DetailPanel + + const detailTabs: DetailTabConfig[] = raw.detailTabs + ? raw.detailTabs.map((tab) => ({ + name: tab.name, + label: tab.label, + componentKey: tab.componentKey, + component: + tab.componentKey === 'LogPanel' ? LogPanel : defaultDetailComponent + })) + : [ + { + name: 'detail', + label: '明细', + componentKey: 'DetailPanel', + component: defaultDetailComponent + } + ] + + return { + name: raw.name, + label: raw.label, + scanBoxCacheKey: raw.scanBoxCacheKey, + scanBoxFields: raw.scanBoxFields, + upperTable: { + title: raw.tableTitle, + columns: raw.tableColumns + }, + columnSlots: raw.columnSlots ?? {}, + detailConfig: raw.detailSections, + detailTabs + } +} + +// ============================================================ +// 八、标签页注册表 — 在这里定义你的页面标签页 +// ============================================================ + +export const tabPages: TabPageRawConfig[] = [ + // ===== 示例标签页一 ===== + { + name: 'tab1', + label: '标签页一', + scanBoxCacheKey: 'template-tab1', + scanBoxFields: [ + { label: '编号', value: 'code', type: 'text', group: '基础信息' }, + { + label: '状态', + value: 'status', + type: 'select', + group: '基础信息', + options: [ + { label: '待处理', value: '待处理' }, + { label: '处理中', value: '处理中' }, + { label: '已完成', value: '已完成' } + ] + }, + { + label: '类型', + value: 'type', + type: 'select', + group: '基础信息', + options: [ + { label: '类型A', value: '类型A' }, + { label: '类型B', value: '类型B' }, + { label: '类型C', value: '类型C' } + ] + }, + { label: '创建人', value: 'creator', type: 'text', group: '基础信息' }, + { + label: '创建时间', + value: 'create_time', + type: 'daterange', + group: '时间范围' + } + ], + tableColumns: [ + { prop: 'code', label: '编号', minWidth: 160, fixed: 'left', showOverflowTooltip: true }, + { prop: 'name', label: '名称', minWidth: 150, showOverflowTooltip: true }, + { prop: 'type', label: '类型', minWidth: 100, align: 'center' }, + { + prop: 'status', + label: '状态', + minWidth: 100, + align: 'center' + }, + { prop: 'count', label: '数量', minWidth: 80, align: 'center', sortable: true }, + { prop: 'amount', label: '金额(元)', minWidth: 110, align: 'center', sortable: true }, + { prop: 'creator', label: '创建人', minWidth: 100 }, + { prop: 'create_time', label: '创建时间', minWidth: 170, sortable: true } + ], + tableTitle: '示例列表一', + columnSlots: { + type: { type: 'tag', tagType: 'info' }, + status: { + type: 'tag', + tagType: { '待处理': 'warning', '处理中': '', '已完成': 'success' } + }, + create_time: { type: 'text', format: 'datetime' } + }, + detailSections: [ + { + title: '基础信息', + columnCount: 3, + fields: [ + { key: 'code', label: '编号' }, + { key: 'name', label: '名称' }, + { key: 'type', label: '类型', renderType: 'tag', tagType: 'info' }, + { key: 'status', label: '状态', renderType: 'tag', tagType: { '待处理': 'warning', '处理中': '', '已完成': 'success' } }, + { key: 'count', label: '数量' }, + { key: 'amount', label: '金额(元)' }, + { key: 'creator', label: '创建人' } + ] + }, + { + title: '时间信息', + columnCount: 2, + fields: [ + { key: 'create_time', label: '创建时间' }, + { key: 'update_time', label: '更新时间' } + ] + } + ], + detailTabs: [ + { name: 'detail', label: '明细', componentKey: 'DetailPanel' }, + { name: 'log', label: '操作日志', componentKey: 'LogPanel' } + ] + }, + + // ===== 示例标签页二 ===== + { + name: 'tab2', + label: '标签页二', + scanBoxCacheKey: 'template-tab2', + scanBoxFields: [ + { label: '编号', value: 'code', type: 'text', group: '基础信息' }, + { + label: '状态', + value: 'status', + type: 'select', + group: '基础信息', + options: [ + { label: '待处理', value: '待处理' }, + { label: '处理中', value: '处理中' }, + { label: '已完成', value: '已完成' } + ] + } + ], + tableColumns: [ + { prop: 'code', label: '编号', minWidth: 160, fixed: 'left' }, + { prop: 'name', label: '名称', minWidth: 150 }, + { prop: 'status', label: '状态', minWidth: 100, align: 'center' }, + { prop: 'count', label: '数量', minWidth: 80, align: 'center', sortable: true }, + { prop: 'creator', label: '创建人', minWidth: 100 }, + { prop: 'create_time', label: '创建时间', minWidth: 170, sortable: true } + ], + tableTitle: '示例列表二', + columnSlots: { + status: { + type: 'tag', + tagType: { '待处理': 'warning', '处理中': '', '已完成': 'success' } + }, + create_time: { type: 'text', format: 'datetime' } + }, + detailSections: [ + { + title: '基础信息', + columnCount: 3, + fields: [ + { key: 'code', label: '编号' }, + { key: 'name', label: '名称' }, + { key: 'status', label: '状态', renderType: 'tag', tagType: { '待处理': 'warning', '处理中': '', '已完成': 'success' } }, + { key: 'count', label: '数量' }, + { key: 'creator', label: '创建人' } + ] + } + ] + } +] diff --git a/src/views/mode/index.vue b/src/views/mode/index.vue new file mode 100644 index 00000000..037aaedc --- /dev/null +++ b/src/views/mode/index.vue @@ -0,0 +1,709 @@ + + + + + + diff --git a/src/views/order/waveOrder2/components/public/OperationCellRenderer.vue b/src/views/order/waveOrder2/components/public/OperationCellRenderer.vue new file mode 100644 index 00000000..2354fd12 --- /dev/null +++ b/src/views/order/waveOrder2/components/public/OperationCellRenderer.vue @@ -0,0 +1,171 @@ + + + + + + diff --git a/src/views/order/waveOrder2/config/waveorder-config.ts b/src/views/order/waveOrder2/config/waveorder-config.ts index bb090231..660947d1 100644 --- a/src/views/order/waveOrder2/config/waveorder-config.ts +++ b/src/views/order/waveOrder2/config/waveorder-config.ts @@ -29,11 +29,12 @@ export const COMPONENT_REGISTRY: Record = { LogPanel } // 每个字段拥有: -// label — 唯一翻译文本 -// scanBox — ScanBox 渲染配置(type/options/group/required) -// table — 表格列配置(minWidth/fixed/align/sortable) -// slot — 单元格渲染配置(tag/tagResolver/translateField) -// detailLabel — 明细面板中的标签文本(可选,默认用 label) +// label — 唯一翻译文本 +// scanBox — ScanBox 渲染配置(type/options/group/required) +// table — 表格列配置(minWidth/fixed/align/sortable) +// slot — 单元格渲染配置(tag/tagResolver/translateField) +// detailLabel — 明细面板中的标签文本(可选,默认用 label) +// filterParamMap — ScanBox 筛选值 → API 传参值映射(如 '团购'→'1') export interface FieldDefinition { /** 字段唯一标识(作为 key 使用) */ @@ -63,7 +64,7 @@ export interface FieldDefinition { } | null /** 单元格渲染配置(null 表示默认文本渲染) */ slot: { - type: 'tag' | 'text' | 'default' + type: 'tag' | 'text' | 'default' | 'operation' /** 固定 tag 颜色 或 值→颜色映射表 */ tagType?: string | Record /** tagResolver 函数名(查 TAG_RESOLVERS) */ @@ -75,6 +76,8 @@ export interface FieldDefinition { } | null /** 明细面板标签文本(不设则用 label) */ detailLabel?: string + /** ScanBox 筛选选项值 → API 传参值映射(如 '团购'→'1');未配置则原值传递 */ + filterParamMap?: Record } // ============================================================ @@ -207,7 +210,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: getOptions('wave_type') }, table: { minWidth: 96, align: 'center' }, slot: { type: 'tag', tagType: 'info', translateField: 'wave_type' }, - detailLabel: '波次类型' + detailLabel: '波次类型', + filterParamMap: { '团购': '1', '散单': '2' } }, wave_status: { key: 'wave_status', @@ -215,7 +219,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: getOptions('wave_status') }, table: { minWidth: 110, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolveWaveStatusTag', translateField: 'wave_status' }, - detailLabel: '波次状态' + detailLabel: '波次状态', + filterParamMap: { '自动加团中': '0', '已就绪': '1' } }, total_orders: { key: 'total_orders', @@ -244,7 +249,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: getOptions('distinguish_express') }, table: { minWidth: 100, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolveBoolTag', translateField: 'distinguish_express' }, - detailLabel: '区分快递' + detailLabel: '区分快递', + filterParamMap: { '是': '1', '否': '0' } }, logistics_name: { key: 'logistics_name', @@ -294,7 +300,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.process, options: getOptions('storage_assignment_status') }, table: { minWidth: 120, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolveAssignTag', translateField: 'storage_assignment_status' }, - detailLabel: '库位分配状态' + detailLabel: '库位分配状态', + filterParamMap: { '未分配': '未分配', '已分配': '已分配', '部分分配': '部分分配' } }, express_assignment_status: { key: 'express_assignment_status', @@ -302,7 +309,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.process, options: getOptions('express_assignment_status') }, table: { minWidth: 120, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolveAssignTag', translateField: 'express_assignment_status' }, - detailLabel: '快递分配状态' + detailLabel: '快递分配状态', + filterParamMap: { '未分配': 'unassigned', '已分配': 'assigned' } }, print_assignment_status: { key: 'print_assignment_status', @@ -310,7 +318,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.process, options: getOptions('print_assignment_status') }, table: { minWidth: 110, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolvePrintTag', translateField: 'print_assignment_status' }, - detailLabel: '打印分配状态' + detailLabel: '打印分配状态', + filterParamMap: { '未打印': 'unprinted', '已打印': 'printed' } }, pick_assignment_status: { key: 'pick_assignment_status', @@ -318,7 +327,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.process, options: getOptions('pick_assignment_status') }, table: { minWidth: 110, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolvePickTag', translateField: 'pick_assignment_status' }, - detailLabel: '拣货状态' + detailLabel: '拣货状态', + filterParamMap: { '未拣货': 'unpicked', '部分拣货': 'partially_picked', '已拣货': 'picked' } }, review_assignment_status: { key: 'review_assignment_status', @@ -326,7 +336,8 @@ export const FIELD_DICT: Record = { scanBox: { type: 'select', group: SCANBOX_GROUPS.process, options: getOptions('review_assignment_status') }, table: { minWidth: 110, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolveReviewTag', translateField: 'review_assignment_status' }, - detailLabel: '复核状态' + detailLabel: '复核状态', + filterParamMap: { '未复核': 'unreviewed', '已复核': 'reviewed' } }, unreviewed_order_count: { key: 'unreviewed_order_count', @@ -499,6 +510,15 @@ export const FIELD_DICT: Record = { scanBox: null, table: { minWidth: 168, sortable: true }, slot: { type: 'text', format: 'datetime' } + }, + + // ---- 操作列(虚拟字段,仅用于表格列渲染) ---- + operation: { + key: 'operation', + label: '操作', + scanBox: null, + table: { minWidth: 180, fixed: 'right', align: 'center' }, + slot: { type: 'operation' } } } @@ -506,7 +526,7 @@ export const FIELD_DICT: Record = { // 三、列插槽配置类型(与 ColumnCellRenderer 配合) // ============================================================ export interface ColumnSlotConfig { - type: 'tag' | 'text' | 'default' + type: 'tag' | 'text' | 'default' | 'operation' tagType?: string | Record tagResolver?: string translateField?: string @@ -514,6 +534,42 @@ export interface ColumnSlotConfig { format?: 'datetime' } +// ============================================================ +// 三-A、操作列按钮配置 +// ============================================================ + +/** 单个操作按钮配置 */ +export interface OperationButtonConfig { + /** 按钮唯一标识 */ + key: string + /** 按钮文本 */ + label: string + /** 按钮类型 */ + type?: 'primary' | 'success' | 'warning' | 'danger' | 'info' | '' + /** 按钮行为类型:'form' 打开表单组件 | 'action' 调用回调函数 */ + actionType: 'form' | 'action' + /** actionType='form' 时:表单组件 key(查 COMPONENT_REGISTRY) */ + formKey?: string + /** actionType='form' 时:表单对话框标题 */ + formTitle?: string + /** actionType='form' 时:表单对话框宽度 */ + formWidth?: string + /** 传递给表单的行数据字段列表(key: 表单prop, value: 行数据字段名) */ + paramMap?: Record + /** 传递给表单的固定参数(与 paramMap 合并) */ + extraParams?: Record + /** 按钮禁用条件字段(行数据中该字段为 falsy 时禁用) */ + disabledOnField?: string + /** 点击后先弹出确认框的提示文本(如"确定要批量拣货吗?") */ + confirmMessage?: string + /** 确认框标题 */ + confirmTitle?: string + /** 确认框类型 */ + confirmType?: 'warning' | 'danger' | 'info' + /** 确认按钮文本 */ + confirmButtonText?: string +} + // ============================================================ // 四、明细面板配置类型(与 DetailPanel 配合) // ============================================================ @@ -600,7 +656,7 @@ export interface TabPageApiConfig { /** 明细面板接口配置(DetailPanel),可选——不配时直接用 row 数据 */ detail?: ComponentApiConfig - /** 操作日志接口配置(LogPanel),可选——不配时用 row 生成 mock 日志 */ + /** 操作日志接口配置(LogPanel),可选——不配时用 row 生成日志 */ log?: ComponentApiConfig /** 导出接口(导出按钮调用),可选 */ @@ -654,13 +710,12 @@ export interface TabPageRawConfig { columnCount: number fieldKeys: string[] }[] - /** 接口配置(有 api 时优先使用真实接口,mock 作为 fallback) */ + /** 接口配置(有 api 时优先使用真实接口) */ api?: TabPageApiConfig - mock?: { - generateList: (count: number) => Record[] - generateDetail: (row: Record) => Record | null - } + /** 操作列按钮配置(需 tableColumnKeys 包含 'operation') */ + operationButtons?: OperationButtonConfig[] + toolbar?: { left?: ToolbarButton[] showRefresh?: boolean @@ -691,10 +746,8 @@ export interface TabPageConfig { detailTabs: DetailTabConfig[] /** 接口配置(透传自 TabPageRawConfig.api) */ api?: TabPageApiConfig - mock?: { - generateList: (count: number) => Record[] - generateDetail: (row: Record) => Record | null - } + /** 操作列按钮配置 */ + operationButtons?: OperationButtonConfig[] toolbar?: { left?: ToolbarButton[] showRefresh?: boolean @@ -791,77 +844,60 @@ export function resolveTabConfig(raw: TabPageRawConfig): TabPageConfig { detailConfig, detailTabs, api: raw.api, - mock: raw.mock, + operationButtons: raw.operationButtons, toolbar: raw.toolbar } } // ============================================================ -// 七、通用模拟数据 +// 七-A、buildWhereConditions — 将 ScanBox 条件转为 API where 参数 // ============================================================ +// 自动应用 FIELD_DICT.filterParamMap 进行值映射(如 '团购'→'1') -export function makeBaseMockWaveList(count = 25) { - const assignStatuses = ['未分配', '已分配', '部分分配'] - const printStatuses = ['未打印', '已打印'] - const pickStatuses = ['未拣货', '部分拣货', '已拣货'] - const reviewStatuses = ['未复核', '已复核'] - const expressNames = ['顺丰速运', '圆通快递', '中通快递', '韵达快递', '申通快递'] - const creators = ['张三', '李四', '王五', '赵六', '陈七'] - const warehouseIds = [1, 2, 3, 4, 5] - const pad = (n: number) => String(n).padStart(2, '0') +/** + * 将 ScanBox 原始条件转换为接口 where 参数 + * 1. 提取条件值(支持 { operator, value } 和原始值两种格式) + * 2. 通过 FIELD_DICT[key].filterParamMap 映射值 + * 3. 过滤 warehouse_id(由框架层注入) + */ +export function buildWhereConditions(rawConditions: Record): Record { + const where: Record = {} + for (const [key, cond] of Object.entries(rawConditions || {})) { + // 跳过仓库ID(由框架层统一处理) + if (key === 'warehouse_id' || key === 'warehouseId') continue - return Array.from({ length: count }, (_, i) => { - const idx = i + 1 - const created = new Date(2026, 6, 10 - Math.floor(i / 3), 8 + Math.floor(i / 2), idx % 60, 0) - const updated = new Date(created.getTime() + (idx % 12) * 3600000) - return { - id: idx, - wave_no: `WV202607${pad(Math.floor(idx / 5) + 1)}${pad(idx)}`, - wave_type: idx % 3 === 0 ? '团购' : '散单', - wave_status: idx % 4 === 0 ? '自动加团中' : '已就绪', - total_orders: 10 + (idx % 50), - order_count: 8 + (idx % 45), - processed_orders: idx % 2 === 0 ? 0 : (3 + (idx % 8)), - distinguish_express: idx % 3 === 0 ? '是' : '否', - storage_assignment_status: assignStatuses[idx % 3], - express_assignment_status: idx % 2 === 0 ? '已分配' : '未分配', - print_assignment_status: printStatuses[idx % 2], - pick_assignment_status: pickStatuses[idx % 3], - review_assignment_status: reviewStatuses[idx % 2], - unreviewed_order_count: idx % 2 === 0 ? 0 : (1 + (idx % 5)), - logistics_name: expressNames[idx % expressNames.length], - creator: creators[idx % creators.length], - warehouse_id: warehouseIds[idx % warehouseIds.length], - create_time: created.toISOString().replace('T', ' ').slice(0, 19), - update_time: updated.toISOString().replace('T', ' ').slice(0, 19) + let value: any = undefined + + // ScanBox 标准格式:{ operator: '=', value: 'xxx' } + if (cond && typeof cond === 'object' && 'operator' in cond) { + value = (cond as any).value + } else if (cond !== undefined && cond !== null && cond !== '') { + // 原始值格式:字符串直接使用,数组取第一个 + value = Array.isArray(cond) ? cond[0] ?? '' : cond } - }) -} -export function makeBaseMockDetail(row: Record) { - if (!row) return null - return { - ...row, - wave_code: row.wave_no, - batch_code: row.wave_no, - status: row.wave_status, - creator_name: row.creator, - order_list_preview: [ - `订单 OD2026070100${row.id}1 — 商品A ×2, 商品B ×1`, - `订单 OD2026070100${row.id}2 — 商品C ×3`, - `订单 OD2026070100${row.id}3 — 商品D ×1, 商品E ×2` - ].join('\n'), - order_info_summary: `共 ${row.total_orders} 个订单,涉及 ${row.order_count} 个SKU`, - item_snapshot_text: `SKU-A(×${(row.id % 5) + 2}), SKU-B(×${(row.id % 3) + 1}), SKU-C(×${(row.id % 4) + 2})`, - storage_assignment_error: - row.storage_assignment_status === '部分分配' - ? `SKU-C 库位不足,仅分配 ${(row.id % 3) + 1} 件` - : '' + // 跳过空值 + if (value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)) { + continue + } + + // 通过 FIELD_DICT.filterParamMap 映射值 + const def = FIELD_DICT[key] + if (def?.filterParamMap) { + const mapped = def.filterParamMap[String(value)] + if (mapped !== undefined) { + where[key] = mapped + continue + } + } + + where[key] = value } + return where } // ============================================================ -// 八、标签页注册表(仅声明 key,由 resolveTabConfig 展开) +// 七、标签页注册表(仅声明 key,由 resolveTabConfig 展开) // ============================================================ export const waveOrder2TabPages: TabPageRawConfig[] = [ @@ -884,7 +920,7 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ 'storage_assignment_status', 'express_assignment_status', 'print_assignment_status', 'pick_assignment_status', 'review_assignment_status', 'unreviewed_order_count', 'logistics_name', 'creator', 'warehouse_id', - 'create_time', 'update_time' + 'create_time', 'update_time', 'operation' ], upperTableDefaults: { title: '团购波次列表', @@ -922,16 +958,8 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ }, buildListParams({ pagination, conditions, sort }) { const where: Record = { wave_type: 1 } - for (const [key, cond] of Object.entries(conditions)) { - if (cond && typeof cond === 'object' && 'value' in cond) { - const v = (cond as any).value - if (v !== undefined && v !== null && v !== '' && !(Array.isArray(v) && v.length === 0)) { - where[key] = v - } - } else if (cond !== undefined && cond !== null && cond !== '') { - where[key] = cond - } - } + // 合并 ScanBox 条件(自动应用 filterParamMap 映射) + Object.assign(where, buildWhereConditions(conditions)) const apiParams: Record = { pagination, where } if (sort?.prop) { apiParams.sort = { sortField: sort.prop, sortOrder: sort.order === 'ascending' ? 'ASC' : 'DESC' } @@ -939,10 +967,24 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ return apiParams } }, - mock: { - generateList: makeBaseMockWaveList, - generateDetail: makeBaseMockDetail - } + operationButtons: [ + { + key: 'handleOrders', + label: '处理订单', + actionType: 'action', + type: 'primary' + }, + { + key: 'batchPick', + label: '批量拣货', + actionType: 'action', + type: 'success', + confirmMessage: '确定要对当前波次执行批量拣货(一键完成整个波次拣货)吗?', + confirmTitle: '批量拣货', + confirmType: 'warning', + confirmButtonText: '确认拣货' + } + ] }, // ===== 标签页二:散单波次(wave_type=2) ===== @@ -964,7 +1006,7 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ 'storage_assignment_status', 'express_assignment_status', 'print_assignment_status', 'pick_assignment_status', 'review_assignment_status', 'unreviewed_order_count', 'logistics_name', 'creator', 'warehouse_id', - 'create_time', 'update_time' + 'create_time', 'update_time', 'operation' ], upperTableDefaults: { title: '散单波次列表', @@ -1002,16 +1044,8 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ }, buildListParams({ pagination, conditions, sort }) { const where: Record = { wave_type: 2 } - for (const [key, cond] of Object.entries(conditions)) { - if (cond && typeof cond === 'object' && 'value' in cond) { - const v = (cond as any).value - if (v !== undefined && v !== null && v !== '' && !(Array.isArray(v) && v.length === 0)) { - where[key] = v - } - } else if (cond !== undefined && cond !== null && cond !== '') { - where[key] = cond - } - } + // 合并 ScanBox 条件(自动应用 filterParamMap 映射) + Object.assign(where, buildWhereConditions(conditions)) const apiParams: Record = { pagination, where } if (sort?.prop) { apiParams.sort = { sortField: sort.prop, sortOrder: sort.order === 'ascending' ? 'ASC' : 'DESC' } @@ -1019,10 +1053,24 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ return apiParams } }, - mock: { - generateList: makeBaseMockWaveList, - generateDetail: makeBaseMockDetail - } + operationButtons: [ + { + key: 'handleOrders', + label: '处理订单', + actionType: 'action', + type: 'primary' + }, + { + key: 'batchPick', + label: '批量拣货', + actionType: 'action', + type: 'success', + confirmMessage: '确定要对当前波次执行批量拣货(一键完成整个波次拣货)吗?', + confirmTitle: '批量拣货', + confirmType: 'warning', + confirmButtonText: '确认拣货' + } + ] }, // ===== 标签页三:快递分配 ===== @@ -1056,35 +1104,7 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ columnCount: 2, fieldKeys: ['create_time'] } - ], - mock: { - generateList(count) { - const companies = ['顺丰速运', '圆通快递', '中通快递', '韵达快递', '申通快递'] - const pad = (n: number) => String(n).padStart(2, '0') - return Array.from({ length: count }, (_, i) => { - const idx = i + 1 - const total = 5 + (idx % 20) - const assigned = idx % 2 === 0 ? total : Math.floor(total * 0.6) - return { - id: idx, - wave_no: `WV202607${pad(Math.floor(idx / 5) + 1)}${pad(idx)}`, - wave_type: idx % 3 === 0 ? '团购' : '散单', - express_company: companies[idx % companies.length], - express_assignment_status: idx % 2 === 0 ? '已分配' : '未分配', - express_bill_count: total, - distinguish_express: idx % 3 === 0 ? '是' : '否', - assigned_count: assigned, - unassigned_count: total - assigned, - creator: ['张三', '李四'][idx % 2], - create_time: new Date(2026, 6, 10 - Math.floor(i / 4), 10, i % 60).toISOString().replace('T', ' ').slice(0, 19) - } - }) - }, - generateDetail(row) { - if (!row) return null - return { ...row, order_info_summary: `波次 ${row.wave_no} 快递分配详情`, item_snapshot_text: `共 ${row.express_bill_count} 单` } - } - } + ] }, // ===== 标签页四:拣货状态 ===== @@ -1119,37 +1139,7 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ columnCount: 2, fieldKeys: ['pick_start_time', 'pick_end_time', 'create_time'] } - ], - mock: { - generateList(count) { - const pickers = ['拣货员A', '拣货员B', '拣货员C'] - const statuses = ['未拣货', '部分拣货', '已拣货'] - const pad = (n: number) => String(n).padStart(2, '0') - return Array.from({ length: count }, (_, i) => { - const idx = i + 1 - const total = 3 + (idx % 15) - const picked = statuses[idx % 3] === '已拣货' ? total : statuses[idx % 3] === '部分拣货' ? Math.floor(total * 0.5) : 0 - const st = new Date(2026, 6, 11 - Math.floor(i / 4), 8, i % 60) - return { - id: idx, - wave_no: `WV202607${pad(Math.floor(idx / 5) + 1)}${pad(idx)}`, - wave_type: idx % 3 === 0 ? '团购' : '散单', - pick_assignment_status: statuses[idx % 3], - picker: statuses[idx % 3] !== '未拣货' ? pickers[idx % pickers.length] : '—', - pick_cart_no: statuses[idx % 3] !== '未拣货' ? `CART-${pad(idx)}` : '—', - picked_sku_count: picked, - unpicked_sku_count: total - picked, - pick_start_time: statuses[idx % 3] !== '未拣货' ? st.toISOString().replace('T', ' ').slice(0, 19) : '—', - pick_end_time: statuses[idx % 3] === '已拣货' ? new Date(st.getTime() + 3600000 * (idx % 4 + 1)).toISOString().replace('T', ' ').slice(0, 19) : '—', - create_time: new Date(2026, 6, 10, 8, i % 60).toISOString().replace('T', ' ').slice(0, 19) - } - }) - }, - generateDetail(row) { - if (!row) return null - return { ...row, order_info_summary: `波次 ${row.wave_no} 拣货详情`, item_snapshot_text: `已拣 ${row.picked_sku_count}/${row.picked_sku_count + row.unpicked_sku_count} SKU` } - } - } + ] }, // ===== 标签页五:复核状态 ===== @@ -1183,36 +1173,7 @@ export const waveOrder2TabPages: TabPageRawConfig[] = [ columnCount: 2, fieldKeys: ['review_start_time', 'review_end_time', 'create_time'] } - ], - mock: { - generateList(count) { - const reviewers = ['复核员X', '复核员Y'] - const statuses = ['未复核', '已复核'] - const pad = (n: number) => String(n).padStart(2, '0') - return Array.from({ length: count }, (_, i) => { - const idx = i + 1 - const total = 4 + (idx % 12) - const unreviewed = statuses[idx % 2] === '未复核' ? total : 0 - const st = new Date(2026, 6, 11 - Math.floor(i / 5), 9, i % 60) - return { - id: idx, - wave_no: `WV202607${pad(Math.floor(idx / 5) + 1)}${pad(idx)}`, - wave_type: idx % 3 === 0 ? '团购' : '散单', - review_assignment_status: statuses[idx % 2], - reviewer: statuses[idx % 2] === '已复核' ? reviewers[idx % reviewers.length] : '—', - reviewed_order_count: total - unreviewed, - unreviewed_order_count: unreviewed, - review_start_time: statuses[idx % 2] === '已复核' ? st.toISOString().replace('T', ' ').slice(0, 19) : '—', - review_end_time: statuses[idx % 2] === '已复核' ? new Date(st.getTime() + 7200000 * (idx % 3 + 1)).toISOString().replace('T', ' ').slice(0, 19) : '—', - create_time: new Date(2026, 6, 10, 9, i % 60).toISOString().replace('T', ' ').slice(0, 19) - } - }) - }, - generateDetail(row) { - if (!row) return null - return { ...row, order_info_summary: `波次 ${row.wave_no} 复核详情`, item_snapshot_text: `已复核 ${row.reviewed_order_count} 单,未复核 ${row.unreviewed_order_count} 单` } - } - } + ] } ] @@ -1243,9 +1204,6 @@ export const waveOrder2Columns = (() => { return resolveTabConfig(raw).upperTable.columns })() -export const generateMockWaveList = waveOrder2TabPages[0]?.mock?.generateList ?? makeBaseMockWaveList -export const generateMockDetail = waveOrder2TabPages[0]?.mock?.generateDetail ?? makeBaseMockDetail - // ============================================================ // 十一、工具栏按钮系统(参照 orderManagement 设计) // ============================================================ diff --git a/src/views/order/waveOrder2/index.vue b/src/views/order/waveOrder2/index.vue index 51a0186d..17482723 100644 --- a/src/views/order/waveOrder2/index.vue +++ b/src/views/order/waveOrder2/index.vue @@ -60,7 +60,7 @@ :enable-column-config="currentTabConfig?.upperTable.enableColumnConfig ?? true" :column-config-schema-version="1" :table-id="`wave-order2-table-${activeTabName}`" - :data="mockList" + :data="listData" :row-key="'wave_no'" :columns="currentColumns" table-size="small" @@ -73,7 +73,7 @@ @row-click="handleRowClick" @page-change="handlePageChange" @page-size-change="handlePageSizeChange" - @refresh="loadMockData" + @refresh="loadData" @sort-change="handleSortChange" @selection-change="handleSelectionChange" > @@ -83,7 +83,16 @@ :key="`${columnSlotsKey}-${colProp}`" #[`column-${colProp}`]="{ row }" > + + + @@ -149,18 +158,38 @@ :extracted-payload="batchOperationExtractedPayload" @success="handleFormSuccess" /> + + + + +