diff --git a/dist.tar.gz b/dist.tar.gz index 4cf65208..c95b22b0 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/setting.warehouse/settingwarehouse.ts b/src/api/setting.warehouse/settingwarehouse.ts index 11da3594..96bfa1d6 100644 --- a/src/api/setting.warehouse/settingwarehouse.ts +++ b/src/api/setting.warehouse/settingwarehouse.ts @@ -65,6 +65,8 @@ export type SettingWarehouseSubjectConfig = SettingWarehouseSenderConfig & { default_express_code?: string default_platform_code?: string group_wave_prefix?: string + /** 自动分配快递排除备注:订单备注命中任一关键字时,跳过自动分配快递 */ + auto_allocate_express_exclude_remarks?: string[] [key: string]: unknown } @@ -119,6 +121,18 @@ export function normalizeWarehouseSubjectConfig( } } + // 规范化 auto_allocate_express_exclude_remarks(string_array 类型) + const remarksRaw = base.auto_allocate_express_exclude_remarks + if (remarksRaw === null || remarksRaw === undefined || remarksRaw === '') { + base.auto_allocate_express_exclude_remarks = [] + } else if (!Array.isArray(remarksRaw)) { + throw new Error('auto_allocate_express_exclude_remarks 必须是字符串数组') + } else { + base.auto_allocate_express_exclude_remarks = (remarksRaw as unknown[]) + .filter((v): v is string => typeof v === 'string' && v.trim() !== '') + .map((v) => v.trim()) + } + return base as SettingWarehouseSubjectConfig } diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index 2851ef91..6f1277c2 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -1,29 +1,46 @@ @@ -415,7 +570,8 @@ import { ref, reactive, watch, computed, onMounted, onBeforeUnmount, nextTick } from 'vue' import { useRoute } from 'vue-router' import { useScanBoxCacheStore } from '@/stores/modules/scanBoxCache' -import { Operation, DataAnalysis, Search, Files } from '@element-plus/icons-vue' +import { useSettingsStore } from '@/stores/modules/settings' +import { Operation, DataAnalysis, Search, Files, Fold, Expand } from '@element-plus/icons-vue' defineOptions({ name: 'ScanBox' @@ -428,6 +584,12 @@ const props = defineProps({ default: '250px' }, + // 标题(紧凑模式显示) + title: { + type: String, + default: '筛选' + }, + // 预设树状条件 presetTree: { type: Array, @@ -525,6 +687,47 @@ const props = defineProps({ const emit = defineEmits(['condition-change', 'reset', 'condition-clear', 'submit', 'field-action']) const route = useRoute() const scanBoxCacheStore = useScanBoxCacheStore() +const settingsStore = useSettingsStore() + +// 紧凑模式 +const isCompact = computed(() => settingsStore.scanBoxMode === 'compact') +function toggleMode() { + settingsStore.changeSetting({ key: 'scanBoxMode', value: isCompact.value ? 'standard' : 'compact' }) +} + +// 紧凑模式下字段变更时自动设置默认操作符 +function handleCompactChange() { + // 为有值的字段设置默认操作符 + props.availableFields.forEach((field: any) => { + const condition = customConditions[field.value] + if (!condition) return + const val = condition.value + const hasValue = val !== undefined && val !== null && val !== '' && !(Array.isArray(val) && val.length === 0) + if (hasValue && !condition.operator) { + // 设置默认操作符 + if (field.operators && Array.isArray(field.operators) && field.operators.length > 0) { + condition.operator = field.defaultOperator || field.operators[0] + } else { + const defaultOps = props.defaultOperators[field.type as keyof typeof props.defaultOperators] + if (defaultOps && defaultOps.length > 0) { + condition.operator = field.defaultOperator || defaultOps[0].value || 'eq' + } else { + condition.operator = 'eq' + } + } + } + if (!hasValue) { + condition.operator = '' + } + }) + scheduleSaveSnapshot() + if (props.autoSubmit) { + clearTimeout(debounceTimer) + debounceTimer = setTimeout(() => { + handleSubmit() + }, 300) + } +} // Data const activeTab = ref('custom') @@ -1637,4 +1840,78 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su padding-left: 4px; font-style: italic; } + +/* ─── 紧凑模式 ──────────────────────────────────────────────────────────── */ +.scan-box--compact { + width: 220px !important; + min-width: 180px; +} + +.scan-tabs__inner { + display: flex; + align-items: center; +} + +.scan-tabs__inner .el-tabs { + flex: 1; + min-width: 0; +} + +.mode-toggle-btn { + flex-shrink: 0; + padding: 4px; + margin-left: auto; + color: #909399; + font-size: 14px; +} + +.mode-toggle-btn:hover { + color: #409eff; +} + +.compact-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 8px 12px; + background: #f8fbff; + border-bottom: 1px solid #e8eef7; + flex-shrink: 0; +} + +.compact-title { + font-size: 14px; + font-weight: 600; + color: #303133; +} + +.compact-filter { + flex: 1; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.compact-fields { + flex: 1; + overflow-y: auto; + padding: 8px 10px; + display: flex; + flex-direction: column; + gap: 6px; +} + +.compact-fields::-webkit-scrollbar { + display: none; +} + +.compact-fields { + -ms-overflow-style: none; + scrollbar-width: none; +} + +.compact-field-item { + width: 100%; +} + diff --git a/src/settings.ts b/src/settings.ts index 133f5abb..13b4578d 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -35,5 +35,11 @@ export default { * @type {'tile' | 'collapse'} * @description Toolbar button display mode: tile (平铺) or collapse (折叠) */ - toolbarMode: 'collapse' + toolbarMode: 'collapse', + + /** + * @type {'standard' | 'compact'} + * @description ScanBox display mode: standard (标准) or compact (紧凑) + */ + scanBoxMode: 'standard' } diff --git a/src/stores/modules/settings.ts b/src/stores/modules/settings.ts index 31919bf6..56c72caa 100644 --- a/src/stores/modules/settings.ts +++ b/src/stores/modules/settings.ts @@ -3,7 +3,7 @@ import defaultSettings from '@/settings' import { ref, computed, watch } from 'vue' import { useUserStore } from './user' -const { showSettings, tagsView, fixedHeader, sidebarLogo, shortcutExpanded, toolbarMode: defaultToolbarMode } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo, shortcutExpanded, toolbarMode: defaultToolbarMode, scanBoxMode: defaultScanBoxMode } = defaultSettings export const useSettingsStore = defineStore('settings', () => { const userStore = useUserStore() @@ -15,7 +15,8 @@ export const useSettingsStore = defineStore('settings', () => { const sidebarLogoRef = ref(sidebarLogo) const layoutMode = ref<'sidebar' | 'top-bottom'>('top-bottom') const shortcutExpandedRef = ref(shortcutExpanded) - const toolbarModeRef = ref<'tile' | 'collapse'>(defaultToolbarMode || 'collapse') + const toolbarModeRef = ref<'tile' | 'collapse'>((defaultToolbarMode as 'tile' | 'collapse') || 'collapse') + const scanBoxModeRef = ref<'standard' | 'compact'>((defaultScanBoxMode as 'standard' | 'compact') || 'standard') const storageKey = computed(() => { if (!userStore.user?.username && !userStore.user?.id) return null @@ -36,6 +37,7 @@ export const useSettingsStore = defineStore('settings', () => { if (typeof parsed.layoutMode === 'string') layoutMode.value = parsed.layoutMode if (typeof parsed.shortcutExpanded === 'boolean') shortcutExpandedRef.value = parsed.shortcutExpanded if (parsed.toolbarMode === 'tile' || parsed.toolbarMode === 'collapse') toolbarModeRef.value = parsed.toolbarMode + if (parsed.scanBoxMode === 'standard' || parsed.scanBoxMode === 'compact') scanBoxModeRef.value = parsed.scanBoxMode } catch (e) { console.error('Failed to parse settings from storage', e) } @@ -51,7 +53,8 @@ export const useSettingsStore = defineStore('settings', () => { sidebarLogo: sidebarLogoRef.value, layoutMode: layoutMode.value, shortcutExpanded: shortcutExpandedRef.value, - toolbarMode: toolbarModeRef.value + toolbarMode: toolbarModeRef.value, + scanBoxMode: scanBoxModeRef.value } try { localStorage.setItem(storageKey.value, JSON.stringify(payload)) @@ -72,7 +75,8 @@ export const useSettingsStore = defineStore('settings', () => { sidebarLogoRef.value = sidebarLogo layoutMode.value = 'top-bottom' shortcutExpandedRef.value = shortcutExpanded - toolbarModeRef.value = defaultToolbarMode || 'collapse' + toolbarModeRef.value = (defaultToolbarMode as 'tile' | 'collapse') || 'collapse' + scanBoxModeRef.value = (defaultScanBoxMode as 'standard' | 'compact') || 'standard' } }, { immediate: true }) @@ -85,7 +89,8 @@ export const useSettingsStore = defineStore('settings', () => { sidebarLogo: 1, layoutMode: 1, shortcutExpanded: 1, - toolbarMode: 1 + toolbarMode: 1, + scanBoxMode: 1 }, key)) return switch (key) { @@ -113,6 +118,9 @@ export const useSettingsStore = defineStore('settings', () => { case 'toolbarMode': toolbarModeRef.value = value break + case 'scanBoxMode': + scanBoxModeRef.value = value + break default: break } @@ -130,6 +138,7 @@ export const useSettingsStore = defineStore('settings', () => { layoutMode, shortcutExpanded: shortcutExpandedRef, toolbarMode: toolbarModeRef, + scanBoxMode: scanBoxModeRef, changeSetting } }) diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 1184ee8d..d11a6046 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1343,6 +1343,11 @@ export const deliveryAvailableFields = [ { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1357,12 +1362,6 @@ export const deliveryAvailableFields = [ { ...claimStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...interceptStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, - // 订单信息 - { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 收货信息 { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -1522,18 +1521,17 @@ export const reviewAvailableFields = [ { ...isUrgencyScanField, group: SCAN_QUICK_FILTER_GROUP }, { ...waveAssignmentScanField, group: SCAN_QUICK_FILTER_GROUP }, // 订单信息 - { ...orderQuickSearchScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderQuickSearchScanField, label: '发货单号', group: SCAN_ORDER_INFO_GROUP }, { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(reviewOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, - // 订单信息 - { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 收货信息 { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -1551,6 +1549,8 @@ export const reviewColums = applyOrderListCopyActions([ { prop: 'shop_nick', label: '店铺名称', width: '140' }, orderStoreRemarkColumn, { prop: 'sys_platform_name', label: '平台编码', width: '100' }, + { prop: 'source_order_codes', label: '平台交易单号', width: '140' }, + { prop: 'status', label: '订单状态', width: '100', formatter: (row: any) => translateOrderField('status', row.status) }, { prop: 'name', label: '收件人', width: '110' }, { prop: 'sync_status', label: '同步状态', width: '100' }, { prop: 'recheck_status', label: '复核状态', width: '100' }, @@ -1680,6 +1680,11 @@ export const pendingAvailableFields = [ { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waybillCodesScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -1689,12 +1694,6 @@ export const pendingAvailableFields = [ { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, - // 订单信息 - { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 收货信息 { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -1953,10 +1952,9 @@ export const workbenchAvailableFields = [ { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...buyerNickScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...orderStatusScanField(workbenchStatusOptions), group: SCAN_PROCESS_STATUS_GROUP }, - // 订单信息 - { ...buyerNickScanField, group: SCAN_ORDER_INFO_GROUP }, // 收货信息 { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -2019,6 +2017,9 @@ export const expectionOrderAvailableFields = [ { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...expressCodeScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, @@ -2029,10 +2030,6 @@ export const expectionOrderAvailableFields = [ { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(exceptionOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, - // 订单信息 - { ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 收货信息 { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...buyerMessageScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -2134,15 +2131,14 @@ export const archiveAvailableFields = [ { ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP }, { ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP }, { ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, + { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 流程状态 { ...orderStatusScanField(archiveOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, - // 订单信息 - { ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP }, - { ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP }, // 收货信息 { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, { ...receiverMobileScanField, group: SCAN_RECEIVING_INFO_GROUP }, diff --git a/src/views/order/orderManagement/reviewOrder.vue b/src/views/order/orderManagement/reviewOrder.vue index 8506f618..43e1534e 100644 --- a/src/views/order/orderManagement/reviewOrder.vue +++ b/src/views/order/orderManagement/reviewOrder.vue @@ -63,6 +63,12 @@ + + -