diff --git a/dist.tar.gz b/dist.tar.gz index b3dfe3ad..98bb0937 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/stock.report/stock.report.ts b/src/api/stock.report/stock.report.ts index 1b0439a7..05a20a26 100644 --- a/src/api/stock.report/stock.report.ts +++ b/src/api/stock.report/stock.report.ts @@ -7,6 +7,8 @@ export type StockReportListItem = { end_time?: string | null stock_id: number store_id: number + warehouse_id?: number + warehouse_name?: string begin_total: number end_total: number inbound_total: number diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index 400bb14d..1591baaf 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -489,25 +489,25 @@ :value="op.value" /> - 无需填值 - @@ -737,6 +737,12 @@ function toggleMode() { settingsStore.changeSetting({ key: 'scanBoxMode', value: isCompact.value ? 'standard' : 'compact' }) } +// 紧凑模式数字输入:将 el-input 的字符串转为 number,保持与 el-input-number 一致的语义 +function handleCompactNumberInput(field: any, v: string) { + customConditions[field.value].value = v === '' || v === undefined ? undefined : Number(v) + handleCompactChange() +} + // 紧凑模式下字段变更时自动设置默认操作符 function handleCompactChange() { // 为有值的字段设置默认操作符 @@ -1976,6 +1982,10 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su min-width: 0; } +.compact-value-input :deep(.el-input__inner) { + text-align: left; +} + /* 紧凑模式下底部操作栏与字段区域保持一致的左右间距 */ .scan-box--compact .fixed-bottom-actions { padding: 10px 12px; diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue index ec9cdbf7..11c5b7ca 100644 --- a/src/components/UpperTable/index.vue +++ b/src/components/UpperTable/index.vue @@ -345,6 +345,9 @@ import { Box } from '@element-plus/icons-vue' import { ElMessage, ElMessageBox } from 'element-plus' import type { UploadFile } from 'element-plus' import { useUserStore } from '@/stores/modules/user' +import { useSettingsStore } from '@/stores/modules/settings' +import { useShortcutsStore } from '@/stores/modules/shortcuts' +import defaultSettings from '@/settings' import QrcodeDialog from '@/components/QR/qrcode.vue' defineOptions({ @@ -1452,7 +1455,7 @@ function handleImportColumnConfig(file: UploadFile) { async function handleRepairColumnConfig() { try { await ElMessageBox.confirm( - '故障修复会清除当前电脑中此账号的全部字段配置,并恢复各页面默认字段。是否继续?', + '故障修复会清除当前电脑中此账号的全部字段配置、显示设置及快捷键,并恢复所有默认配置。是否继续?', '确认故障修复', { type: 'warning', @@ -1462,7 +1465,7 @@ async function handleRepairColumnConfig() { ) await ElMessageBox.confirm( - '请再次确认:该操作不可撤销,确定清除所有字段配置吗?', + '请再次确认:该操作不可撤销,确定清除所有配置吗?', '二次确认', { type: 'warning', @@ -1471,17 +1474,56 @@ async function handleRepairColumnConfig() { } ) - const prefix = globalColumnConfigStoragePrefix.value + // 1. 清除字段配置(表格列配置) + const columnPrefix = globalColumnConfigStoragePrefix.value const removeKeys: string[] = [] Object.keys(localStorage).forEach((key) => { - if (key.startsWith(prefix)) { + if (key.startsWith(columnPrefix)) { removeKeys.push(key) } }) removeKeys.forEach((key) => localStorage.removeItem(key)) + const columnCount = removeKeys.length + + // 2. 清除并重置显示设置(toolbarMode、scanBoxMode 等) + const settingsStore = useSettingsStore() + const settingsKey = (() => { + const userStore = useUserStore() + const userId = userStore.user?.username || userStore.user?.id || 'unknown' + const roleId = userStore.roleId || 'default' + return `settings_${userId}_${roleId}` + })() + const hadSettings = localStorage.getItem(settingsKey) !== null + localStorage.removeItem(settingsKey) + // 将各项设置重置为默认值 + settingsStore.changeSetting({ key: 'showSettings', value: defaultSettings.showSettings }) + settingsStore.changeSetting({ key: 'tagsView', value: defaultSettings.tagsView }) + settingsStore.changeSetting({ key: 'fixedHeader', value: defaultSettings.fixedHeader }) + settingsStore.changeSetting({ key: 'sidebarLogo', value: defaultSettings.sidebarLogo }) + settingsStore.changeSetting({ key: 'layoutMode', value: 'top-bottom' }) + settingsStore.changeSetting({ key: 'shortcutExpanded', value: defaultSettings.shortcutExpanded }) + settingsStore.changeSetting({ key: 'toolbarMode', value: defaultSettings.toolbarMode }) + settingsStore.changeSetting({ key: 'scanBoxMode', value: defaultSettings.scanBoxMode }) + + // 3. 清除并重置快捷键 + const shortcutsStore = useShortcutsStore() + const shortcutsKey = (() => { + const userStore = useUserStore() + const userId = userStore.user?.username || userStore.user?.id || 'unknown' + const roleId = userStore.roleId || 'default' + return `shortcuts_${userId}_${roleId}` + })() + const hadShortcuts = localStorage.getItem(shortcutsKey) !== null + localStorage.removeItem(shortcutsKey) + shortcutsStore.shortcuts = [] rebuildColumnConfig() - ElMessage.success(`故障修复完成,已清除 ${removeKeys.length} 个字段配置`) + + const parts: string[] = [] + if (columnCount > 0) parts.push(`${columnCount} 个字段配置`) + if (hadSettings) parts.push('显示设置') + if (hadShortcuts) parts.push('快捷键') + ElMessage.success(`故障修复完成${parts.length > 0 ? ',已恢复 ' + parts.join('、') : ''}`) } catch { // user cancelled } diff --git a/src/layout/component/Navbar.vue b/src/layout/component/Navbar.vue index e3ab6782..3e729511 100644 --- a/src/layout/component/Navbar.vue +++ b/src/layout/component/Navbar.vue @@ -226,6 +226,7 @@ onUnmounted(() => { diff --git a/src/views/message/components/CreateAfterSaleDialog.vue b/src/views/message/components/CreateAfterSaleDialog.vue index c2fab18c..250c0d2d 100644 --- a/src/views/message/components/CreateAfterSaleDialog.vue +++ b/src/views/message/components/CreateAfterSaleDialog.vue @@ -58,9 +58,9 @@ { prop: 'store_remask', label: '货主', width: '80' }, { prop: 'logistics_name', label: '物流', width: '70' }, { prop: 'logistics_interface_name', label: '物流接口', minWidth: '110' }, - { prop: 'is_back', label: '退回', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '退回' : '否' }, - { prop: 'is_intercept', label: '拦截', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '拦截' : '否' }, - { prop: 'is_galaxy_receive', label: '揽收', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '揽收' : '否' }, + { prop: 'is_back', label: '退回', width: '60', align: 'center', formatter: (_r: any, v: any) => v === 'Y' ? '退回' : '否' }, + { prop: 'is_intercept', label: '拦截', width: '60', align: 'center', formatter: (_r: any, v: any) => v === 'Y' ? '拦截' : '否' }, + { prop: 'is_galaxy_receive', label: '揽收', width: '60', align: 'center', formatter: (_r: any, v: any) => v === 'Y' ? '揽收' : '否' }, ]" :fetch-fn="orderSearchFetchFn" :extract-list="(res: any) => res?.data?.list ?? res?.list ?? []" @@ -156,7 +156,7 @@ import { afterSaleCreate, type AfterSaleCreateParams } from '@/api/afterSale/ind import { AFTER_SALE_TYPE_MAP } from '@/views/afterSale/list/afterSale-config' import { loadStores } from '@/api/index/index' import { extractStoreListFromResponse, mapStoreListToSelectOptions } from '@/views/order/orderManagement/config/order-common-config' -import { orderDeliveryOrderQuickSearch } from '@/api/order.deliveryOrder/orderdeliveryOrder' +import { orderDeliveryOrderQuickSearch } from '@/api/order.deliveryorder/orderdeliveryOrder' import { getEntryList } from '@/api/storage.entry/entry' import { stockoutList } from '@/api/storage.stockout/stockout' import { getReceivingList } from '@/api/storage_receiving/receiving' diff --git a/src/views/message/components/DocSearchPicker.vue b/src/views/message/components/DocSearchPicker.vue index caf3e184..c97a8eeb 100644 --- a/src/views/message/components/DocSearchPicker.vue +++ b/src/views/message/components/DocSearchPicker.vue @@ -69,6 +69,7 @@ export interface DocSearchPickerColumn { label: string width?: string minWidth?: string + align?: string formatter?: (row: any, value: any) => string } diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index b955853e..ce237206 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1230,7 +1230,7 @@ export const placeOrderTimeRangeScanField = scanBasicField({ label: '下单时 export const isUrgencyScanField = scanBasicField({ label: '是否紧急', value: 'is_urgency', type: 'select', options: isUrgencyFilterOptions }) export const buyerMessageHasScanField = scanBasicField({ label: '有无留言', value: 'buyer_message_has', type: 'select', options: buyerMessageHasFilterOptions }) export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' }) -export const stockQueryScanField = scanBasicField({ label: '包含商品', value: 'stock_query', type: 'text', operators: ['like'], defaultOperator: 'like' }) +export const stockQueryScanField = scanBasicField({ label: '包含商品', value: 'stock_query', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'like' }) /** 可复用 ScanBox 字段片段(工作流程) */ export const orderStatusScanField = (options: Array<{ label: string; value: string }>) => diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue index 342981a1..48b091fe 100644 --- a/src/views/order/waveOrder/WavePickTaskListPanel.vue +++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue @@ -82,21 +82,27 @@ - - - - + + @@ -89,7 +100,7 @@ {{ selectedRowData.space_id }} {{ selectedRowData.warehouse_id }} {{ selectedRowData.store_id }} - {{ selectedRowData.order_type }} + {{ getOrderTypeLabel(selectedRowData.order_type) }} {{ selectedRowData.operator_name }} {{ selectedRowData.quantity }} {{ selectedRowData.record_count }} @@ -127,7 +138,8 @@ import { formatDateTime, formatTransactionData, inventoryTypeConfig, - transactionTypeConfig + transactionTypeConfig, + getOrderTypeLabel } from './log-config' import { useSettingsStore } from '@/stores/modules/settings' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' @@ -335,6 +347,11 @@ function handleConditionReset() { loadData() } +function handleGroupByBatchChange() { + pagination.currentPage = 1 + loadData() +} + async function loadData() { if (loading.value) return loading.value = true diff --git a/src/views/storage/log/log-config.ts b/src/views/storage/log/log-config.ts index d0b21013..24879f75 100644 --- a/src/views/storage/log/log-config.ts +++ b/src/views/storage/log/log-config.ts @@ -104,23 +104,38 @@ export const inventoryTypeConfig = { } // 订单类型配置 -export const orderTypeConfig = { - SCRK: { text: '标准入库', tagType: 'primary' }, - MATCH: { text: '匹配', tagType: 'primary' } +export const orderTypeConfig: Record = { + ORDER: '订单', + ORDER_CANCEL: '取消订单', + CGRK: '采购入库', + JYCK: '交易出库', + CGTH: '采购退货', + JYTH: '交易退货', + SCRK: '生产入库', + SHRK: '收货入库', + DELIVERY_ORDER: '出库单', + RECEIVING: '收货单', + ENTRY_ORDER: '入库单', + INVENTORY: '盘点单', + RETURN: '退货单' +} + +export function getOrderTypeLabel(type: string): string { + return orderTypeConfig[type] || type || '—' } // 出入库记录列表列 export const transactionColumns = [ - { prop: 'stock_id', label: '商品ID', width: '100' }, + { prop: 'stock_id', label: '商品ID', width: '100', copyAction: 'copy' as const }, + { prop: 'item_code', label: '商品编码', width: '140', copyAction: 'copy' as const }, + { prop: 'item_name', label: '商品名称', minWidth: '160' }, { prop: 'transaction_type', label: '交易类型', width: '100' }, - { prop: 'space_id', label: '库位ID', width: '100' }, { prop: 'warehouse_id', label: '仓库ID', width: '100' }, { prop: 'order_type', label: '订单类型', width: '100' }, { prop: 'quantity', label: '数量', width: '100' }, { prop: 'record_count', label: '记录数', width: '100' }, { prop: 'first_created_at', label: '首次创建', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.first_created_at) }, - { prop: 'last_created_at', label: '最后创建', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.last_created_at) }, - { prop: 'operator_name', label: '操作人', width: '100' } + { prop: 'last_created_at', label: '最后创建', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.last_created_at) } ] // scan-box 可用字段(基础信息在前,流程状态在后;对齐收货单 ScanBox 分组) @@ -134,29 +149,13 @@ export const availableFields: LogScanFieldConfig[] = [ defaultOperator: 'eq' }), logScanBasicField({ - value: 'order_no', - label: '订单号', + value: 'item_code', + label: '商品编码', type: 'text', - placeholder: '请输入订单号', + placeholder: '请输入商品编码', operators: ['contains', 'eq'], defaultOperator: 'eq' }), - logScanBasicField({ - value: 'operator_name', - label: '操作人', - type: 'text', - placeholder: '请输入操作人名称', - operators: ['eq','contains'], - defaultOperator: 'eq' - }), - logScanBasicField({ - value: 'space_id', - label: '库位ID', - type: 'number', - placeholder: '请输入库位ID', - operators: ['eq'], - defaultOperator: 'eq' - }), logScanBasicField({ value: 'store_id', label: '货主', @@ -173,17 +172,11 @@ export const availableFields: LogScanFieldConfig[] = [ type: 'select', options: Object.entries(transactionTypeConfig).map(([v, c]) => ({ value: v, label: c.text })) }), - logScanWorkflowField({ - value: 'inventory_type', - label: '库存类型', - type: 'select', - options: Object.entries(inventoryTypeConfig).map(([v, c]) => ({ value: v, label: c.text })) - }), logScanWorkflowField({ value: 'order_type', label: '订单类型', type: 'select', - options: Object.entries(orderTypeConfig).map(([v, c]) => ({ value: v, label: c.text })) + options: Object.entries(orderTypeConfig).map(([value, label]) => ({ value, label })) }), // ===== 时间 ===== @@ -200,9 +193,11 @@ export const availableFields: LogScanFieldConfig[] = [ export function formatTransactionData(data: any[]): any[] { return data.map(item => ({ ...item, + item_code: item.stockItem?.item_code || '', + item_name: item.stockItem?.item_name || '', record_count: item.record_count ?? 1, first_created_at: item.first_created_at || item.created_at, last_created_at: item.last_created_at || item.created_at, - id: `${item.stock_id}-${item.space_id}-${item.transaction_type}` + id: `${item.stock_id}-${item.transaction_type}` })) } diff --git a/src/views/storage/productflow/index.vue b/src/views/storage/productflow/index.vue index 3dacb4a2..42c7fba1 100644 --- a/src/views/storage/productflow/index.vue +++ b/src/views/storage/productflow/index.vue @@ -79,13 +79,15 @@ {{ row.after_locked_quantity ?? '—' }}