diff --git a/docs/camera-local-stream-api.md b/docs/camera-local-stream-api.md
new file mode 100644
index 00000000..67ec5a82
--- /dev/null
+++ b/docs/camera-local-stream-api.md
@@ -0,0 +1,183 @@
+# 摄像头本地流服务接口文档
+
+> 服务地址:`http://localhost:17311`(主端口,备用端口依次为 `17312`、`17313`)
+> 服务职责:代理前端与海康威视录像机(NVR)之间的连接,拉取实时视频流并转为 MJPEG 输出。
+> 本服务独立于主后端 `/system`,由前端 `src/api/camera_server/localServerApi.ts` 直接调用。
+
+## 目录
+
+- [1. 获取海康通道列表](#1-获取海康通道列表)
+- [2. 获取实时流(MJPEG)](#2-获取实时流mjpeg)
+- [3. 停止实时流](#3-停止实时流)
+
+---
+
+## 1. 获取海康通道列表
+
+用于测试录像服务器连通性,并获取其通道列表。
+
+- **URL**:`POST /api/hikvision/channels`
+- **Content-Type**:`application/json`
+
+### 请求参数
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| ip | string | 是 | 录像机 IP 地址 |
+| port | number | 否 | 录像机端口,默认 `8000` |
+| user | string | 是 | 录像机登录账号 |
+| pass | string | 是 | 录像机登录密码 |
+
+### 请求示例
+
+```json
+{
+ "ip": "192.168.8.241",
+ "port": 8000,
+ "user": "admin",
+ "pass": "ky666888"
+}
+```
+
+### 响应示例
+
+```json
+{
+ "success": true,
+ "channels": [
+ { "channel": 1, "name": "通道1" },
+ { "channel": 2, "name": "通道2" }
+ ]
+}
+```
+
+或兼容格式:
+
+```json
+{
+ "code": 0,
+ "message": "ok",
+ "data": [
+ { "channel": 1, "name": "通道1" }
+ ]
+}
+```
+
+---
+
+## 2. 获取实时流(MJPEG)
+
+拉取指定通道的实时视频流,以 `multipart/x-mixed-replace` 的 MJPEG 流返回,前端用 `
` 直接渲染。
+
+- **URL**:`GET /api/hikvision/live-stream`
+- **返回**:`multipart/x-mixed-replace` 的 MJPEG 流(长连接)
+
+### Query 参数
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| ip | string | 是 | 录像机 IP 地址 |
+| user | string | 是 | 录像机登录账号 |
+| pass | string | 是 | 录像机登录密码 |
+| channel | number | 是 | 通道号 |
+| streamType | number | 否 | 码流类型,`0` 主码流(默认),`1` 子码流 |
+| port | number | 否 | 录像机端口,默认 `8000` |
+
+### 请求示例
+
+```
+GET /api/hikvision/live-stream?ip=192.168.8.241&user=admin&pass=ky666888&channel=9&streamType=0&port=8000
+```
+
+### 后端实现要求
+
+- 每个「录像机 + 通道」应维护**独立的 ffmpeg 子进程**,并按 `ip + channel`(或生成的 session id)登记。
+- 客户端断开(`req.on('close')` / `res.on('close')`)时,应立即 `kill` 对应 ffmpeg 子进程,作为兜底回收机制。
+- 同一 `ip + channel` 若已有活跃进程,建议复用或先停旧再启新,避免重复拉起。
+
+---
+
+## 3. 停止实时流
+
+显式停止指定通道的实时流,后端据此 kill 对应 ffmpeg 子进程。前端在关闭预览浮窗、切换摄像头、组件卸载时调用。
+
+- **URL**:`POST /api/hikvision/stop-stream`
+- **Content-Type**:`application/json`
+
+### 请求参数
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| ip | string | 是 | 录像机 IP 地址 |
+| user | string | 是 | 录像机登录账号 |
+| pass | string | 是 | 录像机登录密码 |
+| channel | number | 是 | 通道号 |
+| port | number | 否 | 录像机端口,默认 `8000` |
+
+> `ip + channel` 作为流实例的定位键,与「获取实时流」一致。
+
+### 请求示例
+
+```json
+{
+ "ip": "192.168.8.241",
+ "user": "admin",
+ "pass": "ky666888",
+ "channel": 9,
+ "port": 8000
+}
+```
+
+### 响应示例
+
+成功:
+
+```json
+{
+ "code": 0,
+ "message": "ok",
+ "data": {
+ "stopped": true,
+ "channel": 9
+ }
+}
+```
+
+无对应流(幂等,不报错):
+
+```json
+{
+ "code": 0,
+ "message": "no active stream",
+ "data": {
+ "stopped": false,
+ "channel": 9
+ }
+}
+```
+
+### 后端实现要求
+
+1. 根据 `ip + channel` 在进程表中查找对应 ffmpeg 子进程;
+2. 找到后 `ffmpeg.kill('SIGKILL')`(或先 `SIGTERM` 再兜底 `SIGKILL`),并从进程表移除;
+3. **幂等**:未找到对应流时也应返回成功(`stopped: false`),不应返回 4xx/5xx;
+4. 若同时存在基于 session id 的实例,应同时支持按 `sessionId` 定位(可选扩展)。
+
+---
+
+## 前端调用关系
+
+```
+returnUnpackwork/index.vue
+ └─ 关闭浮窗 closePreview() → livePreviewRef.stop()
+CameraLivePreview.vue
+ ├─ 拉流成功 → 记录 activeStream
+ └─ stopStream() → stopLiveStream(activeStream) // POST /api/hikvision/stop-stream
+```
+
+前端调用封装位于 `src/api/camera_server/localServerApi.ts`:
+
+- `getHikvisionChannels(baseUrl, params)` → `POST /api/hikvision/channels`
+- `getLiveStreamUrl(params)` → 生成 `GET /api/hikvision/live-stream` 地址
+- `stopLiveStream(params)` → `POST /api/hikvision/stop-stream`
+
diff --git a/src/api/afterSale/index.ts b/src/api/afterSale/index.ts
index b96e0bf2..6dd241ae 100644
--- a/src/api/afterSale/index.ts
+++ b/src/api/afterSale/index.ts
@@ -182,7 +182,8 @@ export interface AfterSaleRelated {
/** 售后步骤对象 */
export interface AfterSaleStep {
- id: number
+ /** 步骤ID(虚拟步骤为 null) */
+ id: number | null
after_sale_id: number
step_status: StepStatus
operator_id: number | null
@@ -193,6 +194,8 @@ export interface AfterSaleStep {
completed_at: string | null
created_at: string
attachments: FileReference[]
+ /** 是否虚拟步骤(主表 description 非空时列表第一条,不落库) */
+ is_virtual?: boolean
}
/** 文件引用 */
@@ -206,6 +209,40 @@ export interface FileReference {
mime_type?: string
}
+// ==================== 响应类型 ====================
+
+/** 售后工作列表项(主表字段 + detail_count + store_name) */
+export interface AfterSaleWorkListItem extends AfterSale {
+ /** 售后单关联计数 */
+ detail_count: number
+ /** 货主名称:取合约表 store_remask,无合约或备注为空时回退公司全称,无货主时为空字符串 */
+ store_name: string
+}
+
+/** 分页信息 */
+export interface AfterSalePagination {
+ page: number
+ pageSize: number
+ total: number
+ totalPages: number
+}
+
+/** afterSale.workList 响应 */
+export interface AfterSaleWorkListResponse {
+ list: AfterSaleWorkListItem[]
+ pagination: AfterSalePagination
+}
+
+/** afterSale.detail 响应 */
+export interface AfterSaleDetailResponse {
+ /** 售后主表完整记录(含格式化时间字段) */
+ after_sale: AfterSale
+ /** 售后进度步骤列表(含附件),按创建时间升序 */
+ steps: AfterSaleStep[]
+ /** 关联单据详情(订单/运单/货主合约),无关联时为空对象 */
+ related: AfterSaleRelated
+}
+
// ==================== 请求参数类型 ====================
/** 列表查询参数 */
@@ -312,7 +349,7 @@ export interface AfterSaleBatchCloseFailedItem {
// ==================== API 方法 ====================
/** 2.1 工作列表 afterSale.workList */
-export function afterSaleWorkList(data: AfterSaleListParams = {}) {
+export function afterSaleWorkList(data: AfterSaleListParams = {}): Promise {
return request({
url: '/system',
method: 'post',
@@ -342,7 +379,7 @@ export function afterSaleAuditList(data: AfterSaleListParams = {}) {
}
/** 2.3 售后明细 afterSale.detail */
-export function afterSaleDetail(id: number) {
+export function afterSaleDetail(id: number): Promise {
return request({
url: '/system',
method: 'post',
diff --git a/src/api/camera_server/localServerApi.ts b/src/api/camera_server/localServerApi.ts
index c2757648..00f47b6b 100644
--- a/src/api/camera_server/localServerApi.ts
+++ b/src/api/camera_server/localServerApi.ts
@@ -116,5 +116,29 @@ export function getLiveStreamUrl(params: {
return `${DEFAULT_PROXY_BASE}/api/hikvision/live-stream?ip=${encodeURIComponent(ip)}&user=${encodeURIComponent(user)}&pass=${encodeURIComponent(pass)}&channel=${channel}&streamType=${streamType}${portParam}`
}
+/**
+ * 停止实时流(显式通知后端 kill 对应 ffmpeg 进程)
+ * 后端 POST /api/hikvision/stop-stream
+ *
+ * @example
+ * stopLiveStream({ ip: '192.168.8.241', user: 'admin', pass: 'ky666888', channel: 9, port: 8000 })
+ */
+export interface LiveStreamTarget {
+ ip: string
+ user: string
+ pass: string
+ channel: number
+ port?: number
+}
+
+export async function stopLiveStream(params: LiveStreamTarget) {
+ const client = createClient(DEFAULT_PROXY_BASE)
+ try {
+ await client.post('/api/hikvision/stop-stream', params)
+ } catch {
+ // 停止失败忽略:后端应在客户端连接断开时兜底回收 ffmpeg
+ }
+}
+
// ---------- 后续在此追加其他 API ----------
// export async function getSomeOtherApi(baseUrl: string, params?: any) { ... }
diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts
index 9701faee..e48a0d84 100644
--- a/src/api/order.pendingOrder/orderpendingOrder.ts
+++ b/src/api/order.pendingOrder/orderpendingOrder.ts
@@ -149,7 +149,10 @@ export type PendingOrderBatchInterceptProgressParams = {
};
export type PendingOrderParseAddressParams = {
- address: string;
+ /** 单条地址解析(与 addresses 二选一) */
+ address?: string;
+ /** 批量地址解析(单次最多 50 条) */
+ addresses?: string[];
};
export type PendingOrderParseAddressData = {
@@ -162,12 +165,21 @@ export type PendingOrderParseAddressData = {
mobile?: string
};
+/** 批量解析结果项(按输入顺序返回) */
+export type PendingOrderParseAddressItem = PendingOrderParseAddressData & {
+ address?: string
+ flag?: string
+ message?: string
+};
+
export type PendingOrderParseAddressResponse = {
flag?: string;
code: number;
message: string;
timestamp?: number;
- data?: PendingOrderParseAddressData;
+ data?: PendingOrderParseAddressData & { list?: PendingOrderParseAddressItem[] };
+ /** 批量解析结果数组(实际响应中位于顶层,兼容 data.list) */
+ list?: PendingOrderParseAddressItem[];
} & PendingOrderParseAddressData;
export function extractPendingOrderParseAddressData(
@@ -197,6 +209,16 @@ export function extractPendingOrderParseAddressData(
};
}
+/** 提取批量解析结果列表,未返回时为空数组(兼容顶层 list 与 data.list) */
+export function extractPendingOrderParseAddressList(
+ res?: PendingOrderParseAddressResponse | null,
+): PendingOrderParseAddressItem[] {
+ const nestedList = res?.data?.list;
+ if (Array.isArray(nestedList)) return nestedList;
+ const topList = res?.list;
+ return Array.isArray(topList) ? topList : [];
+}
+
/** 与文档 Params 别名对齐;不再传 warehouse_id(由登录上下文决定仓库) */
export type PendingOrderAllocateStorageParams = {
allow_storage_location?: boolean;
@@ -576,6 +598,8 @@ export function orderPendingOrderParseAddress(
},
data,
isSystemApi: true,
+ // 地址解析可能调用外部服务,延长超时时间至 35 秒
+ timeout: 35000,
} as any);
}
diff --git a/src/api/returnunpack/index.ts b/src/api/returnunpack/index.ts
index 4f54cfaa..19e6407d 100644
--- a/src/api/returnunpack/index.ts
+++ b/src/api/returnunpack/index.ts
@@ -2,6 +2,91 @@ import request from '@/utils/request'
const v = '1.0'
+// ============ 通用数据类型 ============
+
+/** 库存详情(识别命中商品时附加,由 stockWarehouse.getStockDetails 拉取) */
+export type ReturnUnpackStockDetail = {
+ item_code?: string
+ item_name?: string
+ sku_property?: string
+ /** 条码数组 */
+ barcodes?: { id?: number; barcode?: string }[]
+ /** 图片数组 */
+ image_url?: string[]
+ packing_requirements?: string
+ stock_unit?: string
+ quantity?: number
+ locked_quantity?: number
+ [key: string]: any
+}
+
+/** 拆包明细行 */
+export type ReturnUnpackDetailItem = {
+ id?: number
+ unpack_id?: number
+ stock_id?: number | null
+ barcode?: string
+ quantity?: number
+ product_status?: 'normal' | 'damaged'
+ /** 是否识别:1 识别到系统商品 / 0 非识别物品 */
+ is_recognized?: 0 | 1
+ item_code?: string
+ item_name?: string
+ spec?: string
+ product_snapshot?: any
+ remark?: string
+ created_at?: string
+ updated_at?: string
+ /** 识别命中时的库存详情对象 */
+ stock?: ReturnUnpackStockDetail
+ /** 识别命中时的 stockWarehouse 关联 */
+ stockWarehouse?: any
+ [key: string]: any
+}
+
+/** 拆包单主表记录 */
+export type ReturnUnpackRecord = {
+ id?: number
+ unpack_no?: string
+ waybill_code?: string
+ unpack_date?: string
+ start_time?: string
+ end_time?: string
+ unpacker_id?: number
+ unpacker_name?: string
+ status?: 'unpacking' | 'completed' | 'cancelled'
+ detail_status?: 'none_recognized' | 'partial_recognized' | 'all_recognized'
+ camera_ids?: number[]
+ order_express_id?: number
+ order_id?: number
+ store_id?: number
+ source_order_codes?: string
+ shop_name?: string
+ is_original_return?: boolean
+ total_items?: number
+ total_quantity?: number
+ /** 幂等复用时携带 */
+ details?: ReturnUnpackDetailItem[]
+ videos?: any[]
+ returnReceived?: any
+ [key: string]: any
+}
+
+/** 原订单详情(原单退回时返回,含 items 明细) */
+export type ReturnUnpackOriginalOrder = {
+ [key: string]: any
+}
+
+/** 分页信息 */
+export type ReturnUnpackPagination = {
+ page: number
+ pageSize: number
+ total: number
+ totalPages: number
+ hasPrevious?: boolean
+ hasNext?: boolean
+}
+
// ============ returnUnpack.create ============
/** returnUnpack.create 请求参数 */
@@ -16,8 +101,24 @@ export type ReturnUnpackCreateParams = {
remark?: string
}
+/** returnUnpack.create 响应 */
+export type ReturnUnpackCreateResponse = {
+ /** 拆包单主键ID(后续明细收录的依据) */
+ id: number
+ /** 拆包单主表记录(幂等复用时含 details/videos/returnReceived) */
+ record: ReturnUnpackRecord
+ /** 是否原单退回 */
+ is_original_return: boolean
+ /** 货主的合约货主备注名称,未命中时为空字符串 */
+ store_remark: string
+ /** 原订单详情(仅原单退回时返回,非原单为 null) */
+ order?: ReturnUnpackOriginalOrder | null
+ /** 是否幂等复用已有拆包单 */
+ reused?: boolean
+}
+
/** returnUnpack.create:开拆包单(明细不在此提交,由 returnUnpack.addDetail 逐件录入) */
-export function returnUnpackCreate(data: ReturnUnpackCreateParams): Promise {
+export function returnUnpackCreate(data: ReturnUnpackCreateParams): Promise {
return request({
url: '/system',
method: 'post',
@@ -49,8 +150,22 @@ export type ReturnUnpackAddDetailParams = {
remark?: string
}
+/** returnUnpack.addDetail 响应 */
+export type ReturnUnpackAddDetailResponse = {
+ /** 新增明细ID(供 updateDetail / removeDetail 使用) */
+ detail_id: number
+ /** 新增的明细行(识别到系统商品时附加 stock 库存详情对象) */
+ detail: ReturnUnpackDetailItem
+ /** 主表最新物品种类数(明细行数) */
+ total_items: number
+ /** 主表最新物品总数量(明细数量合计) */
+ total_quantity: number
+ /** 主表最新明细识别状态 */
+ detail_status: 'none_recognized' | 'partial_recognized' | 'all_recognized'
+}
+
/** returnUnpack.addDetail:以拆包单ID为依据录入一条明细 */
-export function returnUnpackAddDetail(data: ReturnUnpackAddDetailParams): Promise {
+export function returnUnpackAddDetail(data: ReturnUnpackAddDetailParams): Promise {
return request({
url: '/system',
method: 'post',
@@ -78,8 +193,20 @@ export type ReturnUnpackUpdateDetailParams = {
remark?: string
}
+/** returnUnpack.updateDetail 响应 */
+export type ReturnUnpackUpdateDetailResponse = {
+ /** 更新后的明细行(识别到系统商品时附加 stock 库存详情对象) */
+ detail: ReturnUnpackDetailItem
+ /** 主表最新物品种类数 */
+ total_items: number
+ /** 主表最新物品总数量(quantity 变更时重算) */
+ total_quantity: number
+ /** 主表最新明细识别状态 */
+ detail_status: 'none_recognized' | 'partial_recognized' | 'all_recognized'
+}
+
/** returnUnpack.updateDetail:更新明细(仅允许更新 quantity/remark) */
-export function returnUnpackUpdateDetail(data: ReturnUnpackUpdateDetailParams): Promise {
+export function returnUnpackUpdateDetail(data: ReturnUnpackUpdateDetailParams): Promise {
return request({
url: '/system',
method: 'post',
@@ -263,8 +390,15 @@ export type ReturnUnpackDetailListParams = {
sort?: ReturnUnpackDetailListSort
}
+/** returnUnpack.detailList 响应 */
+export type ReturnUnpackDetailListResponse = {
+ /** 明细行列表(识别命中时含 stockWarehouse 关联与 stock 库存详情对象) */
+ list: ReturnUnpackDetailItem[]
+ pagination: ReturnUnpackPagination
+}
+
/** returnUnpack.detailList:拆包明细分页列表(命中识别商品时含 stockWarehouse 关联) */
-export function returnUnpackDetailList(data: ReturnUnpackDetailListParams = {}): Promise {
+export function returnUnpackDetailList(data: ReturnUnpackDetailListParams = {}): Promise {
return request({
url: '/system',
method: 'post',
diff --git a/src/api/shops/shops.ts b/src/api/shops/shops.ts
index 4c096430..124ca34c 100644
--- a/src/api/shops/shops.ts
+++ b/src/api/shops/shops.ts
@@ -80,12 +80,13 @@ export interface ShopAuthorizeSessionKeyResponse {
}
}
-/** 按店铺所属平台生成授权会话(callbackurl 必填;视频号平台另传 appId/toUserName) */
+/** 按店铺所属平台生成授权会话(视频号平台不传 callbackurl,另传 appId/toUserName;京东平台另传 VenderID) */
export function shopGetAuthorizeSessionKey(data: {
id: number
- callbackurl: string
+ callbackurl?: string
appId?: string
toUserName?: string
+ VenderID?: string
}): Promise {
return request({
url: '/system',
diff --git a/src/views/express/returnReceived/index.vue b/src/views/express/returnReceived/index.vue
index 40b63783..61b4b70c 100644
--- a/src/views/express/returnReceived/index.vue
+++ b/src/views/express/returnReceived/index.vue
@@ -129,6 +129,8 @@
{{ formatTime(detailData.record?.scan_date) }}
{{ detailData.record?.scanner_id ?? '-' }}
{{ detailData.record?.scanner_name ?? '-' }}
+ {{ detailData.record?.warehouse_id ?? '-' }}
+ {{ detailData.record?.store_id ?? '-' }}
{{ detailData.record?.is_original_return ? '是' : '否' }}
@@ -138,6 +140,7 @@
{{ detailData.record?.order_id ?? '-' }}
{{ detailData.record?.store_remark || '-' }}
{{ formatTime(detailData.record?.created_at) }}
+ {{ formatTime(detailData.record?.updated_at) }}
{{ detailData.record?.remark || '-' }}
@@ -188,8 +191,11 @@ import { safeInvoke } from '@/utils/safe-invoke'
function formatTime(val: any): string {
if (val === null || val === undefined || val === '') return '-'
+ const str = String(val)
+ // 纯日期字符串直接返回,避免时区偏移
+ if (/^\d{4}-\d{2}-\d{2}$/.test(str)) return str
const d = new Date(val)
- if (isNaN(d.getTime())) return String(val)
+ if (isNaN(d.getTime())) return str
return d.toLocaleString('zh-CN', { hour12: false })
}
diff --git a/src/views/express/returnUnpack/components/UnpackDetailTable.vue b/src/views/express/returnUnpack/components/UnpackDetailTable.vue
new file mode 100644
index 00000000..a2c720a0
--- /dev/null
+++ b/src/views/express/returnUnpack/components/UnpackDetailTable.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+ -
+
+
+
+
+
+ {{ stockSku(row) }}
+
+
+ {{ stockBarcodes(row) }}
+
+
+
+ {{ row.stock?.stock_unit || row.stockWarehouse?.stock_unit || '-' }}
+
+
+ {{ row.stock_id ?? '-' }}
+
+
+
+
+ {{ row.is_recognized ? '已识别' : '未识别' }}
+
+
+
+
+
+
+ {{ row.product_status === 'damaged' ? '破损' : '正常' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/express/returnUnpack/index.vue b/src/views/express/returnUnpack/index.vue
index 06222467..7029e00b 100644
--- a/src/views/express/returnUnpack/index.vue
+++ b/src/views/express/returnUnpack/index.vue
@@ -23,7 +23,7 @@
:layout-key="toolbarLayoutKey"
@action="handleToolbarButtonClick"
/>
-
+
@@ -67,8 +67,8 @@
-
- {{ row.store_id }}
+
+ {{ row.shop_name }}
-
@@ -89,6 +89,8 @@
+
+
@@ -131,9 +133,12 @@
{{ formatTime(detailRecord.start_time) }}
{{ formatTime(detailRecord.end_time) }}
{{ detailRecord.store_id ?? '-' }}
+ {{ detailRecord.shop_name || '-' }}
+ {{ detailRecord.source_order_codes || '-' }}
{{ detailRecord.order_express_id ?? '-' }}
{{ detailRecord.order_id ?? '-' }}
- {{ detailRecord.store_remark || '-' }}
+ {{ detailRecord.return_received_id ?? '-' }}
+ {{ cameraIdsLabel(detailRecord.camera_ids) }}
{{ detailRecord.remark || '-' }}
@@ -147,37 +152,30 @@
{{ detailOrder.items?.length ?? '-' }}
-
+
-
-
-
-
- {{ row.stock_id ?? '-' }}
-
-
-
-
-
-
-
- {{ row.is_recognized ? '已识别' : '未识别' }}
-
-
-
-
-
-
- {{ row.product_status === 'damaged' ? '破损' : '正常' }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -203,13 +201,17 @@ import { returnUnpackAvailableFields, returnUnpackColumns, returnUnpackToolbarBu
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue'
+import UnpackDetailTable from './components/UnpackDetailTable.vue'
// ==================== 常量 / 工具 ====================
function formatTime(val: any): string {
if (val === null || val === undefined || val === '') return '-'
+ const str = String(val)
+ // 纯日期字符串直接返回,避免时区偏移
+ if (/^\d{4}-\d{2}-\d{2}$/.test(str)) return str
const d = new Date(val)
- if (isNaN(d.getTime())) return String(val)
+ if (isNaN(d.getTime())) return str
return d.toLocaleString('zh-CN', { hour12: false })
}
@@ -249,6 +251,11 @@ function detailStatusTagType(val: any): 'success' | 'warning' | 'info' | 'danger
return map[String(val)] ?? 'info'
}
+function cameraIdsLabel(ids: any): string {
+ if (!Array.isArray(ids) || ids.length === 0) return '-'
+ return ids.join(', ')
+}
+
function isOk(res: any): boolean {
return Boolean(res && (res.code === 1 || res.code === 200 || res.code === 20000))
}
@@ -465,26 +472,34 @@ function handleSortChange({ prop, order }: any) {
const detailVisible = ref(false)
const detailLoading = ref(false)
+const detailActiveTab = ref('detail')
const detailRecord = ref(null)
const detailOrder = ref(null)
+
+// Tab2(returnUnpack.detailList)分页明细状态
+const detailListLoading = ref(false)
const detailList = ref([])
+const detailPagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
async function handleViewDetail(row: any) {
detailVisible.value = true
detailLoading.value = true
+ detailActiveTab.value = 'detail'
detailRecord.value = null
detailOrder.value = null
detailList.value = []
+ detailPagination.currentPage = 1
+ detailPagination.total = 0
try {
const res: any = await returnUnpackDetail({ id: row.id })
if (isOk(res)) {
const data = res.data ?? res
- detailRecord.value = data.record ?? data
- detailOrder.value = data.related?.order ?? data.order ?? null
+ const record = data.record ?? data
+ detailRecord.value = record
+ detailOrder.value = data.related?.order ?? null
} else {
ElMessage.error(res?.message || '获取详情失败')
}
- await loadDetailList(row.id)
} catch {
// 请求层已提示错误
} finally {
@@ -492,23 +507,44 @@ async function handleViewDetail(row: any) {
}
}
-async function loadDetailList(unpackId: number) {
+// Tab 切换:切到「明细分页」时按分页加载 detailList
+async function handleDetailTabChange(name: string | number) {
+ if (name === 'detailList' && detailRecord.value) {
+ await loadDetailListPage(detailPagination.currentPage || 1)
+ }
+}
+
+async function loadDetailListPage(page: number) {
+ if (!detailRecord.value) return
+ detailListLoading.value = true
try {
const res: any = await returnUnpackDetailList({
- pagination: { page: 1, pageSize: 500 },
- where: { unpack_id: unpackId },
+ pagination: { page, pageSize: detailPagination.pageSize },
+ where: { unpack_id: detailRecord.value.id },
})
if (isOk(res)) {
const data = res.data ?? res
detailList.value = data.list ?? []
+ const total = data.pagination?.total ?? 0
+ detailPagination.currentPage = page
+ detailPagination.total = total
} else {
detailList.value = []
+ detailPagination.total = 0
+ ElMessage.error(res?.message || '获取明细分页失败')
}
} catch {
detailList.value = []
+ detailPagination.total = 0
+ } finally {
+ detailListLoading.value = false
}
}
+function handleDetailListPageChange(page: number) {
+ loadDetailListPage(page)
+}
+
// ==================== 货主选项加载 ====================
async function loadStoreOptions() {
@@ -585,8 +621,14 @@ onMounted(() => {
}
}
- .detail-table {
- width: 100%;
+ .detail-list-pane {
+ min-height: 160px;
+ }
+
+ .detail-pagination {
+ margin-top: 10px;
+ display: flex;
+ justify-content: flex-end;
}
}
diff --git a/src/views/express/returnUnpack/returnUnpack-config.ts b/src/views/express/returnUnpack/returnUnpack-config.ts
index 5b7d6356..5a43c391 100644
--- a/src/views/express/returnUnpack/returnUnpack-config.ts
+++ b/src/views/express/returnUnpack/returnUnpack-config.ts
@@ -71,8 +71,8 @@ export const returnUnpackColumns = [
{ prop: 'total_quantity', label: '总数量', width: '90' },
{ prop: 'unpacker_name', label: '拆包人', minWidth: '100', showOverflowTooltip: true },
{ prop: 'unpack_date', label: '拆包日期', width: '130' },
+ { prop: 'shop_name', label: '货主/店铺', minWidth: '120', showOverflowTooltip: true },
{ prop: 'is_original_return', label: '原单退回', width: '100' },
- { prop: 'store_id', label: '货主ID', width: '90' },
{ prop: 'created_at', label: '创建时间', width: '170', sortable: 'custom' },
{ prop: 'actions', label: '操作', width: '240', fixed: 'right' },
]
diff --git a/src/views/express/returnUnpackwork/CameraLivePreview.vue b/src/views/express/returnUnpackwork/CameraLivePreview.vue
index c87894a5..73bf0124 100644
--- a/src/views/express/returnUnpackwork/CameraLivePreview.vue
+++ b/src/views/express/returnUnpackwork/CameraLivePreview.vue
@@ -12,8 +12,8 @@