diff --git a/src/api/returnreceived/index.ts b/src/api/returnreceived/index.ts index c809e76e..82213514 100644 --- a/src/api/returnreceived/index.ts +++ b/src/api/returnreceived/index.ts @@ -10,6 +10,8 @@ export type ReturnReceivedCreateParams = { waybill_code: string /** 备注 */ remark?: string + /** 退回收件任务ID(不传默认 1 = 系统预设「历史收件」) */ + return_received_task_id?: number } /** returnReceived.create:退回包裹扫码登记(30日内同仓库同单号幂等,以第一次为准) */ @@ -43,6 +45,8 @@ export type ReturnReceivedListWhere = { scanner_name?: string /** 货主ID(等值) */ store_id?: number + /** 退回收件任务ID(等值) */ + return_received_task_id?: number /** 运单ID(等值,原单退回时回填) */ order_express_id?: number /** 订单ID(等值,原单退回时回填) */ diff --git a/src/api/returnreceivedtask/index.ts b/src/api/returnreceivedtask/index.ts new file mode 100644 index 00000000..fe05d47b --- /dev/null +++ b/src/api/returnreceivedtask/index.ts @@ -0,0 +1,187 @@ +import request from '@/utils/request' + +const v = '1.0' + +const SYSTEM_URL = '/system' + +// ============ 通用类型 ============ + +/** 退回收件任务记录(表 wms_return_received_task) */ +export type ReturnReceivedTaskRecord = { + id: number + /** 批次号(服务端自动生成 RT+YYYYMMDD+5位序号;系统预设「历史收件」id=1) */ + batch_no: string + /** 标题 */ + title: string + /** 仓库ID(服务端注入;系统级任务为 0) */ + warehouse_id?: number + /** 创建人账户ID(服务端注入) */ + creator_id?: number + /** 创建人名称快照(服务端注入) */ + creator_name?: string + /** 登记数:该任务下已登记(wms_return_received)的记录条数 */ + register_count?: number + created_at?: string + updated_at?: string + [key: string]: unknown +} + +/** 退回收件任务分页信息 */ +export type ReturnReceivedTaskPagination = { + page: number + pageSize: number + total: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean +} + +/** returnReceivedTask.list 的 where 筛选条件 */ +export type ReturnReceivedTaskListWhere = { + /** + * 关键词搜索(项目 quickWhere 惯例,传字符串): + * 在 标题(title)/ 编号(batch_no)/ 创建人(creator_name)三个字段中 OR 模糊匹配 + */ + quickWhere?: string + /** 标题(支持 {operator, value} 或直接值) */ + title?: string | { operator: string; value: any } + /** 编号(支持 {operator, value} 或直接值) */ + batch_no?: string | { operator: string; value: any } + /** 创建人(支持 {operator, value} 或直接值) */ + creator_name?: string | { operator: string; value: any } + /** 创建时间范围 */ + created_at?: { operator: 'between' | 'gte' | 'lte'; value: [string, string] | string } + /** 更新时间范围 */ + updated_at?: { operator: 'between' | 'gte' | 'lte'; value: [string, string] | string } + [key: string]: unknown +} + +/** returnReceivedTask.list 排序参数 */ +export type ReturnReceivedTaskListSort = { + /** 排序字段白名单:id / batch_no / created_at / updated_at(默认 id desc) */ + sortField?: 'id' | 'batch_no' | 'created_at' | 'updated_at' + sortOrder?: 'asc' | 'desc' +} + +/** returnReceivedTask.list 请求参数 */ +export type ReturnReceivedTaskListParams = { + pagination?: { page?: number; pageSize?: number } + where?: ReturnReceivedTaskListWhere + sort?: ReturnReceivedTaskListSort +} + +/** returnReceivedTask.list 响应(/system 网关:业务字段与信封同级,兼容 data 包裹) */ +export type ReturnReceivedTaskListResponse = { + flag?: string + /** 业务码:1 / 200 / 20000 均视为成功 */ + code?: number + message?: string + timestamp?: number + list?: ReturnReceivedTaskRecord[] + pagination?: ReturnReceivedTaskPagination + data?: { + list?: ReturnReceivedTaskRecord[] + pagination?: ReturnReceivedTaskPagination + } +} + +/** returnReceivedTask.list:退回收件任务分页列表(仓库隔离:本仓库 + 系统级 warehouse_id=0) */ +export function returnReceivedTaskList( + data: ReturnReceivedTaskListParams = {} +): Promise { + return request({ + url: SYSTEM_URL, + method: 'post', + params: { + method: 'returnReceivedTask.list', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ returnReceivedTask.create ============ + +/** returnReceivedTask.create 请求参数(批次号由服务端自动生成,不接受外部传入) */ +export type ReturnReceivedTaskCreateParams = { + /** 标题(可选) */ + title?: string +} + +/** returnReceivedTask.create 响应(平铺形态,兼容 data 包裹) */ +export type ReturnReceivedTaskCreateResponse = { + flag?: string + code?: number + message?: string + timestamp?: number + /** 新建的任务记录 */ + record?: ReturnReceivedTaskRecord + id?: number + batch_no?: string + title?: string + data?: { + record?: ReturnReceivedTaskRecord + id?: number + batch_no?: string + title?: string + } +} + +/** + * returnReceivedTask.create:创建退回收件任务 + * - warehouse_id / creator_id / creator_name 由服务端从上下文注入,前端一律不传 + * - 批次号由服务端自动生成(不接受前端传入) + * - 需登录,免 API 权限校验 + */ +export function returnReceivedTaskCreate( + data: ReturnReceivedTaskCreateParams = {} +): Promise { + return request({ + url: SYSTEM_URL, + method: 'post', + params: { + method: 'returnReceivedTask.create', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ returnReceivedTask.delete ============ + +/** returnReceivedTask.delete 请求参数 */ +export type ReturnReceivedTaskDeleteParams = { + /** 任务主键ID数组(批量删除) */ + ids: number[] +} + +/** + * returnReceivedTask.delete:批量删除退回收件任务(硬删除) + * - 已有收件登记引用该任务 → 409 不可删除 + * - 系统预设 id=1(历史收件)→ 404 不可删除 + */ +export function returnReceivedTaskDelete(data: ReturnReceivedTaskDeleteParams): Promise { + return request({ + url: SYSTEM_URL, + method: 'post', + params: { + method: 'returnReceivedTask.delete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ 模块导出 ============ + +export const returnReceivedTaskModule = { + list: returnReceivedTaskList, + create: returnReceivedTaskCreate, + remove: returnReceivedTaskDelete +} diff --git a/src/router/map.ts b/src/router/map.ts index 3514ddec..d1350076 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -72,6 +72,8 @@ export const componentMap: Record = { 'video/cameraServer/index': () => import('@/views/video/newcamaraserver/index.vue'), 'video/camera/index': () => import('@/views/video/newcamara/index.vue'), 'data/packingflow': () => import('@/views/data/packingflow/index.vue'), + /** 退回记录:退回拆包单 + 退回收件登记(tab 合并) */ + 'data/returnrecord': () => import('@/views/data/returnrecord/index.vue'), 'system/setting/printcomputer/index':() => import('@/views/system/setting/printcomputer/index.vue'), 'express/index':() => import('@/views/express/waybill/index.vue'), /** 退回收件登记 */ diff --git a/src/views/data/returnrecord/components/ReceiveRegisterPanel.vue b/src/views/data/returnrecord/components/ReceiveRegisterPanel.vue new file mode 100644 index 00000000..8a0668f2 --- /dev/null +++ b/src/views/data/returnrecord/components/ReceiveRegisterPanel.vue @@ -0,0 +1,515 @@ + + + + + diff --git a/src/views/data/returnrecord/components/ReturnReceivedTaskPanel.vue b/src/views/data/returnrecord/components/ReturnReceivedTaskPanel.vue new file mode 100644 index 00000000..f7e4c221 --- /dev/null +++ b/src/views/data/returnrecord/components/ReturnReceivedTaskPanel.vue @@ -0,0 +1,497 @@ + + + + + diff --git a/src/views/data/returnrecord/index.vue b/src/views/data/returnrecord/index.vue new file mode 100644 index 00000000..f3e4967e --- /dev/null +++ b/src/views/data/returnrecord/index.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/src/views/data/returnrecord/returnReceivedTask-config.ts b/src/views/data/returnrecord/returnReceivedTask-config.ts new file mode 100644 index 00000000..ce66667e --- /dev/null +++ b/src/views/data/returnrecord/returnReceivedTask-config.ts @@ -0,0 +1,80 @@ +import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' + +// ============================================================ +// 退回收件任务(returnReceivedTask) - ScanBox 筛选字段 +// 对齐 returnReceivedTask.list 接口 where 参数 +// ============================================================ +export const returnReceivedTaskAvailableFields = [ + { + value: 'title', + label: '标题', + type: 'text', + placeholder: '标题模糊搜索', + operators: ['like'], + defaultOperator: 'like', + }, + { + value: 'batch_no', + label: '批次号', + type: 'text', + placeholder: '批次号模糊搜索', + operators: ['like'], + defaultOperator: 'like', + }, + { + value: 'creator_name', + label: '创建人', + type: 'text', + placeholder: '创建人模糊搜索', + operators: ['like'], + defaultOperator: 'like', + }, + { + value: 'has_register', + label: '是否有登记', + type: 'boolean', + placeholder: '请选择是否有登记', + }, + { + value: 'created_at', + label: '创建时间', + type: 'datetimerange', + }, + { + value: 'updated_at', + label: '更新时间', + type: 'datetimerange', + }, +] + +// ============================================================ +// 退回收件任务(returnReceivedTask) - UpperTable 列配置 +// 对齐 returnReceivedTask.list 响应字段 +// ============================================================ +export const returnReceivedTaskColumns = [ + { prop: 'id', label: '任务ID', width: '90', sortable: 'custom' }, + { + prop: 'batch_no', + label: '批次号', + minWidth: '180', + showOverflowTooltip: true, + sortable: 'custom', + copyAction: 'copy' as const, + }, + { prop: 'title', label: '标题', minWidth: '160', showOverflowTooltip: true }, + { prop: 'creator_name', label: '创建人', minWidth: '110', showOverflowTooltip: true }, + { prop: 'register_count', label: '登记数', width: '90' }, + { prop: 'created_at', label: '创建时间', width: '170', sortable: 'custom' }, + { prop: 'updated_at', label: '更新时间', width: '170', sortable: 'custom' }, + { prop: 'actions', label: '操作', width: '170', fixed: 'right' }, +] + +// ============================================================ +// 工具栏按钮 +// ============================================================ +export const returnReceivedTaskToolbarButtons: ToolbarButtonConfig[] = [ + { key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' }, + { key: 'create', label: '新建任务', category: 'action', type: 'primary', size: 'small', loadingKey: 'createLoading', action: 'openCreateDialog' }, + { key: 'batchDelete', label: '批量删除', category: 'cancel', size: 'small', disabledKey: 'hasNoSelection', loadingKey: 'batchDeleteLoading', action: 'handleBatchDelete' }, + { key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' }, +] diff --git a/src/views/express/returnReceived/index.vue b/src/views/express/returnReceived/index.vue index 4f606e58..45cc3f89 100644 --- a/src/views/express/returnReceived/index.vue +++ b/src/views/express/returnReceived/index.vue @@ -23,31 +23,6 @@ :layout-key="toolbarLayoutKey" @action="handleToolbarButtonClick" /> - -
- - - 扫码登记 -
@@ -135,7 +110,6 @@ - {{ formatTime(detailData.record?.scan_date) }} - {{ detailData.record?.scanner_id ?? '-' }} {{ detailData.record?.scanner_name ?? '-' }} {{ detailData.record?.warehouse_id ?? '-' }} {{ detailData.record?.store_id ?? '-' }} @@ -202,9 +176,9 @@