diff --git a/src/api/inbox/inbox.ts b/src/api/inbox/inbox.ts index 54a480da..b51b31d2 100644 --- a/src/api/inbox/inbox.ts +++ b/src/api/inbox/inbox.ts @@ -6,14 +6,10 @@ const v = '1.0' // 站内信模块 API // ============================================================ -/** 站内信列表查询参数 */ +/** 站内信列表查询参数(对齐 order.pendingOrder.list 格式) */ export interface InboxListParams { - direction?: string // 消息方向筛选:inbound(收件)/ outbound(回信) - pushStatus?: number // 推送状态筛选:0=待推送 1=推送中 2=已送达 3=失败 - targetChannel?: string // 目标渠道筛选:wecom / dingtalk / feishu / warehouse_api / webhook - keyword?: string // 关键词搜索,模糊匹配 ext_id 和 ref_code - page?: number // 页码,默认 1 - pageSize?: number // 每页数量,默认 20,最大 200 + pagination?: { page?: number; pageSize?: number } + where?: Record } /** 站内信消息列表(inbox.message.list) */ diff --git a/src/api/index/index.ts b/src/api/index/index.ts index 0df94eec..22bc17a4 100644 --- a/src/api/index/index.ts +++ b/src/api/index/index.ts @@ -42,6 +42,21 @@ export function loadWarehouses(data?: Record) { } as any) } +/** 当前仓库下的快递接口下拉列表,可传入 systemExpressCode 过滤 */ +export function loadExpressInterfaces(data?: { systemExpressCode?: string }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'index.loadExpressInterfaces', + v: '1.0', + timestamp: new Date().getTime() + }, + data: data ?? {}, + isSystemApi: true + } as any) +} + export function getCOSUploadConfig(data:any){ return request({ url: '/system', diff --git a/src/views/inbox/group/group-config.ts b/src/views/inbox/group/group-config.ts index 2c1f6bf3..ac054425 100644 --- a/src/views/inbox/group/group-config.ts +++ b/src/views/inbox/group/group-config.ts @@ -4,6 +4,14 @@ import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/o // 站内信群组 - ScanBox 筛选字段 // ============================================================ export const groupAvailableFields = [ + { + value: 'store_id', + label: '货主', + type: 'select', + multiple: true, + placeholder: '请选择货主', + options: [] as { label: string; value: unknown }[], + }, { value: 'groupType', label: '群类型', @@ -25,20 +33,32 @@ export const groupAvailableFields = [ operators: ['contains'], defaultOperator: 'contains', }, + { + value: 'is_blocked', + label: '是否禁用', + type: 'select', + placeholder: '请选择状态', + operators: ['eq'], + defaultOperator: 'eq', + options: [ + { label: '启用', value: 0 }, + { label: '禁用', value: 1 }, + ], + }, ] // ============================================================ // 站内信群组 - UpperTable 列配置 // ============================================================ export const groupColumns = [ - { prop: 'id', label: 'ID', width: '70' }, { prop: 'group_name', label: '群名称', minWidth: '160', showOverflowTooltip: true }, { prop: 'group_id', label: '群ID', minWidth: '160', showOverflowTooltip: true }, { prop: 'group_type', label: '群类型', width: '100' }, { prop: 'sub_type', label: '子类型', width: '100' }, - { prop: 'store_id', label: '货主ID', width: '90' }, - { prop: 'express_interfaces', label: '快递接口', minWidth: '140', showOverflowTooltip: true }, - { prop: 'system_express_code', label: '系统快递编码', minWidth: '140', showOverflowTooltip: true }, + { prop: 'store_name', label: '货主', minWidth: '120', showOverflowTooltip: true }, + { prop: 'express_interfaces', label: '快递接口', minWidth: '160', showOverflowTooltip: true }, + { prop: 'system_express_name', label: '系统快递', width: '110', showOverflowTooltip: true }, + { prop: 'ai_enabled', label: 'AI回复', width: '90' }, { prop: 'is_blocked', label: '状态', width: '80' }, { prop: 'created_at', label: '创建时间', width: '170' }, { prop: 'actions', label: '操作', width: '220', fixed: 'right' }, diff --git a/src/views/inbox/group/index.vue b/src/views/inbox/group/index.vue index e8907c28..af0e5a12 100644 --- a/src/views/inbox/group/index.vue +++ b/src/views/inbox/group/index.vue @@ -7,6 +7,7 @@ :tree-props="{ children: 'children', label: 'label' }" :auto-submit="false" :available-fields="availableFields" + :initial-conditions="initialConditions" @condition-change="handleConditionChange" @reset="handleConditionReset" @condition-clear="handleConditionClear" @@ -52,7 +53,7 @@ + +