From b3be2e11e6c39f18e28195ae4bcb3dd0e92544e8 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Wed, 12 Aug 2026 18:10:00 +0800 Subject: [PATCH] 1 --- src/api/order.recheckorder/recheckOrder.ts | 33 ++++ src/api/pickcart/pickcart.ts | 29 +++ src/layout/component/Navbar.vue | 4 +- src/views/afterSale/list/afterSale-config.ts | 8 + src/views/afterSale/list/index.vue | 15 ++ src/views/inbox/group/group-config.ts | 3 + src/views/inbox/group/index.vue | 6 + src/views/message/index.vue | 31 ++- .../component/ExpressWaybillPanel.vue | 35 +++- .../component/OrderToolbarButtonGroup.vue | 7 +- src/views/system/setting/pickcart/index.vue | 179 ++++++++---------- .../setting/pickcart/pickcart-config.ts | 27 ++- 12 files changed, 247 insertions(+), 130 deletions(-) diff --git a/src/api/order.recheckorder/recheckOrder.ts b/src/api/order.recheckorder/recheckOrder.ts index 9561aeeb..bc506542 100644 --- a/src/api/order.recheckorder/recheckOrder.ts +++ b/src/api/order.recheckorder/recheckOrder.ts @@ -483,12 +483,45 @@ export function confirmIntercept(data: ConfirmRecheckParams): Promise { } as any) } +/** order.recheckOrder.interceptScan 请求参数 */ +export type InterceptScanParams = { + waybill_code: string +} + +/** order.recheckOrder.interceptScan 响应 data */ +export type InterceptScanResponse = { + waybill_code: string + is_back: string + after_sale?: Record | null + order?: { + order_id?: number + order_no?: string + intercept_status?: string + } | null +} + +/** order.recheckOrder.interceptScan:拦截扫描,通过运单号标记退回并处理关联售后工单 */ +export function interceptScan(data: InterceptScanParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.recheckOrder.interceptScan', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + export const orderRecheckOrder = { scanOrder, batchQuickRecheck, batchQuickRecheckByWave, confirmRecheck, confirmIntercept, + interceptScan, queryRecheckOrderSingleList } diff --git a/src/api/pickcart/pickcart.ts b/src/api/pickcart/pickcart.ts index b99ab0b2..5cd71fca 100644 --- a/src/api/pickcart/pickcart.ts +++ b/src/api/pickcart/pickcart.ts @@ -100,6 +100,17 @@ export type PickCartCodeDuplicateCheckResponse = { status?: number | null } +export type PickCartBatchDeleteParams = { + ids: number[] +} + +export type PickCartBatchDeleteResponse = { + deleted_ids: number[] + skipped_ids: number[] + deleted_count: number + skipped_count: number +} + /** pickCart.scan:按拣货车条码/编码查询拣货车信息 */ export function pickCartScan( data: PickCartScanParams @@ -185,6 +196,23 @@ export function pickCartDelete( } as any) } +/** pickCart.batchDelete:批量删除拣货车 */ +export function pickCartBatchDelete( + data: PickCartBatchDeleteParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pickCart.batchDelete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + /** pickCart.detail:查询拣货车详情 */ export function pickCartDetail( data: PickCartDetailParams @@ -242,6 +270,7 @@ export const pickCart = { create: pickCartCreate, update: pickCartUpdate, delete: pickCartDelete, + batchDelete: pickCartBatchDelete, detail: pickCartDetail, list: pickCartList, codeDuplicateCheck: pickCartCodeDuplicateCheck diff --git a/src/layout/component/Navbar.vue b/src/layout/component/Navbar.vue index 58beb4f1..394e5862 100644 --- a/src/layout/component/Navbar.vue +++ b/src/layout/component/Navbar.vue @@ -78,9 +78,9 @@
-
+
diff --git a/src/views/afterSale/list/afterSale-config.ts b/src/views/afterSale/list/afterSale-config.ts index c9a68310..23beb5a8 100644 --- a/src/views/afterSale/list/afterSale-config.ts +++ b/src/views/afterSale/list/afterSale-config.ts @@ -192,6 +192,14 @@ export function getAfterSaleAvailableFields(typeFilter?: string): typeof afterSa // -------------------- ScanBox 筛选字段 -------------------- export const afterSaleAvailableFields = [ + { + value: 'store_id', + label: '货主', + type: 'select', + multiple: true, + placeholder: '请选择货主', + options: [] as { label: string; value: unknown }[], + }, { value: 'after_sale_no', label: '售后单号', diff --git a/src/views/afterSale/list/index.vue b/src/views/afterSale/list/index.vue index 411f2447..24b468bc 100644 --- a/src/views/afterSale/list/index.vue +++ b/src/views/afterSale/list/index.vue @@ -236,6 +236,7 @@ import { } from '@/api/afterSale/index' import { getAfterSaleAvailableFields, + afterSaleAvailableFields, afterSaleColumns, afterSaleToolbarButtons, AFTER_SALE_TYPE_MAP, @@ -248,6 +249,8 @@ import { CLAIM_STATUS_MAP, CLAIM_STATUS_TAG_MAP, } from './afterSale-config' +import { loadStores } from '@/api/index/index' +import { extractStoreListFromResponse, fillStoreScanFieldOptions } from '@/views/order/orderManagement/config/order-common-config' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' @@ -777,7 +780,19 @@ function handleViewDetail(row: any) { // ==================== 生命周期 ==================== +// ==================== 货主列表加载 ==================== + +async function loadStoreOptions() { + try { + const storesRes: any = await loadStores() + fillStoreScanFieldOptions(afterSaleAvailableFields, extractStoreListFromResponse(storesRes)) + } catch { + fillStoreScanFieldOptions(afterSaleAvailableFields, []) + } +} + onMounted(() => { + loadStoreOptions() fetchData() }) diff --git a/src/views/inbox/group/group-config.ts b/src/views/inbox/group/group-config.ts index 6cd5386c..f3ff33f6 100644 --- a/src/views/inbox/group/group-config.ts +++ b/src/views/inbox/group/group-config.ts @@ -56,11 +56,14 @@ export const groupColumns = [ { prop: 'group_type', label: '群类型', width: '100' }, { prop: 'sub_type', label: '子类型', width: '100' }, { prop: 'store_name', label: '货主', minWidth: '120', showOverflowTooltip: true }, + { prop: 'source_type', label: '来源', width: '90' }, + { prop: 'source_extra', label: '来源标识', minWidth: '140', showOverflowTooltip: true }, { prop: 'express_interfaces', label: '快递接口', minWidth: '160', showOverflowTooltip: true }, { prop: 'system_express_name', label: '系统快递', width: '110', showOverflowTooltip: true }, { prop: 'ai_enabled', label: 'AI回复', width: '90' }, { prop: 'is_blocked', label: '状态', width: '80' }, { prop: 'created_at', label: '创建时间', width: '170' }, + { prop: 'updated_at', label: '更新时间', width: '170' }, { prop: 'actions', label: '操作', width: '220', fixed: 'right' }, ] diff --git a/src/views/inbox/group/index.vue b/src/views/inbox/group/index.vue index 9d137d08..9da9dfbe 100644 --- a/src/views/inbox/group/index.vue +++ b/src/views/inbox/group/index.vue @@ -59,6 +59,12 @@ {{ subTypeLabel(row.sub_type) }} + +