diff --git a/dist.tar.gz b/dist.tar.gz index 0f23b3ef..610a87b2 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 index 6c3b05f2..c4717606 100644 --- a/src/api/order.recheckorder/recheckOrder.ts +++ b/src/api/order.recheckorder/recheckOrder.ts @@ -45,9 +45,56 @@ function pickScanOrderBody(data: RecheckScanOrderParams): Record ) } -/** scanOrder 成功时服务端常用字段(与 order.recheckOrder.scanOrder 响应对齐) */ +/** 散单 list 项(有波次时的扁平订单) */ +export type ScanOrderSingleListItem = { + order_id?: number + delivery_order_code?: string + waybill_no?: string + pick_status?: string + is_printed?: boolean | number | string + is_reviewed?: boolean | number | string + shop_nick?: string + items_count?: number + wave_index?: number | string + recheck_status?: string + order_type?: string + status?: string + logistics_name?: string + store_remark?: string + intercept_status?: string + stock?: unknown[] + /** 无波次时单订单详情模式 */ + detail?: Record + items?: unknown[] + expresses?: unknown[] + logs?: unknown[] +} + +/** 团购 list 项(波次视图) */ +export type ScanOrderGroupListItem = { + wave_id?: number + wave_no?: string + wave_type?: number + wave_status?: string + total_orders?: number + processed_orders?: number + creator?: string + create_time?: string + update_time?: string + order_count?: number + pick_mode?: number + box_no?: string + order_ids?: Array + orders_detail?: unknown[] + orders?: unknown[] + stocks?: unknown[] + recheck_status?: string + is_reviewed?: boolean | number | string +} + +/** scanOrder / scanTask 成功时服务端字段(与 order.recheckOrder.scanOrder 响应对齐) */ export type ScanOrderResultShape = { - match_type?: 'waybill' | 'wave' | 'cart' | string + match_type?: 'waybill' | 'wave' | 'cart' | 'task' | string list_type?: 'single' | 'group' | string waybill_no?: string task_id?: number | null @@ -62,7 +109,8 @@ export type ScanOrderResultShape = { total_orders?: number reviewed_count?: number unreviewed_count?: number - list?: unknown[] + list?: Array> + /** 历史兼容:车号命中旧结构 */ cart_match_view?: Record | null order_id?: number | string order?: Record @@ -71,6 +119,110 @@ export type ScanOrderResultShape = { logs?: unknown[] } +export function isRecheckApiSuccess(res: unknown) { + const r = res as { code?: number; flag?: string } | null | undefined + return Boolean(r && (r.code === 1 || r.code === 200 || r.flag === 'success')) +} + +/** 解包 scanOrder / scanTask 响应 data */ +export function unwrapScanOrderResponse(res: unknown): ScanOrderResultShape { + if (!res || typeof res !== 'object') return {} + const r = res as Record + const d = r.data + if (d && typeof d === 'object' && !Array.isArray(d)) return d as ScanOrderResultShape + return r as ScanOrderResultShape +} + +function asRecord(v: unknown): Record | null { + return v && typeof v === 'object' && !Array.isArray(v) ? (v as Record) : null +} + +function normalizeStockRows(raw: unknown): Record[] { + if (!Array.isArray(raw)) return [] + return raw + .filter((item) => item && typeof item === 'object' && !Array.isArray(item)) + .map((item) => { + const row = item as Record + const barcodes = Array.isArray(row.barcodes) + ? row.barcodes + : row.barcode + ? [row.barcode] + : [] + return { + ...row, + item_name: row.item_name || row.name || '', + barcode: barcodes[0] || row.item_code || row.barcode || '', + barcodes, + plan_qty: row.plan_qty ?? row.qty ?? row.quantity, + images: Array.isArray(row.images) ? row.images : [], + has_shared_barcode: !!row.has_shared_barcode + } + }) +} + +/** 是否为无波次时的单订单详情 list 项(含 detail/items/expresses/logs) */ +export function isScanOrderDetailListItem(item: unknown): boolean { + const row = asRecord(item) + if (!row) return false + return Boolean(row.detail || row.items || row.expresses || row.logs) +} + +/** 将 scanOrder list 项规范化为面板订单行 */ +export function normalizeScanOrderPanelRow(item: unknown): Record { + const row = asRecord(item) || {} + if (isScanOrderDetailListItem(row)) { + const detail = asRecord(row.detail) || row + const items = Array.isArray(row.items) ? row.items : detail.items + const stock = normalizeStockRows(items ?? detail.stock) + return { + ...detail, + order_id: detail.order_id ?? detail.id ?? row.order_id, + waybill_no: String( + detail.waybill_no ?? detail.waybillCode ?? detail.waybill_code ?? row.waybill_no ?? '' + ).trim(), + stock, + expresses: Array.isArray(row.expresses) ? row.expresses : detail.expresses, + logs: Array.isArray(row.logs) ? row.logs : detail.logs + } + } + + const stock = normalizeStockRows(row.stock ?? row.stocks) + return { + ...row, + order_id: row.order_id ?? row.id, + waybill_no: String(row.waybill_no ?? row.waybillCode ?? row.waybill_code ?? '').trim(), + stock: stock.length ? stock : normalizeStockRows(row.stocks) + } +} + +/** 将 scanOrder 团购波次 list 项规范化为面板行 */ +export function normalizeScanOrderGroupWaveRow(wave: unknown): Record { + const w = asRecord(wave) || {} + const stocks = normalizeStockRows(w.stocks) + const totalOrders = Number(w.total_orders ?? w.order_count ?? 0) + const processedOrders = Number(w.processed_orders ?? 0) + const recheckStatus = String( + w.recheck_status ?? (processedOrders >= totalOrders && totalOrders > 0 ? 'fin' : '') + ).trim() + return { + ...w, + _is_wave: true, + waybill_no: String(w.wave_no ?? '').trim(), + id: w.wave_id, + order_id: w.wave_id, + order_ids: Array.isArray(w.order_ids) ? w.order_ids : [], + orders_detail: Array.isArray(w.orders_detail) ? w.orders_detail : w.orders, + stock: stocks, + recheck_status: recheckStatus, + is_reviewed: w.is_reviewed ?? (processedOrders >= totalOrders && totalOrders > 0) + } +} + +export function isOrderRecheckFinished(row: Record) { + const status = String(row.recheck_status ?? row.is_reviewed ?? '').trim() + return status === 'fin' || status === 'true' || row.is_reviewed === true +} + /** confirmRecheck 成功时服务端常用字段 */ export type ConfirmRecheckResultShape = { order_id?: number @@ -198,6 +350,70 @@ export function batchQuickRecheck(data: BatchQuickRecheckParams): Promise { } as any) } +export type QueryRecheckOrderSingleListWhere = { + keyword?: string + wave_no?: string + recheck_status?: string + pick_status?: string +} + +export type QueryRecheckOrderSingleListParams = { + where?: QueryRecheckOrderSingleListWhere + pagination?: { + page?: number + pageSize?: number + } +} + +export type RecheckOrderSingleListItem = { + order_id?: number + delivery_order_code?: string + order_type?: string + wave_id?: number + wave_no?: string + pick_status?: string + recheck_status?: string + shop_nick?: string + logistics_name?: string + items_count?: number + items_total?: number + items_weight?: number | string + weight_type?: string + status?: string + create_at?: string + pick_time?: string + recheck_time?: string +} + +export type QueryRecheckOrderSingleListResponse = { + list: RecheckOrderSingleListItem[] + pagination: { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean + } +} + +/** order.recheckOrder.queryRecheckOrderSingleList:散单模式复核列表查询 */ +export function queryRecheckOrderSingleList( + data: QueryRecheckOrderSingleListParams = {} +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.recheckOrder.queryRecheckOrderSingleList', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + /** order.recheckOrder.confirmIntercept:确认拦截,入参 order_id,匹配单个订单并标记拦截 */ export function confirmIntercept(data: ConfirmRecheckParams): Promise { return request({ @@ -217,7 +433,8 @@ export const orderRecheckOrder = { scanOrder, batchQuickRecheck, confirmRecheck, - confirmIntercept + confirmIntercept, + queryRecheckOrderSingleList } export type { diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 6a46f59c..7ee0ecac 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -162,8 +162,28 @@ export type WaveGroupOrderFetchListParams = { return_order_ids?: boolean } +export type WaveGroupOrderFetchListItem = Record & { + item_detail?: string + item_detail_machine?: string + item_detail_machine_snapshot?: string + item_snapshot?: string + group?: string + group_count?: number + items_total?: number + /** 总重量 kg,取组内首单 items_weight */ + items_weight?: number | string + store_id?: number + store_ids?: number[] + logistics_name?: string + distinguish_express?: boolean + first_order_time?: string + last_order_time?: string + status_summary?: Record + order_ids?: number[] +} + export type WaveGroupOrderFetchListResponse = { - list: Array> + list: WaveGroupOrderFetchListItem[] pagination: WaveListPagination } diff --git a/src/api/setting.packagematerial/packagematerial.ts b/src/api/setting.packagematerial/packagematerial.ts index a8fab7d0..81d7d489 100644 --- a/src/api/setting.packagematerial/packagematerial.ts +++ b/src/api/setting.packagematerial/packagematerial.ts @@ -105,3 +105,34 @@ export function packageMaterialList(data?: PackageMaterialGetParams) { data: data || {} }) } + +export type PackageMaterialSearchParams = { + keyword?: string +} + +export type PackageMaterialSearchItem = { + id?: number + material_code?: string + material_name?: string + material_type?: string + spec?: string + status?: number +} + +export type PackageMaterialSearchResponse = { + data: PackageMaterialSearchItem[] +} + +/** setting.packageMaterial.search:包材关键字搜索,最多返回 50 条启用中的包材 */ +export function packageMaterialSearch(data?: PackageMaterialSearchParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageMaterial.search', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} diff --git a/src/api/setting.warehouse/settingwarehouse.ts b/src/api/setting.warehouse/settingwarehouse.ts index bec38e30..47eb91bc 100644 --- a/src/api/setting.warehouse/settingwarehouse.ts +++ b/src/api/setting.warehouse/settingwarehouse.ts @@ -13,6 +13,17 @@ export type SettingWarehouseAutoOutboundRules = { require_pick?: boolean } +/** 文档默认:auto_outbound_rules 各子项默认值 */ +export const DEFAULT_AUTO_OUTBOUND_RULES: Required = { + enabled: false, + require_recheck: true, + require_pack: true, + require_weigh: true, + require_sync: true, + require_print: true, + require_pick: true +} + /** 与 module setting.warehouse 文档 subject_config 对齐 */ export type SettingWarehouseSubjectConfig = { enable_external_express_code?: boolean @@ -41,6 +52,82 @@ export type SettingWarehouseSaveSettingsPayload = SettingWarehouseSettingsPayloa cache_cleared_warehouse_id: number | null } +function clonePlainObject>(src: T): T { + return JSON.parse(JSON.stringify(src)) as T +} + +/** 归一化 getSettings / saveSettings 返回的 subject_config(补全文档默认项) */ +export function normalizeWarehouseSubjectConfig( + raw: unknown +): SettingWarehouseSubjectConfig { + const base = + raw && typeof raw === 'object' && !Array.isArray(raw) + ? clonePlainObject(raw as Record) + : ({} as Record) + + if (typeof base.enable_external_express_code !== 'boolean') { + base.enable_external_express_code = false + } + + const rulesRaw = base.auto_outbound_rules + const rules = + rulesRaw && typeof rulesRaw === 'object' && !Array.isArray(rulesRaw) + ? { ...(rulesRaw as Record) } + : ({} as Record) + + base.auto_outbound_rules = { + ...DEFAULT_AUTO_OUTBOUND_RULES, + ...Object.fromEntries( + Object.entries(rules).filter(([, v]) => typeof v === 'boolean') + ) + } as SettingWarehouseAutoOutboundRules + + return base as SettingWarehouseSubjectConfig +} + +export function normalizeGetSettingsPayload( + raw: Record | null | undefined +): SettingWarehouseSettingsPayload { + const payload = raw && typeof raw === 'object' ? raw : {} + const warehouseId = Number(payload.warehouse_id) + return { + warehouse_id: Number.isFinite(warehouseId) ? warehouseId : 0, + subject_config: normalizeWarehouseSubjectConfig(payload.subject_config) + } +} + +/** 构造 saveSettings 请求体(仅 subject_config + 可选 cache 仓库 ID) */ +export function buildSaveSettingsRequest(options: { + subject_config: SettingWarehouseSubjectConfig | Record + cache_warehouse_id?: number | null +}): SettingWarehouseSaveSettingsParams { + const body: SettingWarehouseSaveSettingsParams = { + subject_config: normalizeWarehouseSubjectConfig(options.subject_config) + } + const cacheId = options.cache_warehouse_id + if (cacheId != null && Number.isFinite(cacheId) && cacheId > 0) { + body.cache_warehouse_id = Math.trunc(cacheId) + } + return body +} + +export function normalizeSaveSettingsPayload( + raw: Record | null | undefined +): SettingWarehouseSaveSettingsPayload { + const base = normalizeGetSettingsPayload(raw) + const cleared = raw?.cache_cleared_warehouse_id + const cacheCleared = + cleared === null || cleared === undefined + ? null + : Number.isFinite(Number(cleared)) + ? Number(cleared) + : null + return { + ...base, + cache_cleared_warehouse_id: cacheCleared + } +} + export function unwrapSettingWarehousePayload( res: Record | null | undefined ): Record { diff --git a/src/components/BatchReceivingPrintDialog.vue b/src/components/BatchReceivingPrintDialog.vue index 3aa03ae4..4537f543 100644 --- a/src/components/BatchReceivingPrintDialog.vue +++ b/src/components/BatchReceivingPrintDialog.vue @@ -3,6 +3,7 @@ v-model="visible" :title="dialogTitle" width="1135px" + align-center class="print-dialog" custom-class="print-dialog" :body-style="printDialogBodyStyle" @@ -196,7 +197,7 @@ const printerLoading = ref(false) const businessTypeOptions = [ { label: '收货单 (RECEIPT)', value: 'RECEIPT' }, { label: '库存单 (STOCK)', value: 'STOCK' }, - { label: '出库单 (STOCKOUT)', value: 'STOCKOUT' }, + { label: '出库单 (OUTBOUND)', value: 'OUTBOUND' }, { label: '拣货单 (PICKING)', value: 'PICKING' } ] @@ -451,17 +452,23 @@ async function loadPrintOptions() { } } +function normalizeBusinessType(value: string) { + const normalized = String(value || '').trim() + if (normalized === 'STOCKOUT') return 'OUTBOUND' + return normalized +} + function resolveBusinessType() { - const fromProp = String(props.businessType || '').trim() + const fromProp = normalizeBusinessType(String(props.businessType || '').trim()) if (isSupportedBusinessType(fromProp)) return fromProp const firstRow = props.selectionRows[0] - const fromRow = String(firstRow?.business_type ?? firstRow?.businessType ?? '').trim() + const fromRow = normalizeBusinessType(String(firstRow?.business_type ?? firstRow?.businessType ?? '').trim()) if (isSupportedBusinessType(fromRow)) return fromRow return 'RECEIPT' } function isSupportedBusinessType(value: string) { - return ['STOCK', 'STOCKOUT', 'RECEIPT', 'PICKING'].includes(value) + return ['STOCK', 'OUTBOUND', 'RECEIPT', 'PICKING'].includes(value) } async function handleBusinessTypeChange() { @@ -488,7 +495,9 @@ function normalizeTemplateListResponse(res: any): any[] { async function loadTemplatesByBusinessType() { try { - const templates: any = await templateApi.listTemplatesByType({ businessType: printSettings.businessType }) + const templates: any = await templateApi.listTemplatesByType({ + businessType: normalizeBusinessType(printSettings.businessType) + }) if (isApiSuccess(templates)) { templateOptions.value = normalizeTemplateListResponse(templates).map((item: any) => ({ ...item, diff --git a/src/utils/stockQueryBuilder.ts b/src/utils/stockQueryBuilder.ts index dcdf4743..7367e720 100644 --- a/src/utils/stockQueryBuilder.ts +++ b/src/utils/stockQueryBuilder.ts @@ -50,8 +50,15 @@ export function buildStockQuery(params: Record) { } // 4. 类型转换与值处理 - // 处理 boolean -> Y/N - if (condition.type === 'boolean') { + // has_bound_item 为特殊字段,保留 boolean 原值(后端亦支持 Y/N) + if (key === 'has_bound_item' && condition.type === 'boolean') { + if (condition.value === true || condition.value === 'true' || condition.value === 1 || condition.value === '1') { + condition.value = true; + } else if (condition.value === false || condition.value === 'false' || condition.value === 0 || condition.value === '0') { + condition.value = false; + } + } else if (condition.type === 'boolean') { + // 处理 boolean -> Y/N if (condition.value === true || condition.value === 'true') { condition.value = 'Y'; } else if (condition.value === false || condition.value === 'false') { diff --git a/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue b/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue new file mode 100644 index 00000000..4b5c27e5 --- /dev/null +++ b/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/src/views/material/packageMaterial/index.vue b/src/views/material/packageMaterial/index.vue index ca3e3c8c..fe01f812 100644 --- a/src/views/material/packageMaterial/index.vue +++ b/src/views/material/packageMaterial/index.vue @@ -30,6 +30,7 @@ 共 {{ pagination.total }} 条
+ 快速搜索 新增包材 批量导入
@@ -191,6 +192,7 @@ + @@ -201,6 +203,7 @@ import type { FormInstance, FormRules } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' import BatchImportDialog from './component/BatchImportDialog.vue' +import PackageMaterialSearchForm from './form/PackageMaterialSearchForm.vue' import { packageMaterialCreate, packageMaterialDelete, @@ -247,6 +250,7 @@ const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }) const dialogVisible = ref(false) const dialogMode = ref<'create' | 'edit'>('create') const batchImportVisible = ref(false) +const searchFormVisible = ref(false) const formRef = ref() const formData = reactive({ id: undefined as number | undefined, diff --git a/src/views/material/packageMaterial/package-material-config.ts b/src/views/material/packageMaterial/package-material-config.ts index b617c129..94e80567 100644 --- a/src/views/material/packageMaterial/package-material-config.ts +++ b/src/views/material/packageMaterial/package-material-config.ts @@ -250,3 +250,17 @@ export function parsePackageMaterialListResponse(res: any): { return pick(res) } + +/** setting.packageMaterial.search 响应解析(data 为数组,最多 50 条) */ +export function parsePackageMaterialSearchResponse(res: unknown): PackageMaterialRecord[] { + const root = (res as any)?.data ?? res + if (Array.isArray(root)) return root as PackageMaterialRecord[] + if (Array.isArray(root?.data)) return root.data as PackageMaterialRecord[] + if (Array.isArray(root?.list)) return root.list as PackageMaterialRecord[] + return [] +} + +export function isPackageMaterialApiSuccess(res: unknown) { + const r = res as { code?: number; flag?: string } | null | undefined + return Boolean(r && (r.code === 1 || r.code === 200 || r.flag === 'success')) +} diff --git a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue index a089a96c..d6c8322b 100644 --- a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue +++ b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue @@ -75,8 +75,11 @@ import { orderBindExpressPackageMaterialByWaybill, type BindExpressPackageMaterialByWaybillResponse } from '@/api/order.index/orderindex' -import { packageMaterialGet } from '@/api/setting.packagematerial/packagematerial' -import { parsePackageMaterialListResponse } from '@/views/material/packageMaterial/package-material-config' +import { packageMaterialSearch } from '@/api/setting.packagematerial/packagematerial' +import { + isPackageMaterialApiSuccess, + parsePackageMaterialSearchResponse +} from '@/views/material/packageMaterial/package-material-config' import { isOrderIndexApiSuccess } from '../utils/order-index-helpers' const props = defineProps<{ @@ -115,6 +118,7 @@ watch( form.waybill_code = String(props.initialWaybillCode || '').trim() form.package_material_code = '' materialOptions.value = [] + void searchPackageMaterials('') } ) @@ -136,19 +140,15 @@ function focusMaterialSelect() { async function searchPackageMaterials(query: string) { const keyword = String(query || '').trim() - if (!keyword) { - materialOptions.value = [] - return - } materialLoading.value = true try { - const res: any = await packageMaterialGet({ - pagination: { page: 1, pageSize: 50 }, - where: { quickWhere: keyword } - }) - const data = parsePackageMaterialListResponse(res) - materialOptions.value = (data.list || []) - .map((item: any) => ({ + const res: any = await packageMaterialSearch(keyword ? { keyword } : {}) + if (!isPackageMaterialApiSuccess(res)) { + materialOptions.value = [] + return + } + materialOptions.value = parsePackageMaterialSearchResponse(res) + .map((item) => ({ material_code: String(item.material_code || '').trim(), material_name: String(item.material_name || '').trim() })) diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index cc19c74d..d04f597c 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -298,6 +298,7 @@ export const ORDER_TOOLBAR_BUTTONS: Record = { columnConfig: { key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' }, toggleDetail: { key: 'toggleDetail', label: '显示详情', dynamicLabelKey: 'detailToggleLabel', size: 'small', action: 'toggleDetailVisible' }, reverseReview: { key: 'reverseReview', label: '反审回待审核', size: 'small', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleReverseReview' }, + createOrder: { key: 'createOrder', label: '建单', size: 'small', type: 'primary', plain: true, action: 'openCreateOrderDialog' }, // markPendingOutbound: { key: 'markPendingOutbound', label: '标记待出库', size: 'small', type: 'warning', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleMarkPendingOutbound' }, allocateStorage: { key: 'allocateStorage', label: '分配储位', size: 'small', type: 'primary', plain: true, loadingKey: 'storageAllocateLoading', disabledKey: 'hasNoSelection', action: 'openStorageAllocateDialog' }, cancelAllocateStorage: { key: 'cancelAllocateStorage', label: '取消分配储位', size: 'small', type: 'danger', plain: true, loadingKey: 'storageAllocateLoading', disabledKey: 'hasNoSelection', action: 'openStorageCancelDialog' }, @@ -312,11 +313,20 @@ export const ORDER_TOOLBAR_BUTTONS: Record = { action: 'handleWaveSingleFetchByIds' }, allocateExpress: { key: 'allocateExpress', label: '分配快递号', size: 'small', type: 'success', loadingKey: 'allocateLoading', disabledKey: 'hasNoSelection', action: 'openAllocateExpressDialog' }, + batchQuickRecheck: { + key: 'batchQuickRecheck', + label: '批量复核', + size: 'small', + type: 'success', + plain: true, + disabledKey: 'hasNoSelection', + action: 'openBatchQuickRecheckDialog' + }, manualWaybill: { key: 'manualWaybill', label: '录入运单号', size: 'small', type: 'primary', plain: true, loadingKey: 'manualWaybillLoading', disabledKey: 'notSingleSelection', action: 'openManualWaybillDialog' }, updateExpress: { key: 'updateExpress', label: '修改快递', size: 'small', type: 'warning', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderExpressDialog' }, updatePlatform: { key: 'updatePlatform', label: '修改平台', size: 'small', type: 'info', plain: true, loadingKey: 'updateOrderMetaLoading', disabledKey: 'hasNoSelection', action: 'openUpdateOrderPlatformDialog' }, updateAddress: { key: 'updateAddress', label: '修改地址', size: 'small', type: 'warning', plain: true, loadingKey: 'updateAddressLoading', disabledKey: 'hasNoSelection', action: 'openUpdateAddressDialog' }, - createOrder: { key: 'createOrder', label: '建单', size: 'small', type: 'primary', plain: true, action: 'openCreateOrderDialog' }, + cloneOrder: { key: 'cloneOrder', label: '克隆订单', size: 'small', type: 'warning', plain: true, loadingKey: 'cloneOrderLoading', disabledKey: 'notSingleSelection', action: 'openCloneOrderDialog' }, syncOrderIds: { key: 'syncOrderIds', label: '同步订单', size: 'small', type: 'primary', plain: true, loadingKey: 'syncOrderIdsLoading', disabledKey: 'hasNoSelection', action: 'openSyncOrderIdsDialog' }, cancelOrder: { key: 'cancelOrder', label: '取消订单', size: 'small', type: 'danger', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleCancelOrder' }, @@ -1576,6 +1586,7 @@ export const pendingOrderbuttonList: any[] = [ export const pendingToolbarButtonKeys = [ ...simpleListToolbarButtonKeys, 'reverseReview', + 'createOrder', 'markPendingOutbound', 'waveSingleFetchByIds', 'allocateStorage', @@ -1585,7 +1596,7 @@ export const pendingToolbarButtonKeys = [ 'updateExpress', 'updatePlatform', 'updateAddress', - 'createOrder', + 'batchQuickRecheck', 'cloneOrder', 'syncOrderIds', 'cancelOrder', diff --git a/src/views/order/orderManagement/form/BatchQuickRecheckForm.vue b/src/views/order/orderManagement/form/BatchQuickRecheckForm.vue new file mode 100644 index 00000000..14dd7d22 --- /dev/null +++ b/src/views/order/orderManagement/form/BatchQuickRecheckForm.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 2817d607..d7556fb6 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -264,6 +264,13 @@ @closed="resetSyncOrderIdsDialog" @submit="submitSyncOrderIds" /> + ([]) + const batchQuickRecheckSelectedRows = ref([]) + const updateAddressDialogVisible = ref(false) const updateAddressLoading = ref(false) const updateAddressOrderIds = ref([]) @@ -503,6 +507,7 @@ export function createPendingToolbarController(params: { openCreateOrderDialog: params.openCreateOrderDialog, openCloneOrderDialog, openSyncOrderIdsDialog, + openBatchQuickRecheckDialog, handleWaveSingleFetchByIds }, getSelectedIds: params.getSelectedIds, @@ -792,6 +797,37 @@ export function createPendingToolbarController(params: { syncOrderIdsDialogVisible.value = true } + function openBatchQuickRecheckDialog() { + const rows = params.getSelectedRows() + if (!rows.length) { + ElMessage.warning('请先勾选需要批量复核的订单') + return + } + const ids = params.getSelectedIds() + if (!ids.length) { + ElMessage.error('选中行缺少订单 id,请刷新后重试') + return + } + batchQuickRecheckSuggestedIds.value = [...ids] + batchQuickRecheckSelectedRows.value = rows.map((row) => ({ + id: row?.id ?? row?.order_id, + delivery_order_code: row?.delivery_order_code, + recheck_status: row?.recheck_status, + pick_status: row?.pick_status + })) + batchQuickRecheckDialogVisible.value = true + } + + async function handleBatchQuickRecheckSuccess() { + params.clearSelection() + await params.loadData() + } + + function resetBatchQuickRecheckDialog() { + batchQuickRecheckSuggestedIds.value = [] + batchQuickRecheckSelectedRows.value = [] + } + async function submitSyncOrderIds() { if (syncOrderIdsLoading.value) return const order_ids = params.getSelectedIds() @@ -1104,6 +1140,9 @@ export function createPendingToolbarController(params: { manualWaybillForm, syncOrderIdsDialogVisible, syncOrderIdsLoading, + batchQuickRecheckDialogVisible, + batchQuickRecheckSuggestedIds, + batchQuickRecheckSelectedRows, updateAddressDialogVisible, updateAddressLoading, updateAddressOrderIds, @@ -1124,12 +1163,14 @@ export function createPendingToolbarController(params: { submitAllocateExpress, submitUpdateAddress, submitBatchAsyncTask, + handleBatchQuickRecheckSuccess, resetAllocateDialog, resetStorageAllocateDialog, resetUpdateOrderMetaDialog, resetCloneOrderDialog, resetManualWaybillDialog, resetSyncOrderIdsDialog, + resetBatchQuickRecheckDialog, resetUpdateAddressDialog, resetBatchAsyncTaskDialog } diff --git a/src/views/order/orderreview/form/RecheckOrderSingleListForm.vue b/src/views/order/orderreview/form/RecheckOrderSingleListForm.vue new file mode 100644 index 00000000..3827fd55 --- /dev/null +++ b/src/views/order/orderreview/form/RecheckOrderSingleListForm.vue @@ -0,0 +1,333 @@ + + + + + diff --git a/src/views/order/orderreview/index.vue b/src/views/order/orderreview/index.vue index d76a60fd..94bf3114 100644 --- a/src/views/order/orderreview/index.vue +++ b/src/views/order/orderreview/index.vue @@ -47,6 +47,9 @@ 批量快捷复核 + + 散单复核列表 + + + @@ -210,6 +219,7 @@ import type { FormInstance, FormRules } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import RecheckOrderPanel from './component/RecheckOrderPanel.vue' import BatchQuickRecheckDialog from './component/BatchQuickRecheckDialog.vue' +import RecheckOrderSingleListForm from './form/RecheckOrderSingleListForm.vue' import * as stationApi from '@/api/print/print' import { getOrderPrintData } from '@/api/order.print/orderprint' import type { WavePlatformPrintDataPayload } from '@/api/order.print/orderprint' @@ -222,6 +232,10 @@ import { scanTask, confirmRecheck, confirmIntercept, + unwrapScanOrderResponse, + normalizeScanOrderPanelRow, + normalizeScanOrderGroupWaveRow, + isOrderRecheckFinished, type ConfirmRecheckResultShape, type RecheckScanOrderParams, type ScanOrderResultShape @@ -235,6 +249,8 @@ const SCAN_PARAM_KEYS: (keyof RecheckScanOrderParams)[] = [ 'waybill_no', 'waybillCode', 'waybill_code', + 'wave_no', + 'waveNo', 'cart_code', 'cartCode' ] @@ -439,8 +455,19 @@ const panelScanMode = ref<'search' | 'recheck'>('search') const panelTaskId = ref(undefined) const refreshTaskLoading = ref(false) const batchRecheckDialogVisible = ref(false) +const singleListDialogVisible = ref(false) const lastScanParams = ref(null) +function handleSingleListLoadRecheck(payload: { keyword: string }) { + void executeScan({ keyword: payload.keyword }) +} + +function handleSingleListBatchRecheckSuccess() { + if (lastScanParams.value) { + void executeScan(lastScanParams.value) + } +} + function handlePanelSearch(keyword: string) { void executeScan({ keyword }) } @@ -777,11 +804,7 @@ async function handleScanSubmit(condition?: unknown) { } function unwrapResponse(res: unknown): ScanOrderResultShape { - if (!res || typeof res !== 'object') return {} - const r = res as Record - const d = r.data - if (d && typeof d === 'object' && !Array.isArray(d)) return d as ScanOrderResultShape - return r as ScanOrderResultShape + return unwrapScanOrderResponse(res) } function asRecord(v: unknown): Record | null { @@ -941,104 +964,69 @@ function resolveTopOrderId(p: ScanOrderResultShape | null): number | undefined { /** 从 scanOrder 响应提取 RecheckOrderPanel 所需数据 */ function updatePanelFromPayload(payload: ScanOrderResultShape) { - // 存储 task_id,供刷新任务数据使用 - const tid = (payload as any)?.task_id - panelTaskId.value = tid != null && tid !== '' ? tid : undefined + const tid = payload.task_id + panelTaskId.value = tid != null ? tid : undefined - const rawList = asArray((payload as any).list) - const listType = String((payload as any)?.list_type ?? '').trim() + const rawList = asArray(payload.list) + const listType = String(payload.list_type ?? '').trim() - // 团购模式:list_type === 'group',列表项为波次(含聚合 stocks) if (rawList.length && listType === 'group') { - const waves = rawList.map((w: any) => ({ - ...w, - _is_wave: true, - waybill_no: String(w.wave_no ?? '').trim(), - id: w.wave_id, - order_id: w.wave_id, - stock: Array.isArray(w.stocks) ? w.stocks.map((s: any) => ({ - ...s, - item_name: s.item_name || s.name || '', - barcode: s.barcodes?.[0] || s.item_code || '', - barcodes: Array.isArray(s.barcodes) ? s.barcodes : (s.barcode ? [s.barcode] : []), - plan_qty: s.plan_qty, - images: Array.isArray(s.images) ? s.images : [], - has_shared_barcode: !!s.has_shared_barcode - })) : [], - // 使用 wave 下的订单属性 - recheck_status: String(w.recheck_status ?? (w.processed_orders >= w.total_orders ? 'fin' : '')).trim(), - is_reviewed: w.is_reviewed ?? (w.processed_orders >= w.total_orders && w.total_orders > 0) - })) + const waves = rawList.map((w) => normalizeScanOrderGroupWaveRow(w)) panelOrders.value = waves - panelTotalCount.value = (payload as any).total_orders ?? waves.reduce((sum, w) => sum + (Number(w.order_count) || 0), 0) - panelRemainingCount.value = (payload as any).unreviewed_count ?? waves.filter((w: any) => { - const status = String(w.recheck_status ?? w.is_reviewed ?? '').trim() - return status !== 'fin' && status !== 'true' - }).length + panelTotalCount.value = + payload.total_orders ?? waves.reduce((sum, w) => sum + (Number(w.order_count) || 0), 0) + panelRemainingCount.value = + payload.unreviewed_count ?? + waves.filter((w) => !isOrderRecheckFinished(w)).length panelActiveWaybill.value = '' return } - // 散单/波次命中:响应顶层有 list、total_orders、unreviewed_count if (rawList.length) { - const orders = rawList.map((o: any) => ({ - ...o, - waybill_no: String(o.waybill_no ?? o.waybillCode ?? o.waybill_code ?? '').trim() - })) + const orders = rawList.map((o) => normalizeScanOrderPanelRow(o)) panelOrders.value = orders - panelTotalCount.value = (payload as any).total_orders ?? orders.length - panelRemainingCount.value = (payload as any).unreviewed_count ?? orders.filter((o: any) => { - const status = String(o.recheck_status ?? o.is_reviewed ?? '').trim() - return status !== 'fin' && status !== 'true' - }).length + panelTotalCount.value = payload.total_orders ?? orders.length + panelRemainingCount.value = + payload.unreviewed_count ?? orders.filter((o) => !isOrderRecheckFinished(o)).length panelActiveWaybill.value = '' return } if (payload.match_type === 'cart') { - // 车号命中:从 cart_match_view 提取订单列表 - const orders = cartSelectableOrders.value - panelOrders.value = orders.map((o: any) => ({ - ...o, - waybill_no: String(o.waybill_no ?? o.waybillCode ?? o.waybill_code ?? '').trim() - })) - // 统计:总订单数 和 剩余未复核数(recheck_status !== 'fin') - const total = orders.length - const remaining = orders.filter((o: any) => { - const status = String(o.recheck_status ?? '').trim() - return status !== 'fin' - }).length - panelTotalCount.value = total - panelRemainingCount.value = remaining - // 如果只剩一个未复核订单,自动选中 - if (remaining === 1) { - const unreviewed = orders.find((o: any) => { - const status = String(o.recheck_status ?? '').trim() - return status !== 'fin' - }) + const orders = cartSelectableOrders.value.map((o) => normalizeScanOrderPanelRow(o)) + panelOrders.value = orders + panelTotalCount.value = orders.length + panelRemainingCount.value = orders.filter((o) => !isOrderRecheckFinished(o)).length + if (panelRemainingCount.value === 1) { + const unreviewed = orders.find((o) => !isOrderRecheckFinished(o)) if (unreviewed) { panelActiveWaybill.value = String(unreviewed.waybill_no ?? '').trim() } } - } else if (payload.match_type === 'waybill') { - // 运单命中:只包含一个订单 - const order = asRecord(payload.order) || {} - const waybill = String(payload.waybill_no || order.waybill_no || '').trim() - panelOrders.value = [{ - ...order, - waybill_no: waybill, - waybillCode: waybill, - waybill_code: waybill - }] - panelTotalCount.value = 1 - panelRemainingCount.value = 1 - panelActiveWaybill.value = waybill - } else { - panelOrders.value = [] - panelTotalCount.value = 0 - panelRemainingCount.value = 0 - panelActiveWaybill.value = '' + return } + + if (payload.match_type === 'waybill') { + const order = normalizeScanOrderPanelRow(asRecord(payload.order) || {}) + const waybill = String(payload.waybill_no || order.waybill_no || '').trim() + panelOrders.value = [ + { + ...order, + waybill_no: waybill, + waybillCode: waybill, + waybill_code: waybill + } + ] + panelTotalCount.value = 1 + panelRemainingCount.value = isOrderRecheckFinished(order) ? 0 : 1 + panelActiveWaybill.value = waybill + return + } + + panelOrders.value = [] + panelTotalCount.value = 0 + panelRemainingCount.value = 0 + panelActiveWaybill.value = '' } const activeOrderId = computed(() => selectedOrderId.value ?? resolveTopOrderId(scanPayload.value)) @@ -1051,7 +1039,9 @@ const displayOrder = computed(() => { const matchTypeLabel = computed(() => { const t = scanPayload.value?.match_type if (t === 'waybill') return '运单命中' + if (t === 'wave') return '波次命中' if (t === 'cart') return '车号命中' + if (t === 'task') return '任务命中' if (t != null && String(t) !== '') return String(t) return '' }) @@ -1060,6 +1050,7 @@ const matchTypeTagType = computed(() => { const t = scanPayload.value?.match_type if (t === 'cart') return 'warning' if (t === 'waybill') return 'success' + if (t === 'wave') return 'primary' return 'info' }) @@ -1334,12 +1325,10 @@ function normalizeItemRow(raw: unknown): { scanned_qty: number; plan_qty: string } const itemsRows = computed(() => { - // 优先取选中行的 stock(散单/波次),其次 scanPayload.items - const selectedOrder = selectedOrderRow.value - let stockRaw = (selectedOrder as any)?.stock - // 兼容团购波次:原始数据用 stocks(复数) + const selectedOrder = selectedOrderRow.value as Record | null + let stockRaw = selectedOrder?.stock if (!Array.isArray(stockRaw) || !stockRaw.length) { - stockRaw = (selectedOrder as any)?.stocks + stockRaw = selectedOrder?.stocks } if (Array.isArray(stockRaw) && stockRaw.length) { return stockRaw.map((item: any) => ({ @@ -1354,9 +1343,14 @@ const itemsRows = computed(() => { images: Array.isArray(item.images) ? item.images.filter(Boolean) : [] })) } - const items = scanPayload.value?.items - if (!Array.isArray(items)) return [] - return items.map(normalizeItemRow) + + const detailItems = selectedOrder?.items + const payloadItems = scanPayload.value?.items + const items = Array.isArray(detailItems) ? detailItems : Array.isArray(payloadItems) ? payloadItems : null + if (Array.isArray(items)) { + return items.map(normalizeItemRow) + } + return [] }) const scannedCount = computed(() => { @@ -1438,7 +1432,8 @@ function itemsRowClassName({ row }: { row: any }) { } const expressRows = computed(() => { - const ex = scanPayload.value?.expresses + const selectedOrder = selectedOrderRow.value as Record | null + const ex = selectedOrder?.expresses ?? scanPayload.value?.expresses if (!Array.isArray(ex)) return [] return ex.filter((x) => x && typeof x === 'object' && !Array.isArray(x)) as Record[] }) @@ -1465,7 +1460,8 @@ function normalizeLogRow(raw: unknown): { time: string; operator: string; action } const logRows = computed(() => { - const logs = scanPayload.value?.logs + const selectedOrder = selectedOrderRow.value as Record | null + const logs = selectedOrder?.logs ?? scanPayload.value?.logs if (!Array.isArray(logs)) return [] return logs.map(normalizeLogRow) }) diff --git a/src/views/order/orderreview/recheck-config.ts b/src/views/order/orderreview/recheck-config.ts index 2e9f96c4..d1190a81 100644 --- a/src/views/order/orderreview/recheck-config.ts +++ b/src/views/order/orderreview/recheck-config.ts @@ -1,3 +1,76 @@ +import type { RecheckOrderSingleListItem } from '@/api/order.recheckorder/recheckOrder' +import { + pickStatusFilterOptions, + recheckStatusFilterOptions, + translateOrderField, + getTagType +} from '@/views/order/orderManagement/config/order-common-config' + +/** order.recheckOrder.queryRecheckOrderSingleList 列表列定义 */ +export const recheckOrderSingleListColumns = [ + { prop: 'order_id', label: '订单 ID', width: '90' }, + { prop: 'delivery_order_code', label: '发货单号', minWidth: '150', showOverflowTooltip: true }, + { prop: 'wave_no', label: '波次号', minWidth: '120', showOverflowTooltip: true }, + { prop: 'shop_nick', label: '店铺', minWidth: '110', showOverflowTooltip: true }, + { prop: 'logistics_name', label: '快递', minWidth: '100', showOverflowTooltip: true }, + { prop: 'pick_status', label: '拣货状态', width: '96' }, + { prop: 'recheck_status', label: '复核状态', width: '96' }, + { prop: 'items_count', label: 'SKU数', width: '72', align: 'right' }, + { prop: 'items_total', label: '件数', width: '72', align: 'right' }, + { prop: 'items_weight', label: '重量', width: '80', align: 'right' }, + { prop: 'pick_time', label: '拣货时间', width: '150' }, + { prop: 'recheck_time', label: '复核时间', width: '150' } +] + +export { pickStatusFilterOptions, recheckStatusFilterOptions } + +export function isRecheckOrderApiSuccess(res: unknown) { + const r = res as { code?: number; flag?: string } | null | undefined + return Boolean(r && (r.code === 1 || r.code === 200 || r.flag === 'success')) +} + +export function parseRecheckOrderSingleListResponse(res: unknown): { + list: RecheckOrderSingleListItem[] + pagination: { + page: number + pageSize: number + total: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean + } +} { + const root = (res as any)?.data ?? res + const list = Array.isArray(root?.list) + ? root.list + : Array.isArray(root) + ? root + : [] + const pg = root?.pagination && typeof root.pagination === 'object' ? root.pagination : {} + const page = Number(pg.page ?? root?.page ?? 1) + const pageSize = Number(pg.pageSize ?? root?.pageSize ?? 20) + const total = Number(pg.total ?? root?.total ?? list.length) + return { + list: list as RecheckOrderSingleListItem[], + pagination: { + page: Number.isFinite(page) && page > 0 ? page : 1, + pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : 20, + total: Number.isFinite(total) ? total : list.length, + totalPages: Number.isFinite(Number(pg.totalPages)) ? Number(pg.totalPages) : undefined, + hasPrevious: pg.hasPrevious, + hasNext: pg.hasNext + } + } +} + +export function translateRecheckListField(field: string, value: unknown) { + return translateOrderField(field, value) +} + +export function getRecheckListTagType(field: string, value: unknown) { + return getTagType(field, value) +} + /** 订单复核 ScanBox 筛选字段(对应 order.recheckOrder.scanOrder 入参别名) */ export const recheckAvailableFields = [ { @@ -16,6 +89,14 @@ export const recheckAvailableFields = [ operators: ['eq'], defaultOperator: 'eq' }, + { + value: 'wave_no', + label: '波次号', + type: 'text', + placeholder: '请输入波次号', + operators: ['eq'], + defaultOperator: 'eq' + }, { value: 'cart_code', label: '车号', diff --git a/src/views/order/waveOrder/FallbackOrderListPanel.vue b/src/views/order/waveOrder/FallbackOrderListPanel.vue index 7dc50175..93b232d3 100644 --- a/src/views/order/waveOrder/FallbackOrderListPanel.vue +++ b/src/views/order/waveOrder/FallbackOrderListPanel.vue @@ -15,36 +15,15 @@
-
-
- 查询 - 重置 - 字段设置 - - 快速扫描 - - - 按订单IDs抓取删单 - -
+
+
已选 {{ selectionRows.length }} 个订单 @@ -126,10 +105,13 @@ import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' +import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' +import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' import { waveScanBoxConfig, fallbackOrderAvailableFields, - fallbackOrderColumns + fallbackOrderColumns, + fallbackOrderToolbarButtons } from './config/wave-config' import { safeInvoke } from '@/utils/safe-invoke' import WaveStrategyQuickScanProgressDialog from './component/WaveStrategyQuickScanProgressDialog.vue' @@ -156,7 +138,6 @@ const props = withDefaults(defineProps<{ const scanBox = ref(null) const upperTable = ref(null) -const scrollContainerRef = ref(null) const fallbackOrderListLoading = ref(false) const singleOrderSubmitting = ref(false) const waveStrategyQuickScanSubmitting = ref(false) @@ -203,34 +184,57 @@ const upperPaneFullStyle = computed(() => ({ overflow: 'hidden' as const })) -const isDragging = ref(false) -const startX = ref(0) -const scrollLeft = ref(0) +const toolbarButtons = fallbackOrderToolbarButtons -const handleToolbarWheel = (e: WheelEvent) => { - if (scrollContainerRef.value) { - e.preventDefault() - scrollContainerRef.value.scrollLeft += e.deltaY +const buttonLoadingMap = computed(() => ({ + loading: fallbackOrderListLoading.value, + waveStrategyQuickScanSubmitting: waveStrategyQuickScanSubmitting.value, + singleOrderSubmitting: singleOrderSubmitting.value +})) + +const buttonDisabledMap = computed(() => ({ + noSelection: selectionRows.value.length === 0 +})) + +const toolbarLayoutKey = computed(() => + JSON.stringify({ + loading: buttonLoadingMap.value, + disabled: buttonDisabledMap.value + }) +) + +function resolveButtonLoading(loadingKey?: string) { + if (!loadingKey) return false + return Boolean((buttonLoadingMap.value as Record)[loadingKey]) +} + +function resolveButtonDisabled(disabledKey?: string) { + if (!disabledKey) return false + return Boolean((buttonDisabledMap.value as Record)[disabledKey]) +} + +function resolveButtonLabel(defaultLabel: string) { + return defaultLabel +} + +const toolbarActionMap: Record void> = { + loadData: () => { + void loadData() + }, + resetFallbackOrderCondition: () => resetFallbackOrderCondition(), + openColumnConfigPanel: () => openColumnConfigPanel(), + submitWaveStrategyQuickScan: () => { + void submitWaveStrategyQuickScan() + }, + submitFallbackOrderFetchByIds: () => { + void submitFallbackOrderFetchByIds() } } -const handleMouseDown = (e: MouseEvent) => { - if (!scrollContainerRef.value) return - isDragging.value = true - startX.value = e.pageX - scrollContainerRef.value.offsetLeft - scrollLeft.value = scrollContainerRef.value.scrollLeft -} - -const handleMouseMove = (e: MouseEvent) => { - if (!isDragging.value || !scrollContainerRef.value) return - e.preventDefault() - const x = e.pageX - scrollContainerRef.value.offsetLeft - const walk = (x - startX.value) * 1.5 - scrollContainerRef.value.scrollLeft = scrollLeft.value - walk -} - -const handleMouseUp = () => { - isDragging.value = false +function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { + const handler = toolbarActionMap[action] + if (!handler) return + safeInvoke(() => handler()) } const okCode = (code: unknown) => code === 1 || code === 200 || code === 0 @@ -722,26 +726,6 @@ onBeforeUnmount(() => { color: var(--el-text-color-regular); white-space: nowrap; } - - .toolbar-left { - cursor: grab; - - &:active { - cursor: grabbing; - } - - .toolbar-scroll-container { - display: flex; - align-items: center; - gap: 6px; - overflow-x: auto; - scrollbar-width: none; - - &::-webkit-scrollbar { - display: none; - } - } - } } } diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index cad2ed42..1516eb35 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -15,28 +15,15 @@
-
-
- - {{ resolveButtonLabel(button.label, button.dynamicLabelKey) }} - -
+
+
仅待复核波次 @@ -838,7 +825,7 @@ (null) const upperTable = ref(null) const groupOrderTableRef = ref(null) -const scrollContainerRef = ref(null) const loading = ref(false) const showInternalSourceWaves = ref(false) const onlyTodoWaves = ref(false) @@ -1180,36 +1167,6 @@ function toggleDetailVisible() { detailVisible.value = !detailVisible.value } -const isDragging = ref(false) -const startX = ref(0) -const scrollLeft = ref(0) - -const handleToolbarWheel = (e: WheelEvent) => { - if (scrollContainerRef.value) { - e.preventDefault() - scrollContainerRef.value.scrollLeft += e.deltaY - } -} - -const handleMouseDown = (e: MouseEvent) => { - if (!scrollContainerRef.value) return - isDragging.value = true - startX.value = e.pageX - scrollContainerRef.value.offsetLeft - scrollLeft.value = scrollContainerRef.value.scrollLeft -} - -const handleMouseMove = (e: MouseEvent) => { - if (!isDragging.value || !scrollContainerRef.value) return - e.preventDefault() - const x = e.pageX - scrollContainerRef.value.offsetLeft - const walk = (x - startX.value) * 1.5 - scrollContainerRef.value.scrollLeft = scrollLeft.value - walk -} - -const handleMouseUp = () => { - isDragging.value = false -} - const buttonLoadingMap = computed(() => ({ loading: loading.value, batchAutoGroupingLoading: batchAutoGroupingLoading.value, @@ -1241,6 +1198,14 @@ const buttonLabelMap = computed(() => ({ detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情' })) +const toolbarLayoutKey = computed(() => + JSON.stringify({ + loading: buttonLoadingMap.value, + disabled: buttonDisabledMap.value, + labels: buttonLabelMap.value + }) +) + function resolveButtonLoading(loadingKey?: string) { if (!loadingKey) return false return Boolean((buttonLoadingMap.value as Record)[loadingKey]) @@ -3893,26 +3858,6 @@ async function submitFallbackOrderFetchByIds() { color: var(--el-text-color-regular); white-space: nowrap; } - - .toolbar-left { - cursor: grab; - - &:active { - cursor: grabbing; - } - - .toolbar-scroll-container { - display: flex; - align-items: center; - gap: 6px; - overflow-x: auto; - scrollbar-width: none; - - &::-webkit-scrollbar { - display: none; - } - } - } } } \ No newline at end of file diff --git a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue index 335c7d73..5c9beca6 100644 --- a/src/views/order/waveOrder/SandanWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/SandanWaveBatchListPanel.vue @@ -15,28 +15,15 @@
-
-
- - {{ resolveButtonLabel(button.label, button.dynamicLabelKey) }} - -
+
+
仅待复核波次 @@ -424,8 +411,8 @@ (null) const upperTable = ref(null) const groupOrderTableRef = ref(null) -const scrollContainerRef = ref(null) const loading = ref(false) const showInternalSourceWaves = ref(false) const onlyTodoWaves = ref(false) @@ -681,36 +668,6 @@ function toggleDetailVisible() { detailVisible.value = !detailVisible.value } -const isDragging = ref(false) -const startX = ref(0) -const scrollLeft = ref(0) - -const handleToolbarWheel = (e: WheelEvent) => { - if (scrollContainerRef.value) { - e.preventDefault() - scrollContainerRef.value.scrollLeft += e.deltaY - } -} - -const handleMouseDown = (e: MouseEvent) => { - if (!scrollContainerRef.value) return - isDragging.value = true - startX.value = e.pageX - scrollContainerRef.value.offsetLeft - scrollLeft.value = scrollContainerRef.value.scrollLeft -} - -const handleMouseMove = (e: MouseEvent) => { - if (!isDragging.value || !scrollContainerRef.value) return - e.preventDefault() - const x = e.pageX - scrollContainerRef.value.offsetLeft - const walk = (x - startX.value) * 1.5 - scrollContainerRef.value.scrollLeft = scrollLeft.value - walk -} - -const handleMouseUp = () => { - isDragging.value = false -} - const buttonLoadingMap = computed(() => ({ loading: loading.value, batchAutoGroupingLoading: batchAutoGroupingLoading.value, @@ -735,11 +692,19 @@ const buttonDisabledMap = computed(() => ({ const buttonLabelMap = computed(() => ({ batchPrintTotal: `批量打印(${selectedWaveOrderTotal.value})`, - batchOutboundPrintTotal: `批量打印出库单(${selectedWaveOrderTotal.value})`, + batchOutboundPrintTotal: `打印货单(${printableSelectionRows.value.length})`, batchPlatformPrintTotal: `批量打印(平台)(${selectedWaveOrderTotal.value})`, detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情' })) +const toolbarLayoutKey = computed(() => + JSON.stringify({ + loading: buttonLoadingMap.value, + disabled: buttonDisabledMap.value, + labels: buttonLabelMap.value + }) +) + function resolveButtonLoading(loadingKey?: string) { if (!loadingKey) return false return Boolean((buttonLoadingMap.value as Record)[loadingKey]) @@ -2612,26 +2577,6 @@ async function submitGroupOrderDialog() { color: var(--el-text-color-regular); white-space: nowrap; } - - .toolbar-left { - cursor: grab; - - &:active { - cursor: grabbing; - } - - .toolbar-scroll-container { - display: flex; - align-items: center; - gap: 6px; - overflow-x: auto; - scrollbar-width: none; - - &::-webkit-scrollbar { - display: none; - } - } - } } } \ No newline at end of file diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue index 9bcfaef0..4bfdaa67 100644 --- a/src/views/order/waveOrder/WavePickTaskListPanel.vue +++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue @@ -15,28 +15,15 @@
-
-
- - {{ resolvePickToolbarLabel(btn) }} - -
+
+
{{ pickTaskWaveListDefaults.toolbarHint }} @@ -307,6 +294,9 @@ import { computed, onMounted, reactive, ref, watch } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' +import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' +import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' +import { safeInvoke } from '@/utils/safe-invoke' import { useUserStore } from '@/stores/modules/user' import { orderWaveWavePickTaskCancel, @@ -330,9 +320,7 @@ import { formatPickTaskSource, getPickTaskStatusTagType, getPickTaskReviewStatusTagType, - getPickTaskSourceTagType, - type PickTaskWaveToolbarButton, - type PickTaskWaveToolbarKey + getPickTaskSourceTagType } from './config/wave-config' const props = withDefaults( @@ -352,11 +340,7 @@ const emptyText = ref(pickTaskWaveListDefaults.emptyText) const scanBox = ref(null) const presetTree = ref([]) const splitStackRef = ref(null) -const scrollContainerRef = ref(null) const queryTime = ref(0) -const isDragging = ref(false) -const startX = ref(0) -const scrollLeft = ref(0) const cancelingTaskId = ref(null) const batchCancelLoading = ref(false) const selectedTaskRows = ref>>([]) @@ -449,30 +433,56 @@ const taskDetailViewJson = computed(() => { const okCode = (code: unknown) => code === 1 || code === 200 || code === 0 -const handleToolbarWheel = (e: WheelEvent) => { - if (scrollContainerRef.value) { - e.preventDefault() - scrollContainerRef.value.scrollLeft += e.deltaY +const buttonLoadingMap = computed(() => ({ + batchCancelLoading: batchCancelLoading.value +})) + +const buttonDisabledMap = computed(() => ({ + noSelection: selectedTaskRows.value.length === 0 +})) + +const buttonLabelMap = computed(() => ({ + batchCancelTotal: `批量取消任务(${selectedTaskRows.value.length})` +})) + +const toolbarLayoutKey = computed(() => + JSON.stringify({ + loading: buttonLoadingMap.value, + disabled: buttonDisabledMap.value, + labels: buttonLabelMap.value + }) +) + +function resolveButtonLoading(loadingKey?: string) { + if (!loadingKey) return false + return Boolean((buttonLoadingMap.value as Record)[loadingKey]) +} + +function resolveButtonDisabled(disabledKey?: string) { + if (!disabledKey) return false + return Boolean((buttonDisabledMap.value as Record)[disabledKey]) +} + +function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) { + if (!dynamicLabelKey) return defaultLabel + return (buttonLabelMap.value as Record)[dynamicLabelKey] || defaultLabel +} + +const toolbarActionMap: Record void> = { + loadData: () => { + void loadData() + }, + handleSearch: () => handleSearch(), + openDetailQueryDialog: () => openDetailQueryDialog(), + handleBatchCancelTasks: () => { + void handleBatchCancelTasks() } } -const handleMouseDown = (e: MouseEvent) => { - if (!scrollContainerRef.value) return - isDragging.value = true - startX.value = e.pageX - scrollContainerRef.value.offsetLeft - scrollLeft.value = scrollContainerRef.value.scrollLeft -} - -const handleMouseMove = (e: MouseEvent) => { - if (!isDragging.value || !scrollContainerRef.value) return - e.preventDefault() - const x = e.pageX - scrollContainerRef.value.offsetLeft - const walk = (x - startX.value) * 1.5 - scrollContainerRef.value.scrollLeft = scrollLeft.value - walk -} - -const handleMouseUp = () => { - isDragging.value = false +function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { + const handler = toolbarActionMap[action] + if (!handler) return + safeInvoke(() => handler()) } /** @@ -572,42 +582,6 @@ function toIdFilterValue(value: unknown): number | string | undefined { return numeric !== undefined ? numeric : text } -function resolvePickToolbarDisabled(btn: PickTaskWaveToolbarButton): boolean { - if (btn.key === 'batchCancel') return selectedTaskRows.value.length === 0 - return false -} - -function resolvePickToolbarLoading(btn: PickTaskWaveToolbarButton): boolean { - if (btn.key === 'batchCancel') return batchCancelLoading.value - return false -} - -function resolvePickToolbarLabel(btn: PickTaskWaveToolbarButton): string { - if (btn.key === 'batchCancel') { - return `${btn.label}(${selectedTaskRows.value.length})` - } - return btn.label -} - -function handlePickToolbarClick(key: PickTaskWaveToolbarKey) { - switch (key) { - case 'search': - handleSearch() - break - case 'detailQuery': - openDetailQueryDialog() - break - case 'batchCancel': - void handleBatchCancelTasks() - break - case 'refresh': - void loadData() - break - default: - break - } -} - function toNumber(value: unknown, fallback = 0): number { const num = Number(value) return Number.isFinite(num) ? num : fallback @@ -1048,26 +1022,6 @@ onMounted(() => { color: var(--el-text-color-regular); white-space: nowrap; } - - .toolbar-left { - cursor: grab; - - &:active { - cursor: grabbing; - } - - .toolbar-scroll-container { - display: flex; - align-items: center; - gap: 6px; - overflow-x: auto; - scrollbar-width: none; - - &::-webkit-scrollbar { - display: none; - } - } - } } } diff --git a/src/views/order/waveOrder/WaveStrategyListPanel.vue b/src/views/order/waveOrder/WaveStrategyListPanel.vue index 4760d29a..a8175310 100644 --- a/src/views/order/waveOrder/WaveStrategyListPanel.vue +++ b/src/views/order/waveOrder/WaveStrategyListPanel.vue @@ -15,28 +15,24 @@
-
-
- 刷新 - 字段设置 - 新建策略 - -
+
+
+ 当前仓库波次策略(wms_wave_strategy)
@@ -340,12 +336,15 @@ import { computed, onMounted, reactive, ref, watch } from 'vue' import { ElMessage } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' +import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' +import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' import { waveScanBoxConfig, waveStrategyAvailableFields, waveStrategyColumns, waveStrategyFormRules, - waveBooleanOptions + waveBooleanOptions, + waveStrategyToolbarButtons } from './config/wave-config' import { safeInvoke } from '@/utils/safe-invoke' import * as indexApi from '@/api/index/index' @@ -374,7 +373,6 @@ const props = withDefaults(defineProps<{ const scanBox = ref(null) const upperTable = ref(null) -const scrollContainerRef = ref(null) const loading = ref(false) const queryTime = ref(0) const tableSize = ref('small') @@ -438,34 +436,43 @@ const filteredColumns = computed(() => { return list.value.filter((row: any) => matchWaveStrategy(row, where)) }) -const isDragging = ref(false) -const startX = ref(0) -const scrollLeft = ref(0) +const toolbarButtons = waveStrategyToolbarButtons -const handleToolbarWheel = (e: WheelEvent) => { - if (scrollContainerRef.value) { - e.preventDefault() - scrollContainerRef.value.scrollLeft += e.deltaY - } +const buttonLoadingMap = computed(() => ({ + loading: loading.value +})) + +const toolbarLayoutKey = computed(() => + JSON.stringify({ + loading: buttonLoadingMap.value + }) +) + +function resolveButtonLoading(loadingKey?: string) { + if (!loadingKey) return false + return Boolean((buttonLoadingMap.value as Record)[loadingKey]) } -const handleMouseDown = (e: MouseEvent) => { - if (!scrollContainerRef.value) return - isDragging.value = true - startX.value = e.pageX - scrollContainerRef.value.offsetLeft - scrollLeft.value = scrollContainerRef.value.scrollLeft +function resolveButtonDisabled() { + return false } -const handleMouseMove = (e: MouseEvent) => { - if (!isDragging.value || !scrollContainerRef.value) return - e.preventDefault() - const x = e.pageX - scrollContainerRef.value.offsetLeft - const walk = (x - startX.value) * 1.5 - scrollContainerRef.value.scrollLeft = scrollLeft.value - walk +function resolveButtonLabel(defaultLabel: string) { + return defaultLabel } -const handleMouseUp = () => { - isDragging.value = false +const toolbarActionMap: Record void> = { + loadData: () => { + void loadData() + }, + openColumnConfigPanel: () => openColumnConfigPanel(), + openCreateWaveStrategyDialog: () => openCreateWaveStrategyDialog() +} + +function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { + const handler = toolbarActionMap[action] + if (!handler) return + safeInvoke(() => handler()) } const okCode = (code: unknown) => code === 1 || code === 200 || code === 0 @@ -1092,26 +1099,6 @@ onMounted(() => { color: var(--el-text-color-regular); white-space: nowrap; } - - .toolbar-left { - cursor: grab; - - &:active { - cursor: grabbing; - } - - .toolbar-scroll-container { - display: flex; - align-items: center; - gap: 6px; - overflow-x: auto; - scrollbar-width: none; - - &::-webkit-scrollbar { - display: none; - } - } - } } } diff --git a/src/views/order/waveOrder/component/PendingOrderListPanel.vue b/src/views/order/waveOrder/component/PendingOrderListPanel.vue index 0fba316e..f4843ef7 100644 --- a/src/views/order/waveOrder/component/PendingOrderListPanel.vue +++ b/src/views/order/waveOrder/component/PendingOrderListPanel.vue @@ -27,18 +27,14 @@ > 移出波次 - - {{ button.label }} - +
@@ -161,6 +157,7 @@ import * as indexApi from '@/api/index/index' import AllocateExpressForm from '@/views/order/orderManagement/form/AllocateExpressForm.vue' import StorageAllocateForm from '@/views/order/orderManagement/form/StorageAllocateForm.vue' import SyncOrderIdsForm from '@/views/order/orderManagement/form/SyncOrderIdsForm.vue' +import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' import { createPendingToolbarController } from '@/views/order/orderManagement/utils/toolbar-actions' import { buildOrderWhereConditions, sanitizeOrderListWhere } from '@/views/order/orderManagement/utils/order-index-helpers' import { @@ -394,6 +391,22 @@ function resolveButtonDisabled(disabledKey?: string) { return Boolean(disabledMap[disabledKey]) } +function resolveButtonLabel(defaultLabel: string) { + return defaultLabel +} + +const toolbarLayoutKey = computed(() => + JSON.stringify({ + disabled: { hasNoSelection: !hasSelection.value }, + loading: { + actionLoading: actionLoading.value, + storageAllocateLoading: storageAllocateLoading.value, + allocateLoading: allocateLoading.value, + syncOrderIdsLoading: syncOrderIdsLoading.value + } + }) +) + function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { const handler = actionMap[action] if (!handler) return @@ -572,10 +585,12 @@ async function loadStoreOptions() { } .pending-order-panel__toolbar-left { + flex: 1; + min-width: 0; display: flex; - flex-wrap: wrap; align-items: center; gap: 8px; + overflow: hidden; } .pending-order-panel__toolbar-right { diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 1fdf566a..f1453a6c 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -59,22 +59,22 @@ export const waveAvailableFields = [ }, {label:'库位分配', value: 'storage_assignment_status', type: 'select', options: [ { label: '未分配', value: '未分配' }, - { label: '部分分配', value: '部分分配' }, + // { label: '部分分配', value: '部分分配' }, { label: '已分配', value: '已分配' }, ]}, { label:'快递分配', value: 'express_assignment_status', type: 'select', options: [ { label: '未分配', value: 'unassigned' }, - { label: '部分分配', value: 'partially_assigned' }, + // { label: '部分分配', value: 'partially_assigned' }, { label: '已分配', value: 'assigned' }, ]}, { label:'打印状态', value: 'print_assignment_status', type: 'select', options: [ { label: '未打印', value: 'unprinted' }, - { label: '部分打印', value: 'partially_printed' }, + // { label: '部分打印', value: 'partially_printed' }, { label: '已打印', value: 'printed' }, ]}, { label: '复核状态', value: 'review_assignment_status', type: 'select', options: [ { label: '未复核', value: 'unreviewed' }, - { label: '部分复核', value: 'partially_reviewed' }, + // { label: '部分复核', value: 'partially_reviewed' }, { label: '已复核', value: 'reviewed' }, ]}, { label: '创建人', value: 'creator', type: 'text' }, @@ -327,6 +327,17 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [ action: 'handleBatchPrint', onlyForWaveType: 1 }, + { + key: 'batchOutboundPrint', + label: '打印货单(0)', + dynamicLabelKey: 'batchOutboundPrintTotal', + type: 'info', + size: 'small', + disabledKey: 'batchOutboundPrintDisabled', + loadingKey: 'batchOutboundPrintLoading', + action: 'handleBatchOutboundPrint', + onlyForWaveType: 2 + }, { key: 'batchPlatformPrint', label: '批量打印(平台)(0)', @@ -338,17 +349,6 @@ export const waveToolbarButtons: WaveToolbarButtonConfig[] = [ loadingKey: 'batchPlatformPrintLoading', action: 'handleBatchPlatformPrint' }, - { - key: 'batchOutboundPrint', - label: '批量打印出库单(0)', - dynamicLabelKey: 'batchOutboundPrintTotal', - type: 'info', - plain: true, - size: 'small', - disabledKey: 'batchOutboundPrintDisabled', - loadingKey: 'batchOutboundPrintLoading', - action: 'handleBatchOutboundPrint' - }, { key: 'printerComponentConnection', label: '打印组件连接', @@ -701,23 +701,52 @@ export const pickTaskWaveDetailDialogDefaults = { width: '920px' } -export type PickTaskWaveToolbarKey = 'search' | 'detailQuery' | 'batchCancel' | 'refresh' +/** 拣货任务页工具栏按钮(action 与 WavePickTaskListPanel 内 toolbarActionMap 键一致) */ +export const pickTaskWaveToolbarButtons: ToolbarButtonConfig[] = [ + { key: 'refresh', label: '刷新', size: 'small', action: 'loadData' }, + { key: 'search', label: '查询', type: 'primary', size: 'small', action: 'handleSearch' }, + { key: 'detailQuery', label: '按任务ID查详情', size: 'small', action: 'openDetailQueryDialog' }, + { + key: 'batchCancel', + label: '批量取消任务', + dynamicLabelKey: 'batchCancelTotal', + type: 'danger', + size: 'small', + loadingKey: 'batchCancelLoading', + disabledKey: 'noSelection', + action: 'handleBatchCancelTasks' + } +] -export type PickTaskWaveToolbarButton = { - key: PickTaskWaveToolbarKey - label: string - type?: 'primary' | 'success' | 'warning' | 'danger' | 'info' | '' - plain?: boolean - size?: 'small' | 'default' | 'large' -} +/** 不符合波次策略订单页工具栏按钮 */ +export const fallbackOrderToolbarButtons: ToolbarButtonConfig[] = [ + { key: 'search', label: '查询', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' }, + { key: 'reset', label: '重置', size: 'small', action: 'resetFallbackOrderCondition' }, + { key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' }, + { + key: 'quickScan', + label: '快速扫描', + type: 'warning', + size: 'small', + loadingKey: 'waveStrategyQuickScanSubmitting', + action: 'submitWaveStrategyQuickScan' + }, + { + key: 'fetchByIds', + label: '按订单IDs抓取删单', + type: 'warning', + size: 'small', + loadingKey: 'singleOrderSubmitting', + disabledKey: 'noSelection', + action: 'submitFallbackOrderFetchByIds' + } +] -/** 工具栏按钮顺序与类型(与散单页工具条同一套间距/滚动行为) */ -export const pickTaskWaveToolbarButtons: PickTaskWaveToolbarButton[] = [ - { key: 'refresh', label: '刷新', size: 'small' }, - { key: 'search', label: '查询', type: 'primary', size: 'small' }, - { key: 'detailQuery', label: '按任务ID查详情', size: 'small' }, - { key: 'batchCancel', label: '批量取消任务', type: 'danger', size: 'small' }, - +/** 波次策略页工具栏按钮 */ +export const waveStrategyToolbarButtons: ToolbarButtonConfig[] = [ + { key: 'refresh', label: '刷新', type: 'primary', size: 'small', loadingKey: 'loading', action: 'loadData' }, + { key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' }, + { key: 'create', label: '新建策略', type: 'success', size: 'small', action: 'openCreateWaveStrategyDialog' } ] /** 拣货任务 status 枚举(与 wavePickTaskList / wavePickTaskCancel 文档一致) */ diff --git a/src/views/stock/stock/index.vue b/src/views/stock/stock/index.vue index b0c0b740..45fe2a00 100644 --- a/src/views/stock/stock/index.vue +++ b/src/views/stock/stock/index.vue @@ -18,106 +18,33 @@
- - - 刷新 + + + + + 批量修改 - -