diff --git a/dist.tar.gz b/dist.tar.gz index c72f95a6..b3dfe3ad 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/storage.stockout/stockout.ts b/src/api/storage.stockout/stockout.ts index fb3db6d0..e50f0084 100644 --- a/src/api/storage.stockout/stockout.ts +++ b/src/api/storage.stockout/stockout.ts @@ -1,7 +1,33 @@ import request from '@/utils/request' const v = "1.0" -export const stockoutList = (data: any) => { +// ── storage.stockout.list ── + +export type StockoutListParams = { + pagination?: { + page?: number + pageSize?: number + } + where?: Record + sort?: { + sortField?: string + sortOrder?: string + } +} + +export type StockoutListResponse = { + list: Record[] + pagination: { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean + } +} + +export const stockoutList = (data: StockoutListParams) => { return request({ url: `/system`, method: 'post', @@ -14,11 +40,23 @@ export const stockoutList = (data: any) => { }) } -export const stockoutListItems = (data: { - delivery_order_code?: string - order_id?: number +// ── storage.stockout.listItems ── + +export type StockoutListItemsParams = { + /** 出库单号(推荐) */ + stockout_order_code?: string + /** 出库单ID,与 stockout_order_code 至少传一个 */ id?: number -}) => { + /** @deprecated 旧参数名,兼容 delivery_order_code */ + delivery_order_code?: string +} + +export type StockoutListItemsResponse = { + order: Record + list: Record[] +} + +export const stockoutListItems = (data: StockoutListItemsParams) => { return request({ url: `/system`, method: 'post', @@ -44,3 +82,67 @@ export const stockoutToOrder = (data?: { id?: number; delivery_order_code?: stri data: data || {} }) } + +// ── storage.stockout.confirm ── + +export type StockoutConfirmParams = { + /** 出库单ID(必填) */ + id: number +} + +export type StockoutConfirmResponse = { + id: number + stockout_order_code: string + order_status: string + logisticsName: string + /** 运单号(取自表中 express_code 字段) */ + expressCode: string + /** 运单号列表(取自表中 express_codes 字段) */ + expressCodes?: string[] +} + +/** 直出确认出库单:不改变内部库存,按出库单明细计划数量(plan_qty)直接确认,状态推进到 COMPLETED。要求 express_code 已填写 */ +export const stockoutConfirm = (data: StockoutConfirmParams) => { + return request({ + url: `/system`, + method: 'post', + params: { + method: 'storage.stockout.confirm', + v, + timestamp: new Date().getTime() + }, + data: data + }) +} + +// ── storage.stockout.updateExpress ── + +export type StockoutUpdateExpressParams = { + /** 出库单ID(必填) */ + id: number + /** 运单号 */ + express_code?: string + /** 运单号列表(JSON 数组) */ + express_codes?: string[] +} + +export type StockoutUpdateExpressResponse = { + id: number + stockout_order_code: string + express_code?: string + express_codes?: string[] +} + +/** 更新出库单的运单号字段(express_code / express_codes),用于在确认前填写运单信息 */ +export const stockoutUpdateExpress = (data: StockoutUpdateExpressParams) => { + return request({ + url: `/system`, + method: 'post', + params: { + method: 'storage.stockout.updateExpress', + v, + timestamp: new Date().getTime() + }, + data: data + }) +} diff --git a/src/api/setting.storeExpressBindingPolicy/storeExpressBindingPolicy.ts b/src/api/storeexpressbindingpolicy/storeExpressBindingPolicy.ts similarity index 100% rename from src/api/setting.storeExpressBindingPolicy/storeExpressBindingPolicy.ts rename to src/api/storeexpressbindingpolicy/storeExpressBindingPolicy.ts diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index 47d3f355..83c3b9dc 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -1,7 +1,7 @@ - + - + - -
- {{ title }} - - - - - -
-
@@ -485,7 +475,33 @@
+
+ + + + + 无需填值 +
): Record // ============================================================ // 十、工具栏按钮系统 // ============================================================ -// 按钮分为三类: -// common — 公共按钮(刷新、导出) -// function — 功能按钮(打开表单/确认窗口) -// basic — 基础操作(字段设置、隐藏详情) +// 按钮分类对齐 storage/receiving 模式: +// refresh — 蓝底白字(刷新) +// setting — 白底黑字(导出、字段设置、显示详情) +// action — 白底蓝边框(功能操作) +// cancel — 红底白字(作废/删除) export interface ToolbarButtonConfig { key: string label: string - category: 'common' | 'function' | 'basic' + category: 'refresh' | 'setting' | 'action' | 'cancel' size?: '' | 'default' | 'small' | 'large' type?: '' | 'primary' | 'success' | 'warning' | 'info' | 'danger' plain?: boolean @@ -610,28 +611,25 @@ export interface ToolbarButtonConfig { } export const TOOLBAR_BUTTONS: Record = { - // ===== 公共按钮 ===== refresh: { key: 'refresh', label: '刷新', - category: 'common', - type: 'primary', + category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' }, - // ===== 基础操作 ===== columnConfig: { key: 'columnConfig', label: '字段设置', - category: 'basic', + category: 'setting', size: 'small', action: 'openColumnConfigPanel' }, toggleDetail: { key: 'toggleDetail', label: '显示详情', - category: 'basic', + category: 'setting', dynamicLabelKey: 'detailToggleLabel', size: 'small', action: 'toggleDetailVisible' diff --git a/src/views/inbox/group/index.vue b/src/views/inbox/group/index.vue index c4ef1122..e8907c28 100644 --- a/src/views/inbox/group/index.vue +++ b/src/views/inbox/group/index.vue @@ -139,7 +139,7 @@ - + diff --git a/src/views/material/packageMaterial/index.vue b/src/views/material/packageMaterial/index.vue index f23045ee..34ceec01 100644 --- a/src/views/material/packageMaterial/index.vue +++ b/src/views/material/packageMaterial/index.vue @@ -16,20 +16,14 @@
- 刷新 - - 批量删除 - - - 新增包材 - 批量导入 +
@@ -200,6 +194,9 @@ import { ElMessage, ElMessageBox } from 'element-plus' import type { FormInstance, FormRules } 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 { safeInvoke } from '@/utils/safe-invoke' import BatchImportDialog from './component/BatchImportDialog.vue' import PackageMaterialSearchForm from './form/PackageMaterialSearchForm.vue' import { @@ -212,6 +209,7 @@ import { useSettingsStore } from '@/stores/modules/settings' import { buildPackageMaterialListPayload, parsePackageMaterialListResponse, + packageMaterialToolbarButtons, formatDimensions, formatNumber, formatPackageMaterialStatus, @@ -239,6 +237,54 @@ const saving = ref(false) const batchDeleting = ref(false) const selectedIds = ref([]) const tableData = ref([]) + +// ── 工具栏状态 ── +const buttonLoadingMap = computed(() => ({ + loading: loading.value, + batchDeleting: batchDeleting.value +})) + +const buttonDisabledMap = computed(() => ({ + hasNoSelection: !selectedIds.value.length +})) + +const buttonLabelMap = computed(() => ({})) + +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> = { + loadList: () => { void loadList() }, + openCreate: () => openCreate(), + openBatchImport: () => openBatchImport(), + handleBatchDelete: () => { void handleBatchDelete() } +} + +function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { + const handler = toolbarActionMap[action] + if (!handler) return + safeInvoke(() => handler()) +} const queryTime = ref(0) const tableSize = ref<'small' | 'default' | 'large'>('small') const currentConditionRaw = ref(null) @@ -556,23 +602,23 @@ onMounted(() => { } .toolbar { - padding: 5px 8px; - border-bottom: 1px solid #ebeef5; + margin-bottom: 3px; + padding: 6px 10px; + border: 1px solid #ebeef5; display: flex; justify-content: space-between; - align-items: center; - gap: 12px; - flex-wrap: wrap; + align-items: flex-start; background-color: #fff; + min-width: 0; flex-shrink: 0; } .toolbar-left { - display: flex; - align-items: center; - gap: 8px; - flex-wrap: wrap; + flex: 1; min-width: 0; + display: flex; + align-items: flex-start; + gap: 10px; } .toolbar-right { diff --git a/src/views/material/packageMaterial/package-material-config.ts b/src/views/material/packageMaterial/package-material-config.ts index ca84e12a..202fe356 100644 --- a/src/views/material/packageMaterial/package-material-config.ts +++ b/src/views/material/packageMaterial/package-material-config.ts @@ -1,3 +1,36 @@ +import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' + +/** 包材列表主工具栏按钮(action 与 packageMaterial/index.vue 内 toolbarActionMap 键一致) + * 排序与样式分类对齐 storage/receiving: + * refresh → action 组(新增/导入)→ cancel 组 + */ +export const packageMaterialToolbarButtons: ToolbarButtonConfig[] = [ + { key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadList' }, + { + key: 'create', + label: '新增包材', + category: 'action', + size: 'small', + action: 'openCreate' + }, + { + key: 'batchImport', + label: '批量导入', + category: 'action', + size: 'small', + action: 'openBatchImport' + }, + { + key: 'batchDelete', + label: '批量删除', + category: 'cancel', + size: 'small', + disabledKey: 'hasNoSelection', + loadingKey: 'batchDeleting', + action: 'handleBatchDelete' + }, +] + export type PackageMaterialRecord = { id?: number material_code?: string diff --git a/src/views/material/packageSupplier/index.vue b/src/views/material/packageSupplier/index.vue index bb2fcfe4..7eba276d 100644 --- a/src/views/material/packageSupplier/index.vue +++ b/src/views/material/packageSupplier/index.vue @@ -16,18 +16,14 @@
- 刷新 - - 批量删除 - - 新增供应商 +
@@ -116,6 +112,9 @@ import { ElMessage, ElMessageBox } from 'element-plus' import type { FormInstance, FormRules } 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 { safeInvoke } from '@/utils/safe-invoke' import { packageSupplierCreate, packageSupplierDelete, @@ -126,6 +125,7 @@ import { useSettingsStore } from '@/stores/modules/settings' import { buildPackageSupplierListPayload, parsePackageSupplierListResponse, + packageSupplierToolbarButtons, formatPackageSupplierStatus, normalizePackageSupplierScanConditionToWhere, packageSupplierColumns, @@ -151,6 +151,53 @@ const saving = ref(false) const batchDeleting = ref(false) const selectedIds = ref([]) const tableData = ref([]) + +// ── 工具栏状态 ── +const buttonLoadingMap = computed(() => ({ + loading: loading.value, + batchDeleting: batchDeleting.value +})) + +const buttonDisabledMap = computed(() => ({ + hasNoSelection: !selectedIds.value.length +})) + +const buttonLabelMap = computed(() => ({})) + +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> = { + loadList: () => { void loadList() }, + openCreate: () => openCreate(), + handleBatchDelete: () => { void handleBatchDelete() } +} + +function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { + const handler = toolbarActionMap[action] + if (!handler) return + safeInvoke(() => handler()) +} const queryTime = ref(0) const tableSize = ref<'small' | 'default' | 'large'>('small') const currentConditionRaw = ref(null) @@ -417,23 +464,23 @@ onMounted(() => { } .toolbar { - padding: 5px 8px; - border-bottom: 1px solid #ebeef5; + margin-bottom: 3px; + padding: 6px 10px; + border: 1px solid #ebeef5; display: flex; justify-content: space-between; - align-items: center; - gap: 12px; - flex-wrap: wrap; + align-items: flex-start; background-color: #fff; + min-width: 0; flex-shrink: 0; } .toolbar-left { - display: flex; - align-items: center; - gap: 8px; - flex-wrap: wrap; + flex: 1; min-width: 0; + display: flex; + align-items: flex-start; + gap: 10px; } .upper-wrapper { diff --git a/src/views/material/packageSupplier/package-supplier-config.ts b/src/views/material/packageSupplier/package-supplier-config.ts index 427d5051..bf6010e7 100644 --- a/src/views/material/packageSupplier/package-supplier-config.ts +++ b/src/views/material/packageSupplier/package-supplier-config.ts @@ -1,3 +1,29 @@ +import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' + +/** 包装供应商列表主工具栏按钮(action 与 packageSupplier/index.vue 内 toolbarActionMap 键一致) + * 排序与样式分类对齐 storage/receiving: + * refresh → action 组 → cancel 组 + */ +export const packageSupplierToolbarButtons: ToolbarButtonConfig[] = [ + { key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadList' }, + { + key: 'create', + label: '新增供应商', + category: 'action', + size: 'small', + action: 'openCreate' + }, + { + key: 'batchDelete', + label: '批量删除', + category: 'cancel', + size: 'small', + disabledKey: 'hasNoSelection', + loadingKey: 'batchDeleting', + action: 'handleBatchDelete' + }, +] + export type PackageSupplierRecord = { id?: number supplier_code?: string diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index e64d6e3e..b955853e 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1359,7 +1359,7 @@ export const deliveryAvailableFields = [ { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, // 订单信息 - { ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP }, @@ -2064,7 +2064,7 @@ export const expectionOrderAvailableFields = [ { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, // 订单信息 - { ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...pendingOrderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCodeScanField, group: SCAN_ORDER_INFO_GROUP }, diff --git a/src/views/order/waveOrder/FallbackOrderListPanel.vue b/src/views/order/waveOrder/FallbackOrderListPanel.vue index 6bca0fd9..ee648fb9 100644 --- a/src/views/order/waveOrder/FallbackOrderListPanel.vue +++ b/src/views/order/waveOrder/FallbackOrderListPanel.vue @@ -707,6 +707,10 @@ onBeforeUnmount(() => { align-items: center; justify-content: space-between; + .toolbar-left { + align-items: center; + } + .toolbar-right { display: flex; align-items: center; diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index 49e48463..61c0be94 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -158,25 +158,27 @@