From 91105102bff4f320d95123b39d212a1e56d7481b Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 11 Aug 2026 17:47:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(afterSale):=20=E5=94=AE=E5=90=8E=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=BC=B9=E7=AA=97=E6=8E=92=E7=89=88=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20&=20=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 售后详情: 新增related关联数据展示(订单/运单/店铺), 操作状态栏, 订单操作日志 - 售后详情: 详细描述移出表格防撑开, 移除角色组/处理结果/完成时间字段 - 售后列表: 批量完成按钮改为warning橙色, 批量关闭改为danger红色 - 售后列表: 处理下拉增加等待反馈选项 - API类型: AfterSale接口补充related等关联数据类型 - 工具栏组件: resolveButtonStyle支持显式type覆盖 & 按钮key强制样式映射 --- src/api/afterSale/index.ts | 170 ++++++++++++- .../detail/AfterSaleDetailDialog.vue | 231 ++++++++++++++++-- src/views/afterSale/list/afterSale-config.ts | 75 ++++++ .../component/OrderToolbarButtonGroup.vue | 20 +- 4 files changed, 466 insertions(+), 30 deletions(-) diff --git a/src/api/afterSale/index.ts b/src/api/afterSale/index.ts index c8111df4..0d8399c9 100644 --- a/src/api/afterSale/index.ts +++ b/src/api/afterSale/index.ts @@ -40,6 +40,7 @@ export interface AfterSale { role_group: AfterSaleRoleGroup | null resolution: string | null resolved_at: string | null + followup_at: string | null // 仓库理赔 claim_needed: 0 | 1 @@ -63,8 +64,120 @@ export interface AfterSale { receiving_id: number | null receiving_no: string | null + // 关联详情(detail 接口返回) + related?: AfterSaleRelated + created_at: string updated_at: string + deleted_at: string | null + started_at: string | null + completed_at: string | null +} + +// ==================== 关联数据类型 ==================== + +/** 关联订单 - 收货人 */ +export interface RelatedRecipient { + name: string + tel: string + mobile: string + email: string + zip_code: string + country: string + province: string + city: string + district: string + town: string + address: string +} + +/** 关联订单 - 商品条码 */ +export interface RelatedItemBarcode { + id: number + barcode: string +} + +/** 关联订单 - 商品行 */ +export interface RelatedOrderItem { + id: number + order_line_no: string + item_code: string + item_name: string + sku_property: string + quantity: number + locked_quantity: number + is_batch_mgmt: string + is_shelf_life_mgmt: string + is_images: string + store_id: number + packing_requirements: string + stock_unit: string + image_url: string[] + barcodes: RelatedItemBarcode[] + plan_qty: number + stock_id: number + order_item_id: number + order_id: number +} + +/** 关联订单 */ +export interface RelatedOrder { + id: number + delivery_order_code: string + warehouse_id: number + store_id: number + items_weight: number + wave_id: number + wave_no: string + source_platform_code: string + source_platform_name: string + source_order_codes: string + sync_status: string + inspection_status: string + storage_status: string + post_status: string + print_status: string + pick_status: string + pack_status: string + intercept_status: string + items_count: number + items_total: number + recipient: RelatedRecipient | null + sender: any + items: RelatedOrderItem[] + pack_videos: any[] +} + +/** 关联运单 */ +export interface RelatedWaybill { + id: number + waybill_code: string + order_id: number + logistics_code: string + logistics_name: string + logistics_interface_id: number + logistics_interface_name: string + status: number + is_back: string + is_intercept: string + warehouse_id: number + create_at: string +} + +/** 关联店铺合同 */ +export interface RelatedStoreContract { + contract_id: number + store_remask: string + warehouse_remask: string + store_use_status: number + warehouse_use_status: number +} + +/** 售后关联数据 */ +export interface AfterSaleRelated { + order?: RelatedOrder | null + waybill?: RelatedWaybill | null + store_contract?: RelatedStoreContract | null } /** 售后步骤对象 */ @@ -164,9 +277,30 @@ export interface AfterSaleExportParams { sort?: { sortField?: string; sortOrder?: 'asc' | 'desc' } } -/** 导出进度查询参数 */ -export interface AfterSaleExportTaskProgressParams { - task_id: string +/** 批量设置待反馈参数 */ +export interface AfterSaleBatchSetPendingFeedbackParams { + ids: number[] + remark?: string +} + +/** 批量设置待反馈结果项 */ +export interface AfterSaleBatchSetPendingFeedbackFailedItem { + id: number + reason: string +} + +/** 批量关闭/完结参数 */ +export interface AfterSaleBatchCloseParams { + ids: number[] + status: 'completed' | 'closed' + resolution?: string + remark?: string +} + +/** 批量关闭/完结结果项 */ +export interface AfterSaleBatchCloseFailedItem { + id: number + reason: string } // ==================== API 方法 ==================== @@ -335,3 +469,33 @@ export function afterSaleWorkCount(): Promise { isSystemApi: true } as any) } + +/** 2.12 批量设置待反馈 afterSale.batchSetPendingFeedback */ +export function afterSaleBatchSetPendingFeedback(data: AfterSaleBatchSetPendingFeedbackParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'afterSale.batchSetPendingFeedback', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +/** 2.13 批量关闭/完结 afterSale.batchClose */ +export function afterSaleBatchClose(data: AfterSaleBatchCloseParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'afterSale.batchClose', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/views/afterSale/detail/AfterSaleDetailDialog.vue b/src/views/afterSale/detail/AfterSaleDetailDialog.vue index d750cac0..c3a8ce9e 100644 --- a/src/views/afterSale/detail/AfterSaleDetailDialog.vue +++ b/src/views/afterSale/detail/AfterSaleDetailDialog.vue @@ -60,6 +60,7 @@
+ @@ -77,7 +78,7 @@
- +
@@ -93,30 +94,108 @@ {{ typeLabel(detail.type) }} {{ subTypeLabel(detail.sub_type) }} - {{ detail.title }} + {{ detail.title || '-' }} {{ detail.priority }} - - {{ roleGroupLabel(detail.role_group) }} - - - - {{ detail.description }} - {{ detail.resolution || '-' }} + {{ detail.related?.store_contract?.store_remask || '-' }} + {{ detail.started_at || '-' }} {{ detail.resolved_at || '-' }} {{ detail.created_at }} - {{ detail.updated_at }} + + +
+ 详细描述 +
{{ detail.description }}
+
+
+ + + + + + {{ detail.related.waybill.waybill_code }} + {{ detail.related.waybill.logistics_name }} + {{ detail.related.waybill.logistics_interface_name }} + {{ detail.related.waybill.is_back === 'Y' ? '是' : '否' }} + {{ detail.related.waybill.is_intercept === 'Y' ? '是' : '否' }} + {{ detail.related.waybill.create_at }} - - - - - {{ detail.waybill_no }} - {{ detail.order_delivery_no }} - {{ detail.entry_order_no }} - {{ detail.order_stockout_no }} - {{ detail.receiving_no }} + + + + + + {{ detail.related.order.delivery_order_code }} + {{ detail.related.order.source_order_codes }} + {{ detail.related.order.items_total }} + {{ detail.related.order.items_weight }} + +
+ {{ orderOpLabel('sync', detail.related.order.sync_status) }} + {{ orderOpLabel('storage', detail.related.order.storage_status) }} + {{ orderOpLabel('print', detail.related.order.print_status) }} + {{ orderOpLabel('pick', detail.related.order.pick_status) }} + {{ orderOpLabel('pack', detail.related.order.pack_status) }} + {{ orderOpLabel('post', detail.related.order.post_status) }} + {{ orderOpLabel('intercept', detail.related.order.intercept_status) }} +
+ +
+
收货信息
+
{{ detail.related.order.recipient.name }} {{ detail.related.order.recipient.mobile || detail.related.order.recipient.tel }}
+
{{ detail.related.order.recipient.province }}{{ detail.related.order.recipient.city }}{{ detail.related.order.recipient.district }}{{ detail.related.order.recipient.town }} {{ detail.related.order.recipient.address }}
+
+ +
+
商品明细({{ detail.related.order.items?.length || 0 }} 种)
+
+ +
+
{{ item.item_name }}
+
+ SKU: {{ item.item_code }} + 规格: {{ item.sku_property }} + 数量: {{ item.plan_qty ?? item.quantity }} {{ item.stock_unit }} +
+
包装要求: {{ item.packing_requirements }}
+
+ {{ bc.barcode }} +
+
+
+
+ +
+ + {{ orderLogVisible ? '收起操作日志' : '查看操作日志' }} + +
+ + +
+
@@ -164,7 +243,7 @@