This commit is contained in:
yin 2026-08-11 18:21:46 +08:00
parent 0cfec94047
commit dc707e653e
8 changed files with 219 additions and 72 deletions

View File

@ -277,6 +277,12 @@ export interface AfterSaleExportParams {
sort?: { sortField?: string; sortOrder?: 'asc' | 'desc' }
}
/** 导出进度参数 */
export interface AfterSaleExportTaskProgressParams {
task_id?: string
taskId?: string
}
/** 批量设置待反馈参数 */
export interface AfterSaleBatchSetPendingFeedbackParams {
ids: number[]

View File

@ -6,10 +6,19 @@ const v = '1.0'
// 站内信模块 API
// ============================================================
/** 站内信列表查询参数(对齐 order.pendingOrder.list 格式) */
/** 站内信列表查询参数(对齐 inbox.message.list 接口文档,扁平传参) */
export interface InboxListParams {
pagination?: { page?: number; pageSize?: number }
where?: Record<string, { operator: string; value: any }>
storeId?: string
groupId?: string
groupName?: string
userName?: string
content?: string
sourceType?: string
direction?: string
pushStatus?: number
startDate?: string
endDate?: string
}
/** 站内信消息列表(inbox.message.list) */

View File

@ -489,8 +489,27 @@
:value="op.value"
/>
</el-select>
<template v-if="isRangeOperator(customConditions[field.value].operator)">
<el-input
:model-value="customConditions[field.value].valueMin"
@update:model-value="(v: string) => handleCompactRangeInput(field, 'min', v)"
placeholder="最小值"
size="small"
clearable
class="compact-range-input"
/>
<span class="compact-range-sep">至</span>
<el-input
:model-value="customConditions[field.value].valueMax"
@update:model-value="(v: string) => handleCompactRangeInput(field, 'max', v)"
placeholder="最大值"
size="small"
clearable
class="compact-range-input"
/>
</template>
<el-input
v-if="!isNullishOperator(customConditions[field.value].operator)"
v-else-if="!isNullishOperator(customConditions[field.value].operator)"
:model-value="customConditions[field.value].value"
@update:model-value="(v: string) => handleCompactNumberInput(field, v)"
:placeholder="field.label"
@ -500,6 +519,27 @@
/>
<span v-else class="no-value-tip">无需填值</span>
</div>
<template v-else-if="isRangeOperator(customConditions[field.value].operator)">
<div class="compact-field-control">
<el-input
:model-value="customConditions[field.value].valueMin"
@update:model-value="(v: string) => handleCompactRangeInput(field, 'min', v)"
placeholder="最小值"
size="small"
clearable
class="compact-range-input"
/>
<span class="compact-range-sep">至</span>
<el-input
:model-value="customConditions[field.value].valueMax"
@update:model-value="(v: string) => handleCompactRangeInput(field, 'max', v)"
placeholder="最大值"
size="small"
clearable
class="compact-range-input"
/>
</div>
</template>
<el-input
v-else
:model-value="customConditions[field.value].value"
@ -530,7 +570,61 @@
<!-- 日期类型 -->
<div v-else-if="field.type === 'date'" class="compact-field-item">
<span class="compact-field-label">{{ field.label }}</span>
<div v-if="getOperators(field).length > 1" class="compact-field-control">
<el-select
v-model="customConditions[field.value].operator"
size="small"
class="compact-operator-select"
@change="handleCompactChange"
>
<el-option
v-for="op in getOperators(field)"
:key="op.value"
:label="op.label"
:value="op.value"
/>
</el-select>
<el-date-picker
v-if="isRangeOperator(customConditions[field.value].operator)"
v-model="customConditions[field.value].value"
type="daterange"
range-separator="至"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
size="small"
class="compact-value-input"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
@change="handleCompactChange"
/>
<el-date-picker
v-else-if="!isNullishOperator(customConditions[field.value].operator)"
v-model="customConditions[field.value].value"
type="date"
:placeholder="field.label"
size="small"
class="compact-value-input"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
@change="handleCompactChange"
/>
<span v-else class="no-value-tip">无需填值</span>
</div>
<el-date-picker
v-else-if="isRangeOperator(customConditions[field.value].operator)"
v-model="customConditions[field.value].value"
type="daterange"
range-separator="至"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
size="small"
style="width: 100%"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
@change="handleCompactChange"
/>
<el-date-picker
v-else
v-model="customConditions[field.value].value"
type="date"
:placeholder="field.label"
@ -745,6 +839,13 @@ function handleCompactNumberInput(field: any, v: string) {
handleCompactChange()
}
// 紧凑模式数字区间输入
function handleCompactRangeInput(field: any, key: 'min' | 'max', v: string) {
const prop = key === 'min' ? 'valueMin' : 'valueMax'
customConditions[field.value][prop] = v === '' || v === undefined ? undefined : Number(v)
handleCompactChange()
}
// 紧凑模式下字段变更时自动设置默认操作符
function handleCompactChange() {
// 为有值的字段设置默认操作符
@ -1998,6 +2099,20 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su
text-align: left;
}
/* 紧凑模式数字区间输入 */
.compact-range-input {
flex: 1;
min-width: 0;
}
.compact-range-sep {
flex-shrink: 0;
font-size: 11px;
color: #909399;
line-height: 28px;
padding: 0 2px;
}
/* 紧凑模式下底部操作栏与字段区域保持一致的左右间距 */
.scan-box--compact .fixed-bottom-actions {
padding: 10px 12px;

View File

@ -55,10 +55,10 @@ const rules: FormRules = { claim_action: [{ required: true, message: '请输入'
function open() {
form.claim_needed = props.claimNeeded ?? 0
form.claim_amount = props.claimAmount
form.claim_amount = props.claimAmount ?? undefined
form.claim_status = props.claimStatus ?? ''
form.carrier_claim_needed = props.carrierClaimNeeded ?? 0
form.carrier_claim_amount = props.carrierClaimAmount
form.carrier_claim_amount = props.carrierClaimAmount ?? undefined
form.carrier_claim_status = props.carrierClaimStatus ?? ''
form.claim_action = ''
form.claim_remark = ''

View File

@ -45,6 +45,7 @@
:pagination="upperPagination"
:show-index="true"
:show-actions="true"
:enable-column-config="true"
:loading="loading"
:query-time="queryTime"
@current-change="handleRowClick"
@ -64,6 +65,12 @@
</el-tag>
</template>
<template #column-target_type="{ row }">
<el-tag size="small" :type="row.target_type === 'api' ? '' : 'info'">
{{ targetTypeLabel(row.target_type) }}
</el-tag>
</template>
<template #column-push_status="{ row }">
<template v-if="row.direction === 'outbound'">
<el-tag size="small" :type="pushStatusTagType(row.push_status)">
@ -254,13 +261,15 @@ const channelTagTypeMap: Record<string, string> = {
}
const pushStatusLabelMap: Record<number, string> = { 0: '待推送', 1: '推送中', 2: '已送达', 3: '失败' }
const pushStatusTagTypeMap: Record<number, string> = { 0: 'info', 1: 'warning', 2: 'success', 3: 'danger' }
const sourceTypeLabelMap: Record<string, string> = { api: 'API', system: '系统' }
const sourceTypeLabelMap: Record<string, string> = { im: 'IM', api: 'API', system: '系统' }
const targetTypeLabelMap: Record<string, string> = { im: 'IM', api: 'API', webhook: 'Webhook' }
function channelLabel(c: string) { return channelLabelMap[c] ?? c ?? '-' }
function channelTagType(c: string) { return channelTagTypeMap[c] ?? 'info' }
function pushStatusLabel(s: number) { return pushStatusLabelMap[s] ?? '未知' }
function pushStatusTagType(s: number) { return pushStatusTagTypeMap[s] ?? 'info' }
function sourceTypeLabel(s: string) { return sourceTypeLabelMap[s] ?? s ?? '-' }
function targetTypeLabel(s: string) { return targetTypeLabelMap[s] ?? s ?? '-' }
function formatTime(val: any): string {
if (val === null || val === undefined || val === '') return '-'
@ -277,6 +286,7 @@ const tableSize = 'small'
const toolbarButtons: ToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' },
{ key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' },
]
const buttonLoadingMap = ref<Record<string, boolean>>({ loading: false })
@ -298,6 +308,11 @@ function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
const toolbarActionMap: Record<string, () => void> = {
loadData: () => { handleRefresh() },
openColumnConfigPanel: () => openColumnConfigPanel(),
}
function openColumnConfigPanel() {
upperTable.value?.openColumnConfig?.()
}
function handleToolbarButtonClick(action: string) {
@ -350,27 +365,29 @@ function handleRowClick(row: any) {
function buildWhereFromConditions(conditions: Record<string, any>) {
const where: Record<string, any> = {}
// scan-box 字段名 → API 参数名映射
const keyMap: Record<string, string> = { store_id: 'storeId' }
for (const [key, cond] of Object.entries(conditions)) {
if (cond === undefined || cond === null || cond === '') continue
const apiKey = keyMap[key] || key
// dateRange → startDate / endDate
if (apiKey === 'dateRange' && typeof cond === 'object') {
const val = cond.value
if (Array.isArray(val) && val.length === 2) {
where.startDate = val[0]
where.endDate = val[1]
}
continue
}
if (typeof cond === 'object' && cond.value !== undefined) {
const val = cond.value
const op = cond.operator || 'eq'
// 空值跳过
if (val === undefined || val === null || val === '' || (Array.isArray(val) && val.length === 0)) continue
// 日期范围:拆分为 begin/end
if (Array.isArray(val) && val.length === 2 && (cond.type === 'daterange' || cond.type === 'datetimerange')) {
where[key] = {
operator: op,
value: [val[0] + ' 00:00:00', val[1] + ' 23:59:59'],
}
continue
}
where[key] = { operator: op, value: val }
// 数组转为逗号分隔字符串(支持 storeId / groupId 多选)
where[apiKey] = Array.isArray(val) ? val.join(',') : val
} else {
where[key] = { operator: 'eq', value: cond }
where[apiKey] = cond
}
}
return where
@ -383,7 +400,7 @@ async function fetchData() {
const where = buildWhereFromConditions(currentConditions.value)
const params: any = {
pagination: { page: pagination.currentPage, pageSize: pagination.pageSize },
where,
...where,
}
const res: any = await inboxList(params)
if (res && (res.code === 1 || res.code === 200 || res.code === 20000)) {
@ -560,12 +577,6 @@ async function loadStoreOptions() {
fillStoreScanFieldOptions(availableFields, extractStoreListFromResponse(storesRes))
} catch {
fillStoreScanFieldOptions(availableFields, [])
} finally {
// 硬编码:无货主消息选项
const storeField = availableFields.find((f: any) => f.value === 'store_id')
if (storeField?.options) {
(storeField.options as any[]).unshift({ label: '无货主消息', value: 0 })
}
}
}

View File

@ -1,7 +1,7 @@
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
// ============================================================
// 站内信消息列表 - ScanBox 筛选字段(对齐 inbox.list 实际字段)
// 站内信消息列表 - ScanBox 筛选字段(对齐 inbox.message.list 接口文档)
// ============================================================
export const messageAvailableFields = [
{
@ -13,13 +13,50 @@ export const messageAvailableFields = [
options: [] as { label: string; value: unknown }[],
},
{
value: 'keyword',
label: '关键词',
value: 'groupId',
label: '群ID',
type: 'text',
placeholder: '搜索群名称、内容、用户名称,多个用逗号分隔',
placeholder: '群ID,逗号分隔多选',
operators: ['contains'],
defaultOperator: 'contains',
},
{
value: 'groupName',
label: '群名称',
type: 'text',
placeholder: '群名称模糊搜索',
operators: ['contains'],
defaultOperator: 'contains',
},
{
value: 'userName',
label: '用户名',
type: 'text',
placeholder: '用户名模糊搜索',
operators: ['contains'],
defaultOperator: 'contains',
},
{
value: 'content',
label: '正文',
type: 'text',
placeholder: '正文模糊搜索',
operators: ['contains'],
defaultOperator: 'contains',
},
{
value: 'sourceType',
label: '来源类型',
type: 'select',
placeholder: '请选择来源类型',
operators: ['eq'],
defaultOperator: 'eq',
options: [
{ label: 'IM', value: 'im' },
{ label: 'API', value: 'api' },
{ label: '系统', value: 'system' },
],
},
{
value: 'direction',
label: '消息方向',
@ -47,37 +84,9 @@ export const messageAvailableFields = [
],
},
{
value: 'sourceType',
label: '来源类型',
type: 'select',
placeholder: '请选择来源类型',
operators: ['eq'],
defaultOperator: 'eq',
options: [
{ label: 'API', value: 'api' },
{ label: '系统', value: 'system' },
],
},
{
value: 'targetChannel',
label: '目标渠道',
type: 'select',
placeholder: '请选择目标渠道',
operators: ['eq'],
defaultOperator: 'eq',
options: [
{ label: '企业微信', value: 'wecom' },
{ label: '钉钉', value: 'dingtalk' },
{ label: '飞书', value: 'feishu' },
{ label: '仓库API', value: 'warehouse_api' },
{ label: 'Webhook', value: 'webhook' },
],
},
{
value: 'created_at',
value: 'dateRange',
label: '创建时间',
type: 'daterange',
placeholder: '请选择时间范围',
type: 'datetimerange',
},
]
@ -88,11 +97,14 @@ export const messageColumns = [
{ prop: 'content', label: '正文', minWidth: '220', showOverflowTooltip: true },
{ prop: 'direction', label: '方向', width: '70' },
{ prop: 'source_type', label: '来源', width: '80' },
{ prop: 'target_type', label: '目标类型', width: '90' },
{ prop: 'group_name', label: '群名称', minWidth: '140', showOverflowTooltip: true },
{ prop: 'user_name', label: '发送人', minWidth: '120', showOverflowTooltip: true },
{ prop: 'store_name', label: '货主', minWidth: '140', showOverflowTooltip: true },
{ prop: 'push_status', label: '推送状态', width: '90' },
{ prop: 'retry_count', label: '重试', width: '60' },
{ prop: 'work_order_no', label: '工单号', minWidth: '160', showOverflowTooltip: true },
{ prop: 'pushed_at', label: '推送时间', width: '170' },
{ prop: 'created_at', label: '创建时间', width: '170' },
{ prop: 'actions', label: '操作', width: '240', fixed: 'right' },
]
@ -101,11 +113,7 @@ export const messageColumns = [
// 工具栏按钮
// ============================================================
export const messageToolbarButtons: ToolbarButtonConfig[] = [
{
key: 'refresh',
label: '刷新',
category: 'refresh',
action: 'loadData',
},
{ key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' },
{ key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' },
]

View File

@ -354,7 +354,7 @@ export const availableFields = [
type: 'number',
placeholder: '请输入标价',
operators: ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'between'],
defaultOperator: 'between'
defaultOperator: 'eq'
}),
stockScanField('price', {
value: 'retail_price',
@ -362,7 +362,7 @@ export const availableFields = [
type: 'number',
placeholder: '请输入零售价',
operators: ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'between'],
defaultOperator: 'between'
defaultOperator: 'eq'
}),
stockScanField('price', {
value: 'length',

View File

@ -918,8 +918,6 @@ onMounted(() => {
border-bottom-color: #fff;
}
}
</style>
@use "../../order/orderManagement/styles/order-sub.scss";
.empty-tip {
color: #909399;