This commit is contained in:
yin 2026-08-11 14:48:46 +08:00
parent 03051fb0d4
commit 797256463f
79 changed files with 405 additions and 381 deletions

View File

@ -1,4 +1,4 @@
<template>
<template>
<el-dialog
v-model="visible"
:title="dialogTitle"
@ -768,7 +768,7 @@ function browserPrint() {
min-height: 0;
.print-batch-list {
width: 250px;
width: 220px;
border-right: 1px solid #ebeef5;
background-color: #fafafa;
display: flex;

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="scan-box-container" :style="{ width }" :class="{ 'scan-box--compact': isCompact }">
<!-- Tab 切换(标准/紧凑模式均显示) -->
<div class="scan-tabs">
@ -512,6 +512,7 @@
</div>
<!-- 日期/日期时间范围 -->
<div v-else-if="isRangePickerField(field)" class="compact-field-item">
<span class="compact-field-label">{{ field.label }}</span>
<el-date-picker
v-model="customConditions[field.value].value"
:type="getRangePickerType(field)"
@ -528,6 +529,7 @@
</div>
<!-- 日期类型 -->
<div v-else-if="field.type === 'date'" class="compact-field-item">
<span class="compact-field-label">{{ field.label }}</span>
<el-date-picker
v-model="customConditions[field.value].value"
type="date"
@ -623,7 +625,7 @@ const props = defineProps({
// 组件宽度
width: {
type: String,
default: '250px'
default: '220px'
},
// 标题(紧凑模式显示)
@ -1552,7 +1554,7 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su
background: #fff;
border-right: 1px solid #e8e8e8;
box-shadow: 1px 0 2px rgba(0, 0, 0, 0.05);
width: 250px;
width: 220px;
min-width: 160px;
}
@ -1960,6 +1962,16 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su
width: 100%;
}
/* 紧凑模式字段标签 */
.compact-field-label {
display: block;
font-size: 11px;
color: #909399;
line-height: 1.4;
margin-bottom: 2px;
padding-left: 2px;
}
/* 紧凑模式输入框高度微调 */
.compact-field-item :deep(.el-input__wrapper) {
min-height: 28px;

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="shipper-signing-container">
<scan-box
ref="scanBox"
width="250px"
width="220px"
title="货主筛选"
:preset-tree="presetTree"
:available-fields="availableFields"

View File

@ -49,6 +49,8 @@ export const AFTER_SALE_SUB_TYPE_MAP: Record<string, string> = {
// -------------------- 售后状态 --------------------
export const AFTER_SALE_STATUS_MAP: Record<string, string> = {
pending: '未开始处理',
pending_feedback: '待反馈',
waiting: '等待中',
processing: '处理中',
completed: '已完成',
closed: '已关闭',
@ -57,6 +59,8 @@ export const AFTER_SALE_STATUS_MAP: Record<string, string> = {
export const AFTER_SALE_STATUS_TAG_MAP: Record<string, string> = {
pending: 'warning',
pending_feedback: 'warning',
waiting: 'info',
processing: 'primary',
completed: 'success',
closed: 'info',
@ -235,7 +239,7 @@ export const afterSaleAvailableFields = [
// -------------------- UpperTable 列配置 --------------------
export const afterSaleColumns = [
{ prop: 'after_sale_no', label: '售后单号', minWidth: '180', showOverflowTooltip: true },
{ prop: 'after_sale_no', label: '售后单号', minWidth: '180', showOverflowTooltip: true, copyAction: 'copy' as const },
{ prop: 'type', label: '售后类型', width: '100' },
{ prop: 'sub_type', label: '子类型', width: '110' },
{ prop: 'title', label: '标题', minWidth: '180', showOverflowTooltip: true },
@ -244,12 +248,13 @@ export const afterSaleColumns = [
{ prop: 'role_group', label: '角色组', width: '100' },
{ prop: 'claim_status', label: '仓库理赔', width: '100' },
{ prop: 'carrier_claim_status', label: '运方理赔', width: '100' },
{ prop: 'waybill_no', label: '运单号', width: '150', showOverflowTooltip: true },
{ prop: 'order_delivery_no', label: '发货订单号', width: '150', showOverflowTooltip: true },
{ prop: 'entry_order_no', label: '入库单号', width: '150', showOverflowTooltip: true },
{ prop: 'order_stockout_no', label: '出库单号', width: '150', showOverflowTooltip: true },
{ prop: 'receiving_no', label: '收货单号', width: '150', showOverflowTooltip: true },
{ prop: 'waybill_no', label: '运单号', width: '150', showOverflowTooltip: true, copyAction: 'copy' as const },
{ prop: 'order_delivery_no', label: '发货订单号', width: '150', showOverflowTooltip: true, copyAction: 'copy' as const },
{ prop: 'entry_order_no', label: '入库单号', width: '150', showOverflowTooltip: true, copyAction: 'copy' as const },
{ prop: 'order_stockout_no', label: '出库单号', width: '150', showOverflowTooltip: true, copyAction: 'copy' as const },
{ prop: 'receiving_no', label: '收货单号', width: '150', showOverflowTooltip: true, copyAction: 'copy' as const },
{ prop: 'resolved_at', label: '完结时间', width: '170' },
{ prop: 'followup_at', label: '跟进时间', width: '170' },
{ prop: 'created_at', label: '创建时间', width: '170' },
{ prop: 'actions', label: '操作', width: '100', fixed: 'right' },
]
@ -257,7 +262,9 @@ export const afterSaleColumns = [
// -------------------- 工具栏按钮 --------------------
export const afterSaleToolbarButtons: ToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'refresh' },
{ key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' },
{ key: 'export', label: '导出', category: 'action', size: 'small', type: 'success', loadingKey: 'exportLoading', action: 'handleExport' },
]

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="afterSale-list"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:available-fields="availableFields"
@ -39,6 +39,8 @@
:pagination="upperPagination"
:show-index="true"
:show-actions="true"
:enable-column-config="true"
:column-config-schema-version="1"
:loading="loading"
:query-time="queryTime"
row-key="id"
@ -337,6 +339,7 @@ function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
const toolbarActionMap: Record<string, () => void> = {
refresh: () => handleRefresh(),
handleExport: () => handleExport(),
openColumnConfigPanel: () => { upperTable.value?.openColumnConfig?.() },
}
function handleToolbarButtonClick(action: string) {

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="approve-container">
<!-- 审核表单 -->
<div v-if="!loading" class="approve-form">
@ -796,7 +796,7 @@ onMounted(() => {
.info-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
gap: 16px;
margin-bottom: 20px;
}

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【页面模板 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -47,7 +47,7 @@
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="order-sub-container">
<scan-box
ref="scanBox"
width="250px"
width="220px"
title="打包筛选"
:available-fields="availableFields"
@condition-change="handleConditionChange"

View File

@ -131,11 +131,17 @@ export const packingColumns = [
{ prop: 'order_id', label: '订单ID', width: 100 },
{ prop: 'waybill_code', label: '运单号', minWidth: 160, copyAction: 'copy' as const, copyValue: (row: any) => getWaybill(row), formatter: (row: any) => getWaybill(row) || '—' },
{ prop: 'wave_no', label: '波次号', minWidth: 140, copyAction: 'copy' as const },
{ prop: 'warehouse_id', label: '仓库ID', width: 100 },
{ prop: 'operator_text', label: '打包员', width: 100 },
{ prop: 'workbench_info', label: '工作台', width: 120, formatter: (row: any) => row.workbench_name || '—' },
{ prop: 'workbench_name', label: '工作台', width: 120, formatter: (row: any) => row.workbench_name || '—' },
{ prop: 'workbench_barcode', label: '工作台条码', width: 130 },
{ prop: 'pack_quantity', label: '打包数量', width: 100, sortable: true },
{ prop: 'item_quantity', label: '商品数量', width: 100 },
{ prop: 'sku_count', label: 'SKU数', width: 80 },
{ prop: 'pack_mode', label: '打包模式', width: 100 },
{ prop: 'status', label: '任务状态', width: 100 },
{ prop: 'device_ids', label: '设备ID', width: 120, formatter: (row: any) => (row.device_ids || []).join(',') || '—' },
{ prop: 'remark', label: '备注', minWidth: 120 },
{ prop: 'start_time', label: '开始时间', width: 170, sortable: true, formatter: (row: any) => row.start_time ? dayjs(row.start_time).format('YYYY-MM-DD HH:mm:ss') : '—' },
{ prop: 'end_time', label: '结束时间', width: 170, sortable: true, formatter: (row: any) => row.end_time ? dayjs(row.end_time).format('YYYY-MM-DD HH:mm:ss') : '—' },
{ prop: 'pack_duration', label: '打包时长', width: 120, formatter: (row: any) => {

View File

@ -192,7 +192,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
key: 'main_waybill_code',
label: '主单号',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic },
table: { minWidth: 170, showOverflowTooltip: true },
table: { minWidth: 170, copyAction: 'copy', showOverflowTooltip: true },
slot: null,
detailLabel: '主单号'
},
@ -208,7 +208,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
key: 'order_no',
label: '订单号',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic },
table: { minWidth: 160, showOverflowTooltip: true },
table: { minWidth: 160, copyAction: 'copy', showOverflowTooltip: true },
slot: null,
detailLabel: '订单号'
},
@ -216,10 +216,18 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
key: 'order_id',
label: '订单ID',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic },
table: { minWidth: 90, align: 'center' },
table: { minWidth: 90, align: 'center', copyAction: 'copy' },
slot: null,
detailLabel: '订单ID'
},
source_order_codes: {
key: 'source_order_codes',
label: '平台交易单号',
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic },
table: { minWidth: 160, copyAction: 'copy', showOverflowTooltip: true },
slot: null,
detailLabel: '平台交易单号'
},
keyword: {
key: 'keyword',
label: '关键词',
@ -251,6 +259,14 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
slot: null,
detailLabel: '货主名称'
},
store_remark_name: {
key: 'store_remark_name',
label: '货主备注',
scanBox: null,
table: { minWidth: 120, showOverflowTooltip: true },
slot: null,
detailLabel: '货主备注名'
},
order_type: {
key: 'order_type',
label: '订单类型',
@ -868,14 +884,15 @@ export const tabPages: TabPageRawConfig[] = [
'waybill_type',
'order_no',
'order_id',
'source_order_codes',
'business_key',
'warehouse_name',
'store_remark_name',
'logistics_code',
'logistics_name',
'logistics_interface_name',
'platform_code',
'package_material_name',
'pack_status',
'status',
'status_text',
'is_back',

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【页面模板 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -47,7 +47,7 @@
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -796,7 +796,7 @@ onMounted(() => {
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container">
<scan-box
ref="scanBox"
cache-key="inbox:group"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:available-fields="availableFields"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container">
<scan-box
ref="scanBox"
cache-key="inbox:message"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:available-fields="availableFields"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="material-package-material"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【页面模板 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -47,7 +47,7 @@
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -676,7 +676,7 @@ onMounted(() => {
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="material-package-supplier"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="workOrder-list"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:available-fields="availableFields"
@ -26,12 +26,13 @@
</div>
</div>
<div class="split-stack">
<div class="upper-wrapper">
<div class="split-stack" ref="splitStackRef">
<div class="upper-wrapper" :style="detailVisible ? upperPaneStyle : upperPaneFullStyle">
<upper-table
ref="upperTable"
title="我的工单"
default-align="center"
:enable-column-config="true"
table-id="workOrder-list"
:data="tableData"
:columns="columns"
@ -105,6 +106,80 @@
</template>
</upper-table>
</div>
<template v-if="detailVisible">
<div
class="pane-resizer"
title="拖动调整列表与详情区域高度"
@mousedown="beginSplitDrag"
/>
<div class="lower-level" v-if="selectedRow" :class="tableSize" :style="lowerPaneStyle">
<div class="detail-header">
<el-tabs v-model="activeTab" class="detail-tab">
<el-tab-pane label="工单详情" name="detail" />
</el-tabs>
</div>
<div class="detail-container">
<div v-if="activeTab === 'detail'" class="detail-page">
<el-descriptions :column="2" border size="small">
<el-descriptions-item label="工单号">{{ selectedRow.after_sale_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="售后类型">
<el-tag size="small" :type="typeTagType(selectedRow.type)">
{{ typeLabel(selectedRow.type) }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="子类型">{{ subTypeLabel(selectedRow.sub_type) }}</el-descriptions-item>
<el-descriptions-item label="标题">{{ selectedRow.title || '—' }}</el-descriptions-item>
<el-descriptions-item label="状态">
<el-tag size="small" :type="statusTagType(selectedRow.status)">
{{ statusLabel(selectedRow.status) }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="优先级">{{ selectedRow.priority ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="角色组">
<el-tag v-if="selectedRow.role_group" size="small" :type="roleGroupTagType(selectedRow.role_group)">
{{ roleGroupLabel(selectedRow.role_group) }}
</el-tag>
<span v-else>—</span>
</el-descriptions-item>
<el-descriptions-item label="仓库理赔">
<el-tag v-if="selectedRow.claim_status" size="small" :type="claimStatusTagType(selectedRow.claim_status)">
{{ claimStatusLabel(selectedRow.claim_status) }}
</el-tag>
<span v-else>—</span>
</el-descriptions-item>
<el-descriptions-item label="运方理赔">
<el-tag v-if="selectedRow.carrier_claim_status" size="small" :type="claimStatusTagType(selectedRow.carrier_claim_status)">
{{ claimStatusLabel(selectedRow.carrier_claim_status) }}
</el-tag>
<span v-else>—</span>
</el-descriptions-item>
<el-descriptions-item label="详细描述" :span="2">{{ selectedRow.description || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联运单号">{{ selectedRow.waybill_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联发货订单号">{{ selectedRow.order_delivery_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联入库单号">{{ selectedRow.entry_order_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联出库单号">{{ selectedRow.order_stockout_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联收货单号">{{ selectedRow.receiving_no || '—' }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ selectedRow.created_at || '—' }}</el-descriptions-item>
<el-descriptions-item label="更新时间">{{ selectedRow.updated_at || '—' }}</el-descriptions-item>
<el-descriptions-item label="处理结果" :span="2">{{ selectedRow.resolution || '—' }}</el-descriptions-item>
</el-descriptions>
<div class="detail-actions" style="margin-top:12px">
<el-button size="small" type="primary" @click.stop="handleViewDetail(selectedRow)">
查看完整详情
</el-button>
</div>
</div>
</div>
</div>
<div class="no-selection" v-else :style="lowerPaneStyle">
<div class="empty-tip">
<p>请从上方列表中选择一项查看详情</p>
</div>
</div>
</template>
</div>
</div>
@ -144,6 +219,7 @@ import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/Ord
import CreateAfterSaleDialog from './components/CreateAfterSaleDialog.vue'
import AfterSaleDetailDialog from '@/views/afterSale/detail/AfterSaleDetailDialog.vue'
import { useSettingsStore } from '@/stores/modules/settings'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import { safeInvoke } from '@/utils/safe-invoke'
// ==================== 工具函数 ====================
@ -162,6 +238,22 @@ const settingsStore = useSettingsStore()
const shortcutExpanded = computed(() => settingsStore.shortcutExpanded)
const containerHeight = computed(() => shortcutExpanded.value ? 'calc(100vh - 150px)' : 'calc(100vh - 100px)')
const {
splitStackRef,
beginSplitDrag,
lowerPaneStyle,
upperPaneStyle,
} = useVerticalSplitPane({ defaultLowerPercent: 40 })
const upperPaneFullStyle = computed(() => ({
flex: '1 1 auto',
minHeight: '0',
overflow: 'hidden',
}))
const detailVisible = ref(true)
const activeTab = ref('detail')
// ==================== 售后明细弹窗 ====================
const detailDialogVisible = ref(false)
const detailAfterSaleId = ref<number | null>(null)
@ -179,12 +271,23 @@ const tableSize = 'small'
const toolbarButtons: ToolbarButtonConfig[] = [
{ key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'refresh' },
{ key: 'create', label: '发起售后单', category: 'action', size: 'small', type: 'primary', action: 'showCreateDialog' },
{ key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' },
{
key: 'toggleDetail',
label: '显示详情',
dynamicLabelKey: 'detailToggleLabel',
category: 'setting',
size: 'small',
action: 'toggleDetailVisible'
},
]
// ==================== 按钮状态 ====================
const buttonLoadingMap = computed(() => ({ loading: loading.value }))
const buttonDisabledMap = computed(() => ({}))
const buttonLabelMap = computed(() => ({}))
const buttonLabelMap = computed(() => ({
detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情',
}))
const toolbarLayoutKey = computed(() =>
JSON.stringify({
@ -210,6 +313,8 @@ function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) {
const toolbarActionMap: Record<string, () => void> = {
refresh: () => handleRefresh(),
showCreateDialog: () => { createDialogVisible.value = true },
openColumnConfigPanel: () => upperTable.value?.openColumnConfig?.(),
toggleDetailVisible: () => { detailVisible.value = !detailVisible.value },
}
function handleToolbarButtonClick(action: string) {
@ -225,10 +330,15 @@ const loading = ref(false)
const queryTime = ref(0)
const tableData = ref<any[]>([])
const currentConditions = ref<Record<string, any>>({})
const selectedId = ref<number | null>(null)
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const upperPagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
const selectedRow = computed(() => {
return tableData.value.find((i: any) => i.id === selectedId.value) || null
})
// ==================== ScanBox 事件 ====================
function handleConditionChange(conditions: Record<string, any>) {
currentConditions.value = conditions ?? {}
@ -248,8 +358,8 @@ function handleConditionClear() {
upperPagination.currentPage = 1
fetchData()
}
function handleRowClick(_row: any) {
// row click handled via column-actions
function handleRowClick(row: any) {
selectedId.value = row?.id ?? null
}
// ==================== 数据查询 ====================
@ -338,54 +448,6 @@ onMounted(() => {
})
</script>
<style scoped>
.order-sub-container {
display: flex;
height: 100%;
}
.main-content {
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden;
padding: 0 8px;
}
.toolbar {
display: flex;
align-items: center;
justify-content: space-between;
padding: 8px 0;
flex-shrink: 0;
}
.toolbar-left {
display: flex;
align-items: center;
gap: 8px;
}
.split-stack {
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden;
}
.upper-wrapper {
flex: 1;
overflow: hidden;
}
.wave-operation-actions {
display: flex;
align-items: center;
gap: 4px;
}
.empty-tip {
color: #909399;
font-size: 14px;
}
<style scoped lang="scss">
@use "../order/orderManagement/styles/order-sub.scss";
</style>

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【页面模板 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -47,7 +47,7 @@
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -676,7 +676,7 @@ onMounted(() => {
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:archiveOrder"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:deliveryException"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:deliveryOrder"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:entrustWarehouse"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:exceptionOrder"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:outboundOrder"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:pendingOrder"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="orderManagement:reviewOrder"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,11 +1,11 @@
.order-sub-container {
.order-sub-container {
display: flex;
height: 100%;
width: 100%;
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
:cache-key="props.scanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -399,7 +399,7 @@
<scan-box
ref="fallbackOrderScanBox"
:cache-key="groupWaveFallbackScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:available-fields="fallbackOrderAvailableFieldsRef"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
:cache-key="props.scanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container">
<scan-box
ref="scanBox"
:cache-key="props.scanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -2,7 +2,7 @@
<div class="pending-order-panel">
<scan-box
ref="scanBox"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"
@ -668,6 +668,6 @@ async function loadStoreOptions() {
}
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
}
</style>

View File

@ -1,4 +1,4 @@
/** 波次管理页面配置 */
/** 波次管理页面配置 */
export const WAVE_PAGE_CONFIG = {
/**
* 单页模式:开启后不显示「团购波次」「散单波次」等标签切换区域,
@ -80,9 +80,9 @@ export type WaveToolbarButtonConfig = ToolbarButtonConfig & {
onlyForWaveType?: 1 | 2
}
/** ScanBox 默认 props(全站 scan-box 侧栏宽度统一为 250px) */
/** ScanBox 默认 props(全站 scan-box 侧栏宽度统一为 220px) */
export const waveScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="order-management-wrapper" :style="{ height: containerHeight }">
<!-- ===== 多标签模式:显示顶部多标签页 ===== -->
<template v-if="WAVEORDER2_PAGE_CONFIG.showTabArea && !WAVEORDER2_PAGE_CONFIG.singlePage">
@ -25,7 +25,7 @@
<scan-box
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container">
<scan-box
ref="scanBox"
cache-key="stock-combo-goods"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="order-sub-container">
<scan-box
ref="scanBox"
width="250px"
width="220px"
title="商品筛选"
:preset-tree="presetTree"
:available-fields="availableFields"

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="store-stock-container">
<div class="search-container">
<el-input
@ -6,7 +6,7 @@
placeholder="请输入外部编码(多个用逗号、竖线、空格或换行分隔)"
clearable
size="small"
style="width: 250px; margin-right: 10px;"
style="width: 220px; margin-right: 10px;"
@keyup.enter="handleSearch"
@blur="normalizeSearchParams"
/>
@ -15,7 +15,7 @@
placeholder="请输入外部商品名称(多个用逗号、竖线、空格或换行分隔)"
clearable
size="small"
style="width: 250px; margin-right: 10px;"
style="width: 220px; margin-right: 10px;"
@keyup.enter="handleSearch"
@blur="normalizeSearchParams"
/>

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="stock-management-warehouse"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,4 +1,4 @@
import {
import {
scanWorkflowField,
type ToolbarButtonConfig
} from '@/views/order/orderManagement/config/order-common-config'
@ -38,7 +38,7 @@ export function stockScanBasicField(field: Record<string, any>) {
/** ScanBox 默认 props(与波次模块 scan-box 侧栏一致) */
export const stockScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -1,4 +1,4 @@
/** ScanBox 基础信息分组(对齐收货/待处理订单排版) */
/** ScanBox 基础信息分组(对齐收货/待处理订单排版) */
export const ENTRY_SCAN_BASIC_INFO_GROUP = '基础信息'
/** ScanBox 流程状态分组 */
@ -30,7 +30,7 @@ export function entryScanTimeField(field: Record<string, any>): EntryScanFieldCo
/** ScanBox 默认 props(与波次模块 scan-box 侧栏一致) */
export const entryScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="storage-entry"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="storage-entry-owner"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="storage-inventory"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,4 +1,4 @@
import { scanWorkflowField } from '@/views/order/orderManagement/config/order-common-config'
import { scanWorkflowField } from '@/views/order/orderManagement/config/order-common-config'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
@ -80,7 +80,7 @@ export function inventoryScanBasicField(field: Record<string, any>): InventorySc
/** ScanBox 默认 props(与波次模块 scan-box 侧栏一致) */
export const inventoryScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="storage-log"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,4 +1,4 @@
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
/** 出入库记录列表主工具栏按钮(action 与 log/index.vue 内 toolbarActionMap 键一致)
* 排序与样式分类对齐 storage/receiving:
@ -62,7 +62,7 @@ export function logScanTimeField(field: Record<string, any>): LogScanFieldConfig
/** ScanBox 默认 props(与波次模块 scan-box 侧栏一致) */
export const logScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -5,7 +5,7 @@
<scan-box
ref="scanBox"
cache-key="storage-productflow"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -604,7 +604,7 @@ onMounted(() => {
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -1,11 +1,11 @@
<template>
<template>
<div class="page-wrapper" :style="{ height: containerHeight }">
<div class="main-container">
<div class="order-sub-container">
<scan-box
ref="scanBox"
cache-key="store-productflow"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -597,7 +597,7 @@ onMounted(() => {
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="product-details">
<div class="header-actions">
<div class="left-actions">
@ -2613,7 +2613,7 @@ onUnmounted(() => {
.product-window {
position: fixed;
z-index: 2000;
width: 1250px;
width: 1220px;
height: 700px;
background: #fff;
border: 1px solid #ebeef5;

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="storage-receiving"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -1,4 +1,4 @@
import {
import {
type ToolbarButtonConfig
} from '@/views/order/orderManagement/config/order-common-config'
@ -55,7 +55,7 @@ export function receivingScanTimeField(field: Record<string, any>): ReceivingSca
/** ScanBox 默认 props(与波次模块 scan-box 侧栏一致) */
export const receivingScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="storage-receiving-owner"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -1,4 +1,4 @@
import dayjs from 'dayjs'
import dayjs from 'dayjs'
import type { StockReportListItem } from '@/api/stock.report/stock.report'
export const reportFieldLabels: Record<string, string> = {
@ -180,7 +180,7 @@ export function reportScanField<G extends ReportScanFieldGroupKey>(
/** ScanBox 默认 props(与波次模块 scan-box 侧栏一致) */
export const reportScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -3,7 +3,7 @@
<scan-box
ref="scanBox"
cache-key="storage-stockout"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:initial-conditions="initialConditions"

View File

@ -1,4 +1,4 @@
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
/** 出库单列表主工具栏按钮(action 与 stockout/index.vue 内 toolbarActionMap 键一致)
* 排序与样式分类对齐 storage/receiving:
@ -92,7 +92,7 @@ export function stockoutScanTimeField(field: Record<string, any>): StockoutScanF
/** ScanBox 默认 props(与波次模块 scan-box 侧栏一致) */
export const stockoutScanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' } as const,
autoSubmit: false
}

View File

@ -1,4 +1,4 @@
/** 有效期页面:ScanBox / UpperTable / 详情面板 集中配置 */
/** 有效期页面:ScanBox / UpperTable / 详情面板 集中配置 */
export const availableFields = [
{ label: '商品ID', value: 'stock_id', type: 'text' },
@ -24,7 +24,7 @@ export const availableFields = [
]
export const scanBoxConfig = {
width: '250px',
width: '220px',
treeProps: { children: 'children', label: 'label' },
autoSubmit: false
}

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="shipper-signing"
width="250px"
width="220px"
title="货主筛选"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="store-stores"
width="250px"
width="220px"
title="货主筛选"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="encoding-sub-container">
<!-- <scan-box
ref="scanBox"
cache-key="encoding:courierCode"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="encoding-sub-container">
<!-- <scan-box
ref="scanBox"
cache-key="encoding:platformCode"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,11 +1,11 @@
.encoding-sub-container {
.encoding-sub-container {
display: flex;
height: 100%;
width: 100%;
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【页面模板 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -47,7 +47,7 @@
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -836,7 +836,7 @@ onMounted(() => {
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="permission-container">
<!-- 左侧树 -->
<div class="left-panel">
@ -520,7 +520,7 @@ onMounted(() => {
box-sizing: border-box;
.left-panel {
width: 250px;
width: 220px;
background: #fff;
border-radius: 4px;
display: flex;

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="printer-management-container">
<!-- <ScanBox
ref="scanBox"
width="250px"
width="220px"
:preset-tree="presetTree"
:available-fields="availableFields"
@condition-change="onScanConditionChange"

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="template-editor" :class="{ uneditable: !editable }">
<div class="editor-header">
<div class="template-info">
@ -1582,7 +1582,7 @@ const handleAddImageConfirm = async () => {
}
.template-elements {
height: 250px;
height: 220px;
display: flex;
flex-direction: column;
border-top: 1px solid #eaeaea;

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【页面模板 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -47,7 +47,7 @@
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -830,7 +830,7 @@ onMounted(() => {
background-color: #f0f2f5;
:deep(.scan-box-container) {
flex: 0 0 250px;
flex: 0 0 220px;
flex-shrink: 0;
height: 100%;
}

View File

@ -1,4 +1,4 @@
<template>
<template>
<div class="role-container">
<!-- 左侧树 -->
<div class="left-panel">
@ -638,7 +638,7 @@ onMounted(() => {
box-sizing: border-box;
.left-panel {
width: 250px;
width: 220px;
background: #fff;
border-radius: 4px;
display: flex;

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,8 +1,8 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【工作台管理 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -23,7 +23,7 @@
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"

View File

@ -1,9 +1,9 @@
<template>
<div class="video-container" :style="{ height: containerHeight }">
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="video-camera"
width="250px"
width="220px"
title="摄像头筛选"
:preset-tree="presetTree"
:available-fields="availableFields"
@ -866,37 +866,60 @@ onMounted(() => {
})
</script>
<style scoped>
.video-container {
display: flex;
gap: 12px;
padding: 12px;
box-sizing: border-box;
}
<style scoped lang="scss">
/* ===== 引入 waveOrder 共享样式(scan-box / toolbar / split-stack / pane-resizer / lower-level 等) ===== */
@use "../../order/orderManagement/styles/order-sub.scss";
.main-content {
flex: 1;
display: flex;
flex-direction: column;
min-width: 0;
}
/* ===== 覆盖 ScanBox"筛选/过滤"标签样式(对齐页面顶部 TabArea 风格) ===== */
.order-sub-container {
:deep(.scan-box-container .scan-tabs) {
flex-shrink: 0;
border-bottom: 1px solid #e8eef7;
background: #f8fbff;
}
.toolbar {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 12px;
}
:deep(.scan-box-container .scan-tabs .el-tabs__header) {
margin: 0;
padding: 4px 8px 0;
}
.toolbar-left {
display: flex;
align-items: center;
gap: 12px;
}
:deep(.scan-box-container .scan-tabs .el-tabs__nav-wrap::after) {
display: none;
}
.upper-wrapper {
flex: 1;
:deep(.scan-box-container .scan-tabs .el-tabs__active-bar) {
display: none;
}
:deep(.scan-box-container .scan-tabs .el-tabs__item) {
height: 38px;
line-height: 38px;
font-size: 14px;
font-weight: 500;
padding: 0 20px;
color: #606266;
border: 1px solid transparent;
border-bottom: none;
border-radius: 6px 6px 0 0;
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
margin-right: 4px;
}
:deep(.scan-box-container .scan-tabs .el-tabs__item:hover) {
color: #409eff;
background-color: rgba(64, 158, 255, 0.05);
}
:deep(.scan-box-container .scan-tabs .el-tabs__item.is-active) {
color: #409eff;
font-weight: 600;
background: #ffffff;
border-color: #e8eef7;
border-bottom-color: #fff;
}
}
</style>
@use "../../order/orderManagement/styles/order-sub.scss";
.empty-tip {
color: #909399;

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="video-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="video-camera-server"
width="250px"
width="220px"
title="录像服务器筛选"
:preset-tree="presetTree"
:available-fields="availableFields"

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 【页面模板 v2】— 基于 waveOrder2 架构设计 ║
╚══════════════════════════════════════════════════════════════╝
@ -41,13 +41,12 @@
</template>
<!-- ===== 主内容区 ===== -->
<div class="main-container">
<div class="order-sub-container">
<div class="order-sub-container">
<!-- 左侧:ScanBox 筛选面板 -->
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
@ -228,7 +227,6 @@
</div>
</transition>
</div>
</div>
</div>
<!-- ===== 功能按钮表单(pages/ 目录下的组件) ===== -->
@ -870,73 +868,7 @@ onMounted(() => {
}
/* ================================================================
2. 主内容区容器
================================================================ */
.main-container {
flex: 1;
display: flex;
flex-direction: column;
min-height: 0;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 0 0 6px 6px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
overflow: hidden;
}
/* ================================================================
3. ScanBox"筛选/过滤"标签样式(对齐页面顶部 TabArea 风格)
================================================================ */
.main-container {
:deep(.scan-box-container .scan-tabs) {
flex-shrink: 0;
border-bottom: 1px solid #e8eef7;
background: #f8fbff;
}
:deep(.scan-box-container .scan-tabs .el-tabs__header) {
margin: 0;
padding: 4px 8px 0;
}
:deep(.scan-box-container .scan-tabs .el-tabs__nav-wrap::after) {
display: none;
}
:deep(.scan-box-container .scan-tabs .el-tabs__active-bar) {
display: none;
}
:deep(.scan-box-container .scan-tabs .el-tabs__item) {
height: 38px;
line-height: 38px;
font-size: 14px;
font-weight: 500;
padding: 0 20px;
color: #606266;
border: 1px solid transparent;
border-bottom: none;
border-radius: 6px 6px 0 0;
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
margin-right: 4px;
}
:deep(.scan-box-container .scan-tabs .el-tabs__item:hover) {
color: #409eff;
background-color: rgba(64, 158, 255, 0.05);
}
:deep(.scan-box-container .scan-tabs .el-tabs__item.is-active) {
color: #409eff;
font-weight: 600;
background: #ffffff;
border-color: #e8eef7;
border-bottom-color: #fff;
}
}
/* ================================================================
4. 过渡动画
2. 过渡动画
================================================================ */
.tab-content-inner {
flex: 1;
@ -957,7 +889,7 @@ onMounted(() => {
}
/* ================================================================
5. 空状态
3. 空状态
================================================================ */
.empty-tip {
font-size: 13px;
@ -965,7 +897,7 @@ onMounted(() => {
}
/* ================================================================
6. OSD 弹窗样式
4. OSD 弹窗样式
================================================================ */
.osd-camera-info {
padding: 8px 12px;

View File

@ -196,10 +196,26 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
key: 'port',
label: '端口',
scanBox: null,
table: { width: 80, align: 'center' },
table: null,
slot: null,
detailLabel: '端口'
},
public_port: {
key: 'public_port',
label: '公网端口',
scanBox: null,
table: { width: 90, align: 'center' },
slot: null,
detailLabel: '公网端口'
},
internal_port: {
key: 'internal_port',
label: '内网端口',
scanBox: null,
table: { width: 90, align: 'center' },
slot: null,
detailLabel: '内网端口'
},
username: {
key: 'username',
label: '用户名',
@ -624,9 +640,9 @@ export const tabPages: TabPageRawConfig[] = [
scanBoxCacheKey: 'video-camera-server',
scanBoxFieldKeys: ['quickWhere', 'name', 'status'],
tableColumnKeys: [
'id', 'name', 'public_ip',
'internal_ip', 'port', 'username', 'status',
'remark', 'connectivity', 'created_at', 'updated_at', 'operation'
'id', 'name', 'brand', 'public_ip',
'internal_ip', 'public_port', 'internal_port', 'username', 'status',
'remark', 'created_at', 'updated_at', 'operation'
],
upperTableDefaults: {
title: '录像服务器列表',
@ -641,7 +657,7 @@ export const tabPages: TabPageRawConfig[] = [
{
title: '基础信息',
columnCount: 3,
fieldKeys: ['id', 'name', 'public_ip', 'internal_ip', 'port', 'username', 'status', 'remark'],
fieldKeys: ['id', 'name', 'brand', 'public_ip', 'internal_ip', 'public_port', 'internal_port', 'username', 'status', 'remark'],
},
{
title: '时间信息',

View File

@ -1,4 +1,4 @@
<!--
<!--
╔══════════════════════════════════════════════════════════════╗
║ 录像服务器管理 — 基于 newcamara 页面模板 v2 架构 ║
╚══════════════════════════════════════════════════════════════╝
@ -17,21 +17,20 @@
</template>
<!-- ===== 主内容区 ===== -->
<div class="main-container">
<div class="order-sub-container">
<!-- 左侧:ScanBox 筛选面板 -->
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="250px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
:available-fields="currentScanBoxFields"
@condition-change="handleConditionChange"
@reset="handleConditionReset"
@condition-clear="handleConditionClear"
/>
<div class="order-sub-container">
<!-- 左侧:ScanBox 筛选面板 -->
<ScanBox
ref="scanBoxRef"
:cache-key="currentScanBoxCacheKey"
width="220px"
:tree-props="{ children: 'children', label: 'label' }"
:auto-submit="false"
:preset-tree="presetTree"
:available-fields="currentScanBoxFields"
@condition-change="handleConditionChange"
@reset="handleConditionReset"
@condition-clear="handleConditionClear"
/>
<!-- 右侧:内容区 -->
<div class="main-content">
@ -118,7 +117,6 @@
</transition>
</div>
</div>
</div>
<!-- ===== 新增/编辑弹窗 ===== -->
<ServerFormDialog
@ -471,58 +469,6 @@ onMounted(() => { loadData() })
overflow: hidden;
}
.main-container {
flex: 1;
display: flex;
flex-direction: column;
min-height: 0;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 0 0 6px 6px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
overflow: hidden;
:deep(.scan-box-container .scan-tabs) {
flex-shrink: 0;
border-bottom: 1px solid #e8eef7;
background: #f8fbff;
}
:deep(.scan-box-container .scan-tabs .el-tabs__header) {
margin: 0;
padding: 4px 8px 0;
}
:deep(.scan-box-container .scan-tabs .el-tabs__nav-wrap::after) {
display: none;
}
:deep(.scan-box-container .scan-tabs .el-tabs__active-bar) {
display: none;
}
:deep(.scan-box-container .scan-tabs .el-tabs__item) {
height: 38px;
line-height: 38px;
font-size: 14px;
font-weight: 500;
padding: 0 20px;
color: #606266;
border: 1px solid transparent;
border-bottom: none;
border-radius: 6px 6px 0 0;
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
margin-right: 4px;
}
:deep(.scan-box-container .scan-tabs .el-tabs__item:hover) {
color: #409eff;
background-color: rgba(64, 158, 255, 0.05);
}
:deep(.scan-box-container .scan-tabs .el-tabs__item.is-active) {
color: #409eff;
font-weight: 600;
background: #ffffff;
border-color: #e8eef7;
border-bottom-color: #fff;
}
}
.tab-content-inner {
flex: 1;
display: flex;

View File

@ -1,9 +1,9 @@
<template>
<template>
<el-dialog
v-model="visible"
title="导入批量修改"
width="1000px"
top="calc(50% - 250px)"
top="calc(50% - 220px)"
align-center
:close-on-click-modal="false"
destroy-on-close

View File

@ -1,9 +1,9 @@
<template>
<template>
<div class="order-sub-container" :style="{ height: containerHeight }">
<scan-box
ref="scanBox"
cache-key="warehouses-list"
width="250px"
width="220px"
title="仓库筛选"
:auto-submit="false"
:preset-tree="presetTree"