diff --git a/dist.tar.gz b/dist.tar.gz index b5553129..24384b83 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.recheckorder/recheckOrder.ts b/src/api/order.recheckorder/recheckOrder.ts new file mode 100644 index 00000000..8e3bf03c --- /dev/null +++ b/src/api/order.recheckorder/recheckOrder.ts @@ -0,0 +1,100 @@ +import request from '@/utils/request' + +const v = '1.0' + +/** 运单号;支持 waybill_no、waybillCode、waybill_code */ +export type RecheckWaybillParams = { + waybill_no?: string + waybillCode?: string + waybill_code?: string +} + +function pickWaybillBody(data: RecheckWaybillParams): Record { + const v = + data.waybill_no?.trim() || + data.waybillCode?.trim() || + data.waybill_code?.trim() || + '' + if (!v) { + throw new Error('运单号不能为空(waybill_no / waybillCode / waybill_code)') + } + if (data.waybill_no?.trim()) return { waybill_no: v } + if (data.waybillCode?.trim()) return { waybillCode: v } + return { waybill_code: v } +} + +/** scanWaybill 成功时服务端常用字段(见 order.recheckorder module.json) */ +export type ScanWaybillResultShape = { + order_id?: number + waybill_no?: string + order?: Record + items?: unknown[] + expresses?: unknown[] + logs?: unknown[] +} + +/** order.recheckOrder.scanWaybill:扫码查询运单并返回订单详情(含 order_id 供 confirmRecheck 使用) */ +export function scanWaybill(data: RecheckWaybillParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.recheckOrder.scanWaybill', + v, + timestamp: Date.now() + }, + data: pickWaybillBody(data), + isSystemApi: true + } as any) +} + +/** 订单 ID;优先 order_id,兼容 id、orderId */ +export type ConfirmRecheckParams = { + order_id?: string | number + id?: string | number + orderId?: string | number +} + +function coerceOrderId(v: string | number): string | number { + if (typeof v === 'number' && Number.isFinite(v)) return v + const s = String(v).trim() + const n = Number(s) + if (Number.isFinite(n) && String(n) === s) return n + return s +} + +/** 统一 body:优先读取 order_id,其次 id,再 orderId;以 order_id 键提交 */ +function pickConfirmRecheckBody(data: ConfirmRecheckParams): { order_id: string | number } { + const raw = + data.order_id !== undefined && data.order_id !== null && `${data.order_id}`.trim() !== '' + ? data.order_id + : data.id !== undefined && data.id !== null && `${data.id}`.trim() !== '' + ? data.id + : data.orderId !== undefined && data.orderId !== null && `${data.orderId}`.trim() !== '' + ? data.orderId + : undefined + if (raw === undefined) { + throw new Error('订单 ID 不能为空(order_id / id / orderId)') + } + return { order_id: coerceOrderId(raw) } +} + +/** order.recheckOrder.confirmRecheck:按订单 ID 确认复核并记录复核任务 */ +export function confirmRecheck(data: ConfirmRecheckParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.recheckOrder.confirmRecheck', + v, + timestamp: Date.now() + }, + data: pickConfirmRecheckBody(data), + isSystemApi: true + } as any) +} + +export const orderRecheckOrder = { + scanWaybill, + confirmRecheck +} diff --git a/src/api/print/print.ts b/src/api/print/print.ts index 31f7da4f..b7882276 100644 --- a/src/api/print/print.ts +++ b/src/api/print/print.ts @@ -241,6 +241,38 @@ export function savePrinters(data: PrintSavePrintersParams) { }) } +/** print.retryFailed:失败项补打 */ +export type PrintRetryFailedParams = { + print_ids: Array + force?: boolean + warehouse_id?: number +} + +export function retryFailed(data: PrintRetryFailedParams) { + const ids = (data.print_ids ?? []) + .map((id) => Number(id)) + .filter((n) => Number.isFinite(n)) + if (!ids.length) { + return Promise.reject(new Error('print.retryFailed:print_ids 必须为非空数组')) + } + const body: Record = { print_ids: ids } + if (data.force !== undefined) body.force = data.force + if (data.warehouse_id !== undefined && data.warehouse_id !== null) { + const wid = Number(data.warehouse_id) + if (Number.isFinite(wid)) body.warehouse_id = wid + } + return request({ + url: '/system', + method: 'post', + params: { + method: 'print.retryFailed', + v, + timestamp: stamp() + }, + data: body + }) +} + export function sendPrint(data: PrintSendParams) { let body: Record if (data.type === 'express') { diff --git a/src/api/storage.entry/entry.ts b/src/api/storage.entry/entry.ts index d1044c51..c5dc26ce 100644 --- a/src/api/storage.entry/entry.ts +++ b/src/api/storage.entry/entry.ts @@ -2,7 +2,26 @@ import request from '@/utils/request' const v = "1.0" -export function getEntryList(data:any): Promise { +/** storage.entry.list 查询参数(pagination / where / sort) */ +export type StorageEntryListPagination = { + page?: number + pageSize?: number +} + +export type StorageEntryListWhere = Record + +export type StorageEntryListSort = { + sortField?: string + sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC' +} + +export type StorageEntryListParams = { + pagination?: StorageEntryListPagination + where?: StorageEntryListWhere + sort?: StorageEntryListSort +} + +export function getEntryList(data: StorageEntryListParams = {}): Promise { return request({ url: '/system', method: 'post', diff --git a/src/lang/en-US.ts b/src/lang/en-US.ts index 4a83a03e..a16b40d2 100644 --- a/src/lang/en-US.ts +++ b/src/lang/en-US.ts @@ -20,6 +20,7 @@ export default { "System": "System", "deliverOrder": "Deliver Order", "orderSetting": "Order Setting", + "Orderreview": "Order Review", "Stock Info": "Stock Info", "Store Stock": "Store Stock", "Combo Stock ": "Combo Stock", diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index ada72053..65584e8a 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -20,6 +20,7 @@ export default { "System": "系统", "deliverOrder": "配送订单", "orderSetting": "订单设置", + "Orderreview": "订单复核", "Stock Info": "商品明细", "Store Stock": "货主商品", "Combo Stock ": "组合商品", diff --git a/src/router/map.ts b/src/router/map.ts index ba049a61..fc9e5c2a 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -25,6 +25,7 @@ export const componentMap: Record = { 'wave/index': () => import('@/views/order/waveOrder/index.vue'), /** 与后端菜单 component 字段兼容 */ 'order/waveOrder': () => import('@/views/order/waveOrder/index.vue'), + 'orderreview/index': () => import('@/views/order/orderreview/index.vue'), 'role/index': () => import('@/views/system/setting/role/index.vue'), 'basicManagement':() => import('@/views/system/setting/basicManagement/index.vue'), 'system/setting/role/index': () => import('@/views/system/setting/role/index.vue'), diff --git a/src/views/order/orderreview/index.vue b/src/views/order/orderreview/index.vue new file mode 100644 index 00000000..77ed6ce5 --- /dev/null +++ b/src/views/order/orderreview/index.vue @@ -0,0 +1,309 @@ + + + + + diff --git a/src/views/storage/entry/index.vue b/src/views/storage/entry/index.vue index aabe0b8c..9d78e25b 100644 --- a/src/views/storage/entry/index.vue +++ b/src/views/storage/entry/index.vue @@ -22,6 +22,8 @@ 批量作废 导出 导入 + 字段设置 + {{ detailVisible ? '隐藏详情' : '显示详情' }} -
- +
+
+