diff --git a/src/api/returnunpack/index.ts b/src/api/returnunpack/index.ts index 96c71be2..0436ddee 100644 --- a/src/api/returnunpack/index.ts +++ b/src/api/returnunpack/index.ts @@ -44,6 +44,17 @@ export type ReturnUnpackDetailItem = { [key: string]: any } +/** 拆包录像视频 */ +export type ReturnUnpackVideo = { + id?: number + video_url?: string + /** recording 录制中 / completed 录制完成 / failed 录制失败 */ + status?: 'recording' | 'completed' | 'failed' | string + camera_id?: number + camera_name?: string + [key: string]: any +} + /** 拆包单主表记录 */ export type ReturnUnpackRecord = { id?: number @@ -65,9 +76,13 @@ export type ReturnUnpackRecord = { is_original_return?: boolean total_items?: number total_quantity?: number + /** 是否产生视频:1 有 / 2 无 */ + has_video?: 1 | 2 + /** 视频是否可查看:1 可查看 / 2 不可用 */ + video_enable?: 1 | 2 /** 幂等复用时携带 */ details?: ReturnUnpackDetailItem[] - videos?: any[] + videos?: ReturnUnpackVideo[] returnReceived?: any [key: string]: any } @@ -93,6 +108,30 @@ export type ReturnUnpackOrderItem = { /** 原订单详情(原单退回时返回,含 items 明细) */ export type ReturnUnpackOriginalOrder = { + id?: number + /** 订单号(发货单号) */ + delivery_order_code?: string + warehouse_id?: number + store_id?: number + wave_id?: number + wave_no?: string + platform_name?: string + create_channel?: string + create_channel_label?: string + items_count?: number + items_total?: number + total_amount?: string + recipient?: { + name?: string + tel?: string + mobile?: string + province?: string + city?: string + district?: string + town?: string + address?: string + [key: string]: any + } items?: ReturnUnpackOrderItem[] [key: string]: any } @@ -434,6 +473,46 @@ export function returnUnpackDetailList(data: ReturnUnpackDetailListParams = {}): } as any) } +// ============ returnUnpack.videoList ============ + +/** returnUnpack.videoList 的 where 筛选条件 */ +export type ReturnUnpackVideoListWhere = { + /** 拆包单ID(必填,等值) */ + unpack_id?: number + /** 摄像头设备ID(等值) */ + camera_id?: number + /** 录像状态(等值):created / recording / completed / failed */ + status?: string +} + +/** returnUnpack.videoList 排序参数 */ +export type ReturnUnpackVideoListSort = { + sortField?: 'id' | 'created_at' | 'updated_at' | 'camera_id' + sortOrder?: 'asc' | 'desc' +} + +/** returnUnpack.videoList 请求参数 */ +export type ReturnUnpackVideoListParams = { + pagination?: { page?: number; pageSize?: number } + where?: ReturnUnpackVideoListWhere + sort?: ReturnUnpackVideoListSort +} + +/** returnUnpack.videoList:拆包录像分页列表 */ +export function returnUnpackVideoList(data: ReturnUnpackVideoListParams = {}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'returnUnpack.videoList', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + // ============ returnUnpack.detail ============ /** returnUnpack.detail 请求参数 */ diff --git a/src/views/express/returnUnpack/components/UnpackOrderItemsTable.vue b/src/views/express/returnUnpack/components/UnpackOrderItemsTable.vue new file mode 100644 index 00000000..2f0fe4b0 --- /dev/null +++ b/src/views/express/returnUnpack/components/UnpackOrderItemsTable.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/views/express/returnUnpack/components/VideoButton.vue b/src/views/express/returnUnpack/components/VideoButton.vue new file mode 100644 index 00000000..03c3695b --- /dev/null +++ b/src/views/express/returnUnpack/components/VideoButton.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/views/express/returnUnpack/components/VideoListDialog.vue b/src/views/express/returnUnpack/components/VideoListDialog.vue new file mode 100644 index 00000000..b5b34bac --- /dev/null +++ b/src/views/express/returnUnpack/components/VideoListDialog.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/views/express/returnUnpack/components/VideoPlayerDialog.vue b/src/views/express/returnUnpack/components/VideoPlayerDialog.vue new file mode 100644 index 00000000..827de7a6 --- /dev/null +++ b/src/views/express/returnUnpack/components/VideoPlayerDialog.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/views/express/returnUnpack/index.vue b/src/views/express/returnUnpack/index.vue index 7029e00b..3b1d8c37 100644 --- a/src/views/express/returnUnpack/index.vue +++ b/src/views/express/returnUnpack/index.vue @@ -27,8 +27,8 @@ -
-
+
+
- -