diff --git a/src/api/dashboard.ts b/src/api/dashboard.ts index b9cce1b5..07e1c4ed 100644 --- a/src/api/dashboard.ts +++ b/src/api/dashboard.ts @@ -33,26 +33,26 @@ export function getStoreStats(data: any = {}) { * 获取订单趋势数据 */ export function getOrderTrend(data: any = {}) { - return getDashboardData('dashboard.orderTrend', data) + return getDashboardData('dashboard.order_trend', data) } /** * 获取平台分布数据 */ export function getPlatformDist(data: any = {}) { - return getDashboardData('dashboard.platformDist', data) + return getDashboardData('dashboard.platform_distribution', data) } /** * 获取商品排行数据 */ export function getHotOrderRank(data: any = {}) { - return getDashboardData('dashboard.hotOrderRank', data) + return getDashboardData('dashboard.hot_order_rank', data) } /** * 获取快递占比数据 */ export function getExpressRatio(data: any = {}) { - return getDashboardData('dashboard.expressRatio', data) + return getDashboardData('dashboard.express_ratio', data) } diff --git a/src/api/order/order.ts b/src/api/order/order.ts index 82da44fc..253afd3f 100644 --- a/src/api/order/order.ts +++ b/src/api/order/order.ts @@ -78,3 +78,31 @@ export const getarchiveOrderlist = (data: any): Promise => { data: data }) } + +// 订单列表接口(接口文档:order.list) +export const orderList = (data: any): Promise => { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.list', + v, + timestamp: new Date().getTime() + }, + data: data + }) +} + +// 查询订单详情(接口文档:order.detail) +export const orderDetail = (data: any): Promise => { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.detail', + v, + timestamp: new Date().getTime() + }, + data: data + }) +} diff --git a/src/test.txt b/src/test.txt index 3b7a1c2b..c9028a24 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1,120 +1,23 @@ 接口文档更新: [ { - "id": "2026.04.08-system-08", - "date": "2026-04-08", - "method": "storage.inventory.transferByProduct", - "type": "added", - "summary": "新增按商品维度移库接口", - "detail": "新增 storage.inventory.transferByProduct 接口,按库位+商品查找所有库存记录合并移动。入参为 space_id(原库位ID)、stock_id(商品SKU ID,即 wms_stock_warehouse.id)、target_space_id(目标库位ID)、quantity(移库数量)。开启批次管理(is_batch_mgmt=Y)的商品会被拒绝,需使用 transferLocation 按库存记录精确移库。复用 storage_transfer_completed 通知事件,操作日志编码 STORAGE_TRANSFER_BY_PRODUCT。isNeedAuth=true, isNeedLogin=true。" - } - { - "id": "2026.04.08-system-09", - "date": "2026-04-08", - "method": "storeWarehouse.store.list", - "type": "updated", - "summary": "补充 storeWarehouse.store.list 完整 response 输出字段说明,移除 api_config / apiConfig", - "detail": "从返回结果中移除 api_config 和 apiConfig 字段(代码中 delete serialized.api_config / delete serialized.apiConfig),文档 response 补充完整输出字段列表:id, store_id, store_name, warehouse_id, warehouse_name, counterparty_id, counterparty_name, current_subject_role, auth_status, auth_status_label, apply_reason, review_comment, apply_time, review_time, auth_start, auth_end, actual_end, print_quantity, applied_by, reviewed_by, ended_by, remask, use_status, policy_config, is_auth_valid, remaining_days 以及分页和 current_subject 信息。" - }, - { - "id": "2026.04.08-system-10", - "date": "2026-04-08", - "method": "storeWarehouse.store.list", - "type": "changed", - "summary": "货主列表返回新增 has_qimen_config 布尔字段", - "detail": "storeWarehouse.store.list 返回的 data.list[] 中新增 has_qimen_config(boolean),表示该货主是否已配置奇门。" - }, - { - "id": "2026.04.08-system-11", - "date": "2026-04-08", - "method": "stock.warehouse.search", - "type": "updated", - "summary": "补全 stock.warehouse.search 接口文档,新增 params / response / errors 完整说明", - "detail": "入参补充 keyword(string,模糊匹配 item_code / item_name / goods_code / barcode)和 store_id(number,按货主筛选)。响应补充 data 数组各字段(id, item_code, goods_code, item_name, sku_property, stock_unit, quantity, locked_quantity, brand_name, item_type, barcodes, store_stock)以及 total。errors 补充 code=0 搜索失败场景。" - }, - { - "id": "2026.04.08-system-12", - "date": "2026-04-08", - "method": "stock.warehouse.search", - "type": "updated", - "summary": "新增 with_stock / is_batch 参数,支持返回关联库存明细(按库位分组或按批次逐条)", - "detail": "入参新增 with_stock(boolean,默认 false,是否返回关联库存数据)和 is_batch(boolean,默认 false,仅 with_stock=true 时生效,按批次明细返回)。响应 data[] 新增 storage[] 字段:is_batch=false 时按库位分组汇总(含 space_id、space、inventory_type、quantity、locked_quantity、available_quantity);is_batch=true 时逐条返回批次明细(含 id、stock_id、space_id、batch_no、inventory_type、quantity、locked_quantity、available_quantity、production_date、expiry_date、inbound_time、inbound_order_no、supplier_batch_no、created_at、space)。" - }, - { - "id": "2026.04.08-system-13", - "date": "2026-04-08", - "method": "wms_stock_transaction", - "type": "added", - "summary": "新增 wms_stock_transaction 表和模型", - "detail": "新增出入库流水记录表 wms_stock_transaction,含 transaction_type(INBOUND/OUTBOUND)、warehouse_id、store_id、stock_id、storage_id、space_id、quantity、batch_no、inventory_type、order_type、order_no、order_id、receiving_id、entry_order_id、operator_id、operator_name、remark 等字段,关联 StockWarehouse 和 Storage 模型。" - }, - { - "id": "2026.04.08-system-14", - "date": "2026-04-08", - "method": "storage.inventory.quickPutaway,storage.inventory.matchPutaway", - "type": "updated", - "summary": "quickPutaway 和 matchPutaway 入库时自动写入出入库记录", - "detail": "入库操作完成后自动写入 wms_stock_transaction 记录。quickPutaway 写入 order_type='SCRK'(收货入库),matchPutaway 写入 order_type='MATCH'(匹配入库),均自动填充 warehouse_id、store_id、stock_id、storage_id、space_id、quantity、batch_no、inventory_type 等字段。" - }, - { - "id": "2026.04.08-system-15", - "date": "2026-04-08", - "method": "storage.inventory.list", - "type": "added", - "summary": "新增 storage.inventory.list 出入库记录列表查询接口", - "detail": "出入库记录列表查询,支持 where 条件(transaction_type、stock_id、space_id、store_id、order_type、order_no、inventory_type、operator_name、created_at)、分页(pagination)、排序(sort)和 group_by_batch 参数。默认合并模式按库位+商品聚合返回合计数量与记录条数,group_by_batch=true 时返回每条明细含 batch_no、order_no、operator_name 等完整信息。响应均关联 stockItem(item_code、item_name、sku_property、stock_unit)。" - }, - { - "id": "2026.04.08-system-16", - "date": "2026-04-08", - "module": "storage", - "method": "storage.transaction.list", - "type": "rename", - "summary": "出入库流水记录查询接口从 storage.inventory.list 改名为 storage.transaction.list", - "detail": "将出入库流水记录查询从 storage.inventory.list 迁移到 storage.transaction.list,避免与库存列表概念混淆。功能和参数不变。isNeedAuth=false, isNeedLogin=true, isNeedRight=false。" - }, - { - "id": "2026.04.08-system-17", - "date": "2026-04-08", - "module": "storage", - "method": "storage.inventory.list", - "type": "add", - "summary": "新增 storage.inventory.list 库存列表查询接口", - "detail": "新增库存列表查询接口,查询 wms_storage 表。支持 where 条件(stock_id/space_id/store_id/inventory_type/batch_no/inbound_order_no/available_quantity/inbound_time/created_at)、分页、排序。支持 group_by_batch 参数:默认 false 按库位+商品合并(SUM quantity/locked_quantity/available_quantity),true 返回每条明细含 batch_no/production_date/expiry_date 等。关联 stockItem(商品信息)和 space(库位信息)。isNeedAuth=false, isNeedLogin=true, isNeedRight=false。" - }, - { - "id": "2026.04.08-system-18", - "date": "2026-04-08", - "module": "storage", - "method": "storage.entry.create", - "type": "remove", - "summary": "移除 storage.entry.create 创建入库单接口", - "detail": "不再允许通过 API 创建入库单。入库单仅由快捷入库(quickPutaway)和匹配入库(matchPutaway)等内部流程自动创建。底层 service 实现保留但不再通过 systemMethods 暴露。" - }, - { - "id": "2026.04.08-system-19", - "date": "2026-04-08", - "module": "storage", - "method": "storage.entry.addDetail, storage.entry.deleteDetail, storage.entry.detailChange", - "type": "remove", - "summary": "移除 storage.entry.addDetail / deleteDetail / detailChange 对外接口", - "detail": "入库单明细编辑能力不再通过 systemMethods 对外暴露,入库单模块仅保留 list/get/cancel/completeEntry。" - }, - { - "id": "2026.04.08-system-20", - "date": "2026-04-08", - "module": "storage", - "method": "storage.stockout.list, storage.stockout.toOrder, storage.stockout.listItems", - "type": "add", - "summary": "新增 storage.stockout 出库单模块(非订单出库单能力)", - "detail": "新增 storage.stockout.list / toOrder / listItems 接口,作为非订单出库单的主出口(对应奇门 stockout.create)。storage.delivery.* 仅作为兼容转发保留;底层部分能力仍复用 order 模块。" - }, - { - "id": "2026.04.08-system-21", - "date": "2026-04-08", - "method": "storage.stockout.toOrder", - "type": "change", - "summary": "将 storage.stockout.toOrder 标记为占位接口", - "detail": "storage.stockout.toOrder 当前仅保留方法名用于后续扩展,暂不开放实际逻辑。调用时返回 code=405、message=占位接口,暂未开放。" + "version": "2026.04.10-system-01", + "date": "2026-04-10", + "summary": "订单审核字段由 audit_status 替换为整数字段 step,并添加数据库迁移", + "methods": [ + "order.getreviewOrderlist", + "order.reviewOrder.getreviewOrderlist", + "order.reviewOrder.reviewOrder", + "order.deliveryOrder.getdeliveryOrderlist", + "order.list", + "order.stats" + ], + "notes": [ + "字段变更:order 相关审核字段从字符串/枚举 audit_status 替换为整数 step。", + "step 映射:0=未审核,1=已审核,2=处理中,3=驳回/异常,4=配送中,5=已完成,9=已关闭。", + "reviewOrder 接口在更新 inspection_status 的同时会写入 step 字段。", + "必须执行迁移脚本:20260410150000-replace-audit-status-with-step-on-order-delivery-tables.js" + ], + "type": "changed" } ] \ No newline at end of file diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 3983c006..8bfceb16 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -42,6 +42,29 @@ const windowWidth = ref(window.innerWidth) const currentTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss')) const accessibleModules = ref([]) +// // Log current user identity, permissions, and which modules are visible +// const logPermissions = (perms: string[], modulesList: any[]) => { +// try { +// const identity = user.value || {} +// console.info('[Dashboard] Current user identity:', identity) +// console.info('[Dashboard] Current permissions:', perms) +// const visible = modulesList.map(m => ({ name: m.name || m.component, title: m.title })) +// console.info('[Dashboard] Modules with display permission:', visible) + +// // Also print which permission keys correspond to visible modules (best-effort) +// const visibleKeys = visible.map(v => { +// const key = Object.keys(MODULE_CONFIGS.value).find(k => { +// const cfg = MODULE_CONFIGS.value[k] +// return cfg && (cfg.name === v.name || cfg.component === v.name || cfg.title === v.title) +// }) +// return key || v.name +// }) +// console.info('[Dashboard] Visible permission keys:', visibleKeys) +// } catch (e) { +// console.warn('[Dashboard] Failed to log permissions', e) +// } +// } + // Module Configs computed with i18n const MODULE_CONFIGS = computed(() => { const configs: Record = {} @@ -147,6 +170,8 @@ const initModules = async () => { } accessibleModules.value = modules + // 打印当前用户权限以及哪些组件被允许显示 + // logPermissions(permissions.value || [], modules) } const refreshModule = (moduleName: string) => { diff --git a/src/views/order/orderManagement/component/orderdetail.vue b/src/views/order/orderManagement/component/orderdetail.vue new file mode 100644 index 00000000..eca9dcc8 --- /dev/null +++ b/src/views/order/orderManagement/component/orderdetail.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index b6356e6d..0743c649 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -103,17 +103,22 @@ export const deliveryAvailableFields = [ ] export const deliveryColumns = [ + { prop: 'delivery_order_code', label: '出库单号', width: '160' }, + { prop: 'pre_delivery_order_code', label: '前置单号', width: '160' }, { prop: 'shop_nick', label: '店铺名称', width: '120' }, + { prop: 'buyer_nick', label: '买家昵称', width: '120' }, { prop: 'name', label: '收件人', width: '100' }, { prop: 'mobile', label: '移动电话', width: '120' }, - { prop: 'tel', label: '固定电话', width: '120' }, { prop: 'province', label: '省', width: '100' }, + { prop: 'city', label: '市', width: '100' }, + { prop: 'status', label: '审核状态', width: '100' }, + { prop: 'sync_status', label: '同步状态', width: '100' }, + { prop: 'total_amount', label: '总金额', width: '100' }, + { prop: 'items_count', label: '商品种类', width: '100' }, + { prop: 'items_total', label: '商品总数', width: '100' }, { prop: 'create_at', label: '创建日期', width: '160' }, - { prop: 'delivery_time', label: '发货时间', width: '160' }, - { prop: 'source_platform_name', label: '订单来源', width: '120' }, - { prop: 'logistics_name', label: '快递', width: '120' }, - { prop: 'pre_delivery_order_code', label: '发货单号', width: '160' }, - { prop: 'sync_status', label: '同步', width: '100' }, + { prop: 'place_order_time', label: '下单时间', width: '160' }, + { prop: 'source_platform_name', label: '平台来源', width: '120' }, ] export const deliverydetail = [ diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue new file mode 100644 index 00000000..fc9f7a2c --- /dev/null +++ b/src/views/order/orderManagement/deliveryException.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index ae7e2853..20470d89 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -1,5 +1,5 @@