From 6c8843e85baa79fc1e9acc83d0caa387e61428ce Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sun, 30 Aug 2026 07:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=8A=A5=E8=A1=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8E=E6=8A=95=E9=80=92=E8=AE=A1=E5=88=92=EF=BC=9A?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8C=89id+type+fields=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E6=8A=95=E9=80=92=E8=AE=A1=E5=88=92=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AE=9A=E4=B9=89=E3=80=81=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E5=88=B0=E5=85=B6=E4=BB=96=E8=B4=A7=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - report.definition: save/list/delete/typeList 对接新契约(id upsert、type 注册表、fields 子集、{date} 文件名模板) - 报表定义表单改为下拉选 type + 勾选 fields(来自 report.definition.typeList) - 投递计划改按 report_id 关联报表定义,下拉单选、渠道收敛 inbox、新增计划名称与 store_name 展示 - 新增 report.deliveryPlan.copy 复制到其他货主(DeliveryPlanCopyDialog 多选货主) - inbox.group.quickList 增加 store_id 过滤;members 改为 groupIds 数组入参 - 移除导出任务标签页及关联代码 - 移除 code/scope/三段 JSON 配置等旧模型字段 --- src/api/inbox/inbox.ts | 6 +- src/api/report/report.ts | 177 +++++++-- .../newview/config/template-config.ts | 341 +++++++++++------- .../setting/basicManagement/newview/index.vue | 30 +- .../newview/pages/DefinitionFormDialog.vue | 238 ++++++------ .../newview/pages/DeliveryPlanCopyDialog.vue | 161 +++++++++ .../newview/pages/DeliveryPlanFormDialog.vue | 127 +++++-- 7 files changed, 747 insertions(+), 333 deletions(-) create mode 100644 src/views/system/setting/basicManagement/newview/pages/DeliveryPlanCopyDialog.vue diff --git a/src/api/inbox/inbox.ts b/src/api/inbox/inbox.ts index b0848c76..d28198b5 100644 --- a/src/api/inbox/inbox.ts +++ b/src/api/inbox/inbox.ts @@ -261,6 +261,8 @@ export function inboxGroupMessages(data: InboxGroupMessagesParams) { /** 群快速查询参数(下拉选择用,不分页) */ export interface InboxGroupQuickListParams { + /** 货主ID(>0 时按货主过滤;不传返回所有群) */ + store_id?: number // 货主ID,不传则返回全部 keyword?: string // 关键词,模糊匹配群名称与外部群ID groupType?: string // 群类型筛选:store(货主) / warehouse(仓库) / express(快递) limit?: number // 返回条数上限,默认20,最大100(无分页) @@ -283,12 +285,12 @@ export function inboxGroupQuickList(data: InboxGroupQuickListParams = {}) { /** 查询群成员参数(下拉选择用) */ export interface InboxGroupMembersParams { - groupId: number // 群记录主键ID(必填) + groupIds: number[] // 群记录主键ID数组(必填,非空) keyword?: string // 关键词,模糊匹配用户名与用户ID limit?: number // 返回条数上限,默认20,最大100(无分页) } -/** 查询指定群的成员列表(inbox.group.members) */ +/** 查询多个群的成员列表(inbox.group.members) */ export function inboxGroupMembers(data: InboxGroupMembersParams) { return request({ url: '/system', diff --git a/src/api/report/report.ts b/src/api/report/report.ts index dfc183a0..4e0ba746 100644 --- a/src/api/report/report.ts +++ b/src/api/report/report.ts @@ -91,8 +91,12 @@ export function generateTaskProgress( export interface DeliveryPlanSaveParams { /** 货主ID(必填,正整数;<=0 报错) */ store_id: number - /** 报表编码(必填,须为已启用的报表定义) */ - report_code: string + /** 计划名称(必填,≤100 字符) */ + name: string + /** 报表定义ID(必填,正整数;须为已启用 is_enabled=1 的报表定义;与 reportId 二选一,均传优先 reportId) */ + report_id: number + /** 报表定义ID驼峰别名(兼容,优先级高于 report_id) */ + reportId?: number /** 每日投递时间点数组(HH:mm 24 小时制,非空;自动去重并升序) */ schedule_times: string[] /** 投递渠道:仅支持 inbox,默认 inbox;wecom/link 已弃用 */ @@ -112,7 +116,14 @@ export interface DeliveryPlanSaveParams { export interface DeliveryPlanItem { id: number store_id: number - report_code: string + /** 货主名称(列表/详情展示) */ + store_name?: string + /** 计划名称 */ + name: string + /** 关联的报表定义ID(wms_report_definition.id) */ + report_definition_id: number + /** 关联报表名称(前端由 report_definition_id 关联填充) */ + report_name?: string schedule_times: string[] channel: string /** 是否启用:0=停用 1=启用 */ @@ -126,7 +137,7 @@ export interface DeliveryPlanItem { updated_at: string } -/** 新增/更新货主报表投递计划(货主 store_id + 报表 report_code 唯一,存在则更新) */ +/** 新增/更新货主报表投递计划(货主 store_id + 报表定义 report_id 唯一,存在则更新) */ export function saveDeliveryPlan( data: DeliveryPlanSaveParams ): Promise { @@ -147,8 +158,8 @@ export interface DeliveryPlanListParams { where?: { /** 货主ID(>0 时精确过滤) */ store_id?: number - /** 报表编码(精确过滤) */ - report_code?: string + /** 报表定义ID(>0 时精确过滤) */ + report_id?: number /** 启用状态:0=停用 1=启用;空值/未传不过滤 */ enabled?: number | string } @@ -191,6 +202,38 @@ export function listDeliveryPlan( } as any) } +export interface DeliveryPlanCopyParams { + /** 源投递计划ID(必填,正整数) */ + id: number + /** 目标货主ID数组(必填,正整数去重;复制到其他货主) */ + store_ids: number[] +} + +export interface DeliveryPlanCopyResult { + /** 成功复制的计划数 */ + copied: number + /** 复制后的计划ID列表 */ + plan_ids?: number[] + code?: number +} + +/** 复制投递计划到其他货主(report.deliveryPlan.copy) */ +export function copyDeliveryPlan( + data: DeliveryPlanCopyParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'report.deliveryPlan.copy', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + /* ===== 货主报表投递记录 ===== */ export interface DeliveryLogListParams { @@ -304,48 +347,104 @@ export function meta(data?: ReportMetaParams): Promise { } as any) } -/* ===== 报表定义管理 ===== */ +/* ===== 报表定义管理(report.definition.*) ===== */ + +/** 报表类型注册清单中的字段项(report.definition.typeList) */ +export interface ReportDefinitionTypeField { + /** 字段 key(与查询器返回行字段一一对应,如 item_code) */ + key: string + /** 字段中文名 */ + label: string + /** 字段类型:string/number/boolean/array */ + type?: string + /** 是否为格式化器预计算字段 */ + computed?: boolean + /** 是否为文本单元格(导出时按文本处理) */ + asText?: boolean + /** 数组类型字段的子字段清单(仅 type=array 时返回) */ + children?: ReportDefinitionTypeField[] +} + +/** 报表类型注册项(report.definition.typeList) */ +export interface ReportDefinitionTypeItem { + /** 类型 key(如 stockFlow) */ + key: string + /** 类型标题(如「库存变化以及补货报表」) */ + title: string + /** 口径描述 */ + description: string + /** 日窗口参数 */ + window: { + /** 窗口数量 */ + dayCount: number + /** 切点小时 0-23 */ + cutoverHour: number + } + /** 全量字段清单 */ + fields: ReportDefinitionTypeField[] +} + +export interface ReportDefinitionTypeListResult { + /** 注册类型清单(当前仅 stockFlow) */ + list: ReportDefinitionTypeItem[] + code?: number +} + +/** 查询报表类型注册清单(只读公共元数据;免权限/免鉴权/免审计日志,仅要求登录) */ +export function reportDefinitionTypeList(): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'report.definition.typeList', + v, + timestamp: new Date().getTime() + }, + data: {}, + isSystemApi: true + } as any) +} export interface ReportDefinitionSaveParams { - /** 报表编码(必填,upsert 键):小写字母开头,仅含小写字母/数字/下划线,长度 2-64 */ - code: string + /** 报表定义ID(正整数;不传视为新增;传入不存在报「报表定义不存在: id=」) */ + id?: number /** 报表名称(必填,≤100 字符) */ name: string - /** 适用维度:warehouse=仓库 / store=货主 / open=通用;默认 warehouse */ - scope?: string - /** 报表描述(≤500 字符,超出截断) */ - description?: string - /** 输出配置(对象或 JSON 字符串) */ - output_config?: Record - /** 数据源配置(对象或 JSON 字符串),query 须为注册表已有查询器 */ - source_config?: Record - /** 工作表配置(对象或 JSON 字符串) */ - sheet_config?: Record - /** 是否启用:0=停用 1=启用 */ + /** 报表类型(注册 key,如 stockFlow;新增必填,须命中注册表;更新时未传不覆盖既有值) */ + type?: string + /** 导出文件名模板(支持 {date} 占位;新增必填,≤200 字符;更新时未传不覆盖既有值) */ + file_name?: string + /** 导出文件名驼峰别名(兼容,优先级高于 file_name) */ + fileName?: string + /** 勾选字段 key 数组(新增必填,须为该类型注册字段子集;更新时未传不覆盖既有值) */ + fields?: string[] + /** 是否启用:0=停用 1=启用(仅入参存在时生效,未传不覆盖既有值) */ is_enabled?: number /** 备注(≤500 字符,超出截断) */ remark?: string } export interface ReportDefinitionItem { - /** 报表编码(保存后的定义 code 平铺为 report_code) */ - report_code: string + /** 报表定义ID */ id: number + /** 报表名称 */ name: string - /** 适用维度:warehouse/store/open */ - scope: string - description: string + /** 报表类型(注册 key,如 stockFlow) */ + type: string + /** 导出文件名模板(支持 {date} 占位) */ + file_name: string + /** 勾选字段 key 数组(保存后按传入顺序去重) */ + fields: string[] + /** 是否启用:0=停用 1=启用 */ is_enabled: number + /** 备注 */ remark: string - output_config: Record - source_config: Record - sheet_config: Record created_at: string updated_at: string code?: number } -/** 新增/更新报表定义(report.definition.save,按 code upsert) */ +/** 新增/更新报表定义(report.definition.save,按 id upsert,未传字段不覆盖) */ export function saveReportDefinition( data: ReportDefinitionSaveParams ): Promise { @@ -364,12 +463,10 @@ export function saveReportDefinition( export interface ReportDefinitionListParams { where?: { - /** 报表编码模糊关键字 */ - code?: string - /** 报表名称模糊关键字 */ + /** 报表名称模糊关键字(LIKE,通配符已转义) */ name?: string - /** 适用维度精确筛选(warehouse/store/open) */ - scope?: string + /** 报表类型精确筛选(注册 key,如 stockFlow;未命中注册表报「未知的报表类型」) */ + type?: string /** 启用状态精确筛选:0=停用 1=启用;空值/未传不过滤 */ is_enabled?: number | string } @@ -391,7 +488,7 @@ export interface ReportDefinitionListResult { code?: number } -/** 分页查询报表定义列表(report.definition.list) */ +/** 分页查询报表定义列表(report.definition.list,软删自动排除) */ export function listReportDefinition( data?: ReportDefinitionListParams ): Promise { @@ -409,19 +506,19 @@ export function listReportDefinition( } export interface ReportDefinitionDeleteParams { - /** 报表编码(必填,按 code 软删除;重复删除幂等成功) */ - code: string + /** 报表定义ID(必填,正整数;按 id 软删除,重复删除幂等成功) */ + id: number } export interface ReportDefinitionDeleteResult { - /** 已删除的报表编码(定义 code 平铺为 report_code) */ - report_code: string + /** 已删除的报表定义ID */ + id: number /** 删除结果标记(恒为 1) */ deleted: number code?: number } -/** 软删除报表定义(report.definition.delete) */ +/** 软删除报表定义(report.definition.delete,删除前检查启用中的投递计划引用) */ export function deleteReportDefinition( data: ReportDefinitionDeleteParams ): Promise { diff --git a/src/views/system/setting/basicManagement/newview/config/template-config.ts b/src/views/system/setting/basicManagement/newview/config/template-config.ts index 2c909cdc..9ab9b146 100644 --- a/src/views/system/setting/basicManagement/newview/config/template-config.ts +++ b/src/views/system/setting/basicManagement/newview/config/template-config.ts @@ -17,16 +17,23 @@ * 5. 在 router/map.ts 中添加路由 */ -import { ref, isRef, type Component, type Ref } from 'vue' +import { ref, isRef, computed, type Component, type Ref } from 'vue' import DetailPanel from './components/DetailPanel.vue' import LogPanel from './components/LogPanel.vue' import WarehouseSettingsForm from '../pages/WarehouseSettingsForm.vue' import ApiAppFormDialog from '../pages/ApiAppFormDialog.vue' import DeliveryPlanFormDialog from '../pages/DeliveryPlanFormDialog.vue' -import ExportReportDialog from '../pages/ExportReportDialog.vue' import DefinitionFormDialog from '../pages/DefinitionFormDialog.vue' +import DeliveryPlanCopyDialog from '../pages/DeliveryPlanCopyDialog.vue' import { apiAppList } from '@/api/apiapp/apiapp' -import { listDeliveryPlan, listDeliveryLog, meta, listReportDefinition } from '@/api/report/report' +import { + listDeliveryPlan, + listDeliveryLog, + listReportDefinition, + reportDefinitionTypeList, + type ReportDefinitionTypeField, + type ReportDefinitionTypeItem +} from '@/api/report/report' import { loadStores } from '@/api/index/index' // ============================================================ @@ -50,7 +57,7 @@ export const COMPONENT_REGISTRY: Record = { WarehouseSettingsForm, ApiAppFormDialog, DeliveryPlanFormDialog, - ExportReportDialog, + DeliveryPlanCopyDialog, DefinitionFormDialog } @@ -98,6 +105,112 @@ export async function loadStoreOptions() { return storeOptions.value } +// ============================================================ +// 〇-A2、报表类型注册清单(report.definition.typeList) +// ============================================================ +/** 报表类型注册清单缓存(type key → 类型描述) */ +export const reportTypeList = ref([]) +let reportTypeLoading = false +let reportTypePromise: Promise | null = null + +/** 加载报表类型注册清单(并发去重;失败回退空数组) */ +export async function loadReportTypeList(force = false): Promise { + if (reportTypeList.value.length && !force) return reportTypeList.value + if (reportTypeLoading && reportTypePromise) return reportTypePromise + reportTypeLoading = true + reportTypePromise = (async () => { + try { + const res: any = await reportDefinitionTypeList() + const list: ReportDefinitionTypeItem[] = Array.isArray(res?.list) + ? res.list + : (Array.isArray(res?.data?.list) ? res.data.list : []) + reportTypeList.value = list + // 填充标题映射,供 translate('reportType', typeKey) 使用 + const map: Record = {} + for (const item of list) { + map[item.key] = item.title || item.key + } + VALUE_MAPS.reportType = map + return list + } catch (e) { + console.error('加载报表类型注册清单失败', e) + return [] + } finally { + reportTypeLoading = false + reportTypePromise = null + } + })() + return reportTypePromise +} + +/** 报表类型下拉选项(value=类型 key,label=标题(key)) */ +export const reportTypeOptions = computed<{ value: string; label: string }[]>(() => + reportTypeList.value.map((t) => ({ + value: t.key, + label: t.title ? `${t.title}(${t.key})` : t.key + })) +) + +/** 取指定类型的注册字段清单 */ +export function getReportTypeFields(typeKey: string): ReportDefinitionTypeField[] { + return reportTypeList.value.find((t) => t.key === typeKey)?.fields ?? [] +} + +/** 取指定类型的注册信息(title/description/window,来自 report.definition.typeList) */ +export function getReportTypeInfo(typeKey: string): ReportDefinitionTypeItem | null { + return reportTypeList.value.find((t) => t.key === typeKey) ?? null +} + +/** 报表类型 key → 标题(未加载时回退空串) */ +export function reportTypeTitle(typeKey: string): string { + return reportTypeList.value.find((t) => t.key === typeKey)?.title ?? '' +} + +// ============================================================ +// 〇-A3、报表定义选项(report.definition.list,投递计划下拉关联用) +// ============================================================ +/** 可投递的报表定义选项(value=报表定义ID,label=报表名称(类型标题)) */ +export const reportDefinitionOptions = ref<{ value: number; label: string }[]>([]) +/** 报表定义 ID → 名称(全量非软删,用于投递计划列表/详情展示关联报表名) */ +export const reportDefinitionNameMap = ref>({}) +let reportDefinitionLoading = false + +/** 加载报表定义(force 强制刷新):下拉选项仅取启用项,名称映射取全量非软删 */ +export async function loadReportDefinitions(force = false): Promise<{ value: number; label: string }[]> { + if (reportDefinitionOptions.value.length && !force) return reportDefinitionOptions.value + if (reportDefinitionLoading) return reportDefinitionOptions.value + reportDefinitionLoading = true + try { + // 先确保类型标题就绪(选项文案里带类型标题) + await loadReportTypeList() + const res: any = await listReportDefinition({ + pagination: { page: 1, pageSize: 200 } + }) + const list: any[] = res?.data?.list ?? res?.list ?? [] + // 全量名称映射(列表/详情展示用,含停用报表) + const nameMap: Record = {} + for (const d of list) { + const id = Number(d?.id) + if (id > 0) nameMap[id] = d?.name ? String(d.name) : `报表 #${id}` + } + reportDefinitionNameMap.value = nameMap + // 下拉选项仅取启用项 + reportDefinitionOptions.value = list + .filter((d: any) => d && Number(d.id) > 0 && Number(d.is_enabled) === 1) + .map((d: any) => ({ + value: Number(d.id), + label: d.name ? `${d.name}(${reportTypeTitle(d.type) || d.type})` : `报表 #${d.id}` + })) + } catch (e) { + console.error('加载报表定义选项失败', e) + reportDefinitionOptions.value = [] + reportDefinitionNameMap.value = {} + } finally { + reportDefinitionLoading = false + } + return reportDefinitionOptions.value +} + // ============================================================ // 〇-B、SCANBOX_GROUPS — ScanBox 分组名称 // ============================================================ @@ -164,7 +277,9 @@ export const VALUE_MAPS: Record> = { /** 报表导出任务状态 */ taskStatus: { 'submitted': '已提交', 'running': '执行中', 'success': '已完成', 'failed': '失败', 'not_found': '未找到' }, /** 报表适用维度(report.meta.scope) */ - scope: { 'warehouse': '仓库', 'store': '货主', 'open': '通用' } + scope: { 'warehouse': '仓库', 'store': '货主', 'open': '通用' }, + /** 报表定义类型标题(report.definition.typeList,运行时填充) */ + reportType: {} } /** 从 VALUE_MAPS 衍生 options(优先取中文值作为 option value) */ @@ -269,14 +384,14 @@ export const FIELD_DICT: Record = { slot: null, detailLabel: '报表名称' }, + /** 报表定义类型(注册 key,选项来自 report.definition.typeList) */ type: { key: 'type', - label: '类型', - scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: getOptions('type') }, - table: { minWidth: 100, align: 'center' }, - slot: { type: 'tag', tagType: 'info', translateField: 'type' }, - detailLabel: '类型', - filterParamMap: { '类型A': 'A', '类型B': 'B', '类型C': 'C' } + label: '报表类型', + scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: reportTypeOptions as any }, + table: { minWidth: 140, align: 'center' }, + slot: { type: 'tag', tagType: 'info', translateField: 'reportType' }, + detailLabel: '报表类型' }, status: { key: 'status', @@ -450,6 +565,15 @@ export const FIELD_DICT: Record = { slot: null, detailLabel: '货主' }, + /** 货主名称(列表/详情展示,来自 deliveryPlan.list 的 store_name) */ + store_name: { + key: 'store_name', + label: '货主', + scanBox: null, + table: { minWidth: 120, showOverflowTooltip: true }, + slot: null, + detailLabel: '货主' + }, /** 报表编码 */ report_code: { key: 'report_code', @@ -459,6 +583,42 @@ export const FIELD_DICT: Record = { slot: null, detailLabel: '报表编码' }, + /** 报表定义:导出文件名模板(支持 {date} 占位) */ + file_name: { + key: 'file_name', + label: '导出文件名', + scanBox: null, + table: { minWidth: 180, showOverflowTooltip: true }, + slot: null, + detailLabel: '导出文件名' + }, + /** 投递计划筛选:关联的报表定义ID(下拉选项来自 report.definition.list 启用项) */ + report_id: { + key: 'report_id', + label: '报表', + scanBox: { type: 'select', group: SCANBOX_GROUPS.basic, options: reportDefinitionOptions as any }, + table: null, + slot: null, + detailLabel: '报表' + }, + /** 投递计划:关联的报表定义ID(详情展示) */ + report_definition_id: { + key: 'report_definition_id', + label: '报表定义ID', + scanBox: null, + table: null, + slot: null, + detailLabel: '报表定义ID' + }, + /** 投递计划:关联报表名称(列表/详情展示,前端由 report_definition_id 关联填充) */ + report_name: { + key: 'report_name', + label: '报表', + scanBox: null, + table: { minWidth: 180, showOverflowTooltip: true }, + slot: null, + detailLabel: '报表' + }, /** 每日投递时间点(HH:mm 数组) */ schedule_times: { key: 'schedule_times', @@ -675,12 +835,12 @@ export const FIELD_DICT: Record = { slot: null, detailLabel: '切点小时' }, - /** 查询器静态字段清单(report.meta.fields) */ + /** 查询器静态字段清单(report.meta.fields)/ 报表定义勾选字段 key 数组 */ fields: { key: 'fields', label: '字段清单', scanBox: null, - table: null, + table: { minWidth: 240, showOverflowTooltip: true }, slot: { type: 'pre' }, detailLabel: '字段清单' }, @@ -791,6 +951,8 @@ export interface TabPageRawConfig { name: string label: string scanBoxCacheKey: string + /** 本标签页字段 label 覆盖(key=字段 key,覆盖 FIELD_DICT 的 label/detailLabel;如计划页 name 显示为「计划名称」) */ + labelOverrides?: Record /** ScanBox 需要的字段 key 列表(从 FIELD_DICT 中查找) */ scanBoxFieldKeys: string[] /** 表格需要的列 key 列表(从 FIELD_DICT 中查找) */ @@ -855,7 +1017,7 @@ export function resolveTabConfig(raw: TabPageRawConfig): TabPageConfig { const def = FIELD_DICT[key] if (!def || !def.scanBox) continue scanBoxFields.push({ - label: def.label, + label: raw.labelOverrides?.[def.key] ?? def.label, value: def.key, type: def.scanBox.type, options: def.scanBox.options @@ -873,7 +1035,7 @@ export function resolveTabConfig(raw: TabPageRawConfig): TabPageConfig { if (!def || !def.table) continue columns.push({ prop: def.key, - label: def.label, + label: raw.labelOverrides?.[def.key] ?? def.label, ...def.table }) } @@ -896,7 +1058,7 @@ export function resolveTabConfig(raw: TabPageRawConfig): TabPageConfig { if (!def) return null return { key: def.key, - label: def.detailLabel ?? def.label, + label: raw.labelOverrides?.[def.key] ?? def.detailLabel ?? def.label, translateField: def.slot?.translateField, tagResolver: def.slot?.tagResolver, tagType: def.slot?.tagType, @@ -1054,16 +1216,6 @@ export const TOOLBAR_BUTTONS: Record = { action: 'openCreatePlan', onlyForTabs: ['plan'] }, - /** 提交报表导出(仅导出任务标签页) */ - submitExport: { - key: 'submitExport', - label: '提交导出', - category: 'function', - type: 'primary', - size: 'small', - action: 'openExportReport', - onlyForTabs: ['export'] - }, /** 新增报表定义(仅报表定义标签页) */ createDefinition: { key: 'createDefinition', @@ -1238,8 +1390,9 @@ export const tabPages: TabPageRawConfig[] = [ name: 'plan', label: '投递计划', scanBoxCacheKey: 'basic-settings-plan', - scanBoxFieldKeys: ['store_id', 'report_code', 'enabled'], - tableColumnKeys: ['id', 'store_id', 'report_code', 'schedule_times', 'channel', 'enabled', 'late_grace_minutes', 'notify_group_ids', 'notify_member_ids', 'remark', 'created_at', 'updated_at', 'operation'], + scanBoxFieldKeys: ['store_id', 'report_id', 'enabled'], + labelOverrides: { name: '计划名称' }, + tableColumnKeys: ['id', 'name', 'store_name', 'report_name', 'schedule_times', 'channel', 'enabled', 'late_grace_minutes', 'notify_group_ids', 'notify_member_ids', 'remark', 'created_at', 'updated_at', 'operation'], upperTableDefaults: { title: '报表投递计划', showSelection: false @@ -1251,7 +1404,7 @@ export const tabPages: TabPageRawConfig[] = [ { title: '基础信息', columnCount: 3, - fieldKeys: ['store_id', 'report_code', 'schedule_times', 'channel', 'enabled', 'late_grace_minutes', 'remark'] + fieldKeys: ['store_name', 'name', 'report_name', 'report_definition_id', 'schedule_times', 'channel', 'enabled', 'late_grace_minutes', 'remark'] }, { title: '通知配置', @@ -1268,7 +1421,14 @@ export const tabPages: TabPageRawConfig[] = [ list: listDeliveryPlan, detail: { source: 'list' }, parseListResponse(res) { - return { list: res?.data?.list ?? res?.list ?? [], total: res?.data?.total ?? res?.total ?? 0 } + const list: any[] = res?.data?.list ?? res?.list ?? [] + // 后端不返回报表名称,按 report_definition_id 关联填充(停用/软删报表回退显示 id) + const enriched = list.map((row) => { + const id = Number(row?.report_definition_id) + if (!(id > 0)) return row + return { ...row, report_name: reportDefinitionNameMap.value[id] || `报表 #${id}` } + }) + return { list: enriched, total: res?.data?.total ?? res?.total ?? 0 } }, buildListParams({ pagination, conditions, sort }) { return { @@ -1287,9 +1447,9 @@ export const tabPages: TabPageRawConfig[] = [ formKey: 'DeliveryPlanFormDialog', paramMap: { store_id: 'store_id', - report_code: 'report_code', + name: 'name', + report_definition_id: 'report_definition_id', schedule_times: 'schedule_times', - channel: 'channel', late_grace_minutes: 'late_grace_minutes', remark: 'remark', notify_template: 'notify_template', @@ -1297,6 +1457,19 @@ export const tabPages: TabPageRawConfig[] = [ notify_member_ids: 'notify_member_ids' } }, + { + key: 'copyPlan', + label: '复制', + actionType: 'form', + type: 'primary', + formKey: 'DeliveryPlanCopyDialog', + paramMap: { + id: 'id', + name: 'name', + store_id: 'store_id', + report_name: 'report_name' + } + }, { key: 'viewDetail', label: '查看详情', @@ -1361,60 +1534,13 @@ export const tabPages: TabPageRawConfig[] = [ ] }, - // ===== 标签页五:导出任务(列表来自 report.meta 查询报表元数据;导出用 report.generate + report.generateTaskProgress) ===== - { - name: 'export', - label: '导出任务', - scanBoxCacheKey: 'basic-settings-export', - scanBoxFieldKeys: ['report_code'], - tableColumnKeys: ['report_code', 'name', 'scope', 'query', 'day_count', 'cutover_hour', 'operation'], - upperTableDefaults: { - title: '报表定义(report.meta)', - showSelection: false, - emptyText: '请输入报表编码查询报表元数据' - }, - detailTabs: [ - { name: 'detail', label: '报表详情', componentKey: 'DetailPanel' } - ], - detailSections: [ - { - title: '报表信息', - columnCount: 3, - fieldKeys: ['report_code', 'name', 'scope', 'query', 'day_count', 'cutover_hour'] - }, - { - title: '可导出字段', - columnCount: 1, - fieldKeys: ['fields'] - } - ], - api: { - list: queryReportMetaList, - detail: { source: 'list' }, - parseListResponse(res) { - return { list: res?.data?.list ?? [], total: res?.data?.total ?? 0 } - }, - buildListParams({ conditions }) { - return { report_code: conditions?.report_code } - } - }, - operationButtons: [ - { - key: 'exportThisReport', - label: '导出此报表', - actionType: 'action', - type: 'primary' - } - ] - }, - - // ===== 标签页六:报表定义(wms_report_definition 管理,report.definition.*) ===== + // ===== 标签页五:报表定义(wms_report_definition 管理,report.definition.*) ===== { name: 'definition', label: '报表定义', scanBoxCacheKey: 'basic-settings-definition', - scanBoxFieldKeys: ['report_code', 'name', 'scope', 'is_enabled'], - tableColumnKeys: ['report_code', 'name', 'scope', 'description', 'is_enabled', 'remark', 'updated_at', 'operation'], + scanBoxFieldKeys: ['name', 'type', 'is_enabled'], + tableColumnKeys: ['id', 'name', 'type', 'file_name', 'fields', 'is_enabled', 'remark', 'updated_at', 'operation'], upperTableDefaults: { title: '报表定义', showSelection: false @@ -1426,12 +1552,12 @@ export const tabPages: TabPageRawConfig[] = [ { title: '基本信息', columnCount: 3, - fieldKeys: ['report_code', 'name', 'scope', 'description', 'is_enabled', 'remark'] + fieldKeys: ['id', 'name', 'type', 'file_name', 'is_enabled', 'remark'] }, { title: '配置信息', columnCount: 1, - fieldKeys: ['output_config', 'source_config', 'sheet_config'] + fieldKeys: ['fields'] }, { title: '时间信息', @@ -1461,16 +1587,13 @@ export const tabPages: TabPageRawConfig[] = [ type: 'warning', formKey: 'DefinitionFormDialog', paramMap: { - report_code: 'report_code', - code: 'code', + id: 'id', name: 'name', - scope: 'scope', - description: 'description', + type: 'type', + file_name: 'file_name', + fields: 'fields', is_enabled: 'is_enabled', - remark: 'remark', - output_config: 'output_config', - source_config: 'source_config', - sheet_config: 'sheet_config' + remark: 'remark' } }, { @@ -1491,37 +1614,3 @@ export const tabPages: TabPageRawConfig[] = [ // ============================================================ export const templateTabs = tabPages.map((t) => ({ name: t.name, label: t.label, scanBoxCacheKey: t.scanBoxCacheKey })) -// ============================================================ -// 十四、导出任务:报表元数据查询(report.meta) -// ============================================================ -/** - * 按报表编码调用 report.meta 查询报表元数据,包装为列表行(导出任务页的 api.list)。 - * 未传报表编码时返回空列表。 - */ -export async function queryReportMetaList(params?: { report_code?: string }): Promise { - const code = params?.report_code - if (!code) { - return { code: 1, data: { list: [], total: 0 } } - } - try { - const res: any = await meta({ report_code: code }) - const payload = res?.data ?? res - if (payload && payload.report_code) { - const row = { - report_code: payload.report_code, - name: payload.name, - scope: payload.scope, - query: payload.query, - day_count: payload.window?.dayCount, - cutover_hour: payload.window?.cutoverHour, - fields: payload.fields ?? [] - } - return { code: 1, data: { list: [row], total: 1 } } - } - return { code: 1, data: { list: [], total: 0 } } - } catch (e) { - console.error('查询报表元数据失败', e) - return { code: 1, data: { list: [], total: 0 } } - } -} - diff --git a/src/views/system/setting/basicManagement/newview/index.vue b/src/views/system/setting/basicManagement/newview/index.vue index a1ce79d5..6529cd13 100644 --- a/src/views/system/setting/basicManagement/newview/index.vue +++ b/src/views/system/setting/basicManagement/newview/index.vue @@ -247,10 +247,6 @@ v-model:visible="definitionCreateVisible" @success="handleDefinitionSaved" /> - @@ -277,6 +273,8 @@ import { resolveTabConfig, getTabToolbarButtons, loadStoreOptions, + loadReportTypeList, + loadReportDefinitions, type TabPageConfig, type DetailTabConfig, type ToolbarButtonConfig, @@ -285,7 +283,6 @@ import { apiAppDelete, apiAppRegenerateSecret } from '@/api/apiapp/apiapp' import { deleteReportDefinition } from '@/api/report/report' import ApiAppFormDialog from './pages/ApiAppFormDialog.vue' import DeliveryPlanFormDialog from './pages/DeliveryPlanFormDialog.vue' -import ExportReportDialog from './pages/ExportReportDialog.vue' import DefinitionFormDialog from './pages/DefinitionFormDialog.vue' // ============================================================ @@ -453,7 +450,6 @@ const toolbarActionMap: Record void> = { openCreateApiApp: () => { apiAppCreateVisible.value = true }, openCreatePlan: () => { createPlanVisible.value = true }, openCreateDefinition: () => { definitionCreateVisible.value = true }, - openExportReport: () => { exportReportVisible.value = true }, handleExport: () => { console.log('[BasicManagement] 导出(不含明细)', activeTabName.value) }, handleExportItem: () => { console.log('[BasicManagement] 导出(含明细)', activeTabName.value) } } @@ -484,10 +480,9 @@ async function handleOperationAction(key: string, row: Record) { // 投递计划编辑弹窗提交成功后触发,刷新列表 loadData() break - case 'exportThisReport': - // 将该报表编码带入导出弹窗 - exportInitialReportCode.value = row?.report_code ?? '' - exportReportVisible.value = true + case 'copyPlan': + // 投递计划复制成功后刷新列表 + loadData() break case 'regenerateSecret': await handleRegenerateSecret(row) @@ -509,9 +504,6 @@ async function handleOperationAction(key: string, row: Record) { const apiAppCreateVisible = ref(false) const createPlanVisible = ref(false) const definitionCreateVisible = ref(false) -const exportReportVisible = ref(false) -/** 导出弹窗初始报表编码(导出任务行「导出此报表」带入) */ -const exportInitialReportCode = ref('') function handleApiAppDialogSuccess() { loadData() @@ -560,13 +552,13 @@ async function handleDeleteApiApp(row: Record) { } async function handleDeleteReportDefinition(row: Record) { - const code = row?.report_code ?? row?.code - if (!code) { - ElMessage.warning('缺少报表编码') + const id = Number(row?.id) + if (!(id > 0)) { + ElMessage.warning('缺少报表定义ID') return } try { - const res: any = await deleteReportDefinition({ code }) + const res: any = await deleteReportDefinition({ id }) if (res && (res.code === 1 || res.code === 200)) { ElMessage.success('已删除') loadData() @@ -759,6 +751,10 @@ const upperPaneFullStyle = computed(() => ({ // ============================================================ onMounted(() => { void loadStoreOptions() + // 预加载报表类型注册清单(报表定义页 type 筛选下拉与表单字段依赖) + void loadReportTypeList() + // 预加载报表定义选项(投递计划页报表筛选下拉与表单下拉依赖) + void loadReportDefinitions() loadData() }) diff --git a/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue b/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue index 3e4701e0..9fdf7d3a 100644 --- a/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue +++ b/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue @@ -1,6 +1,7 @@