From 2a37739b7db63746c72f9fa74a84615b97e33adf Mon Sep 17 00:00:00 2001
From: yin <3313488199@qq.com>
Date: Thu, 12 Nov 2026 18:01:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor(detail):=20=E8=AF=A6=E6=83=85=E4=B8=8E?=
=?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E7=BB=9F=E4=B8=80=E8=BF=81?=
=?UTF-8?q?=E7=A7=BB=20UpperTable=EF=BC=8C=E4=BB=BB=E5=8A=A1=E8=BF=9B?=
=?UTF-8?q?=E5=BA=A6=E6=94=AF=E6=8C=81=E6=94=B6=E8=B5=B7=E4=B8=BA=E6=B5=AE?=
=?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 新增 TaskProgressFloatWidget;TaskProgressDialog 增加 minimizable 与 minimize
事件,运行中可「收起后台」,浮窗继续轮询并支持点击还原窗口,
运单页「更新揽收状态」已接入
- UpperTable 新增 #pagination-info 插槽(支持「已选 N 项」等精简文案),
运单号列对齐方式透传给 WaybillCodeActions
- 盘点、入库、出库、收货、波次、订单明细、库存详情、仓库与店铺等 20+ 处
日志/明细列表由 el-table 迁移至 UpperTable,统一分页、行选择、
虚拟滚动、状态文本样式与列插槽
- 拆包录像列表、出库单详情表单、运单称重弹窗等按 task-panel 结构统一;
运单轨迹浮层支持拖动并复用 task-panel 标题与关闭样式
- 补充相关样式,修正内嵌表格高度与分页区布局,避免卡片阴影与高度塌陷
---
src/components/TaskProgressDialog.vue | 23 +-
src/components/UpperTable/index.vue | 6 +-
.../task-progress/TaskProgressFloatWidget.vue | 154 +++++++
src/components/waybill/WaybillCodeActions.vue | 18 +-
src/components/waybill/WaybillTraceFloat.vue | 83 ++--
src/components/waybill/WaybillTraceList.vue | 7 +-
.../typelist/config/components/LogPanel.vue | 191 ++++++---
.../config/components/LogPanel.vue | 162 +++----
src/views/express/returnUnpack/index.vue | 157 +++++--
src/views/express/waybill/index.vue | 57 ++-
src/views/mode/config/components/LogPanel.vue | 162 +++----
.../component/ExpressWaybillPanel.vue | 230 ++++++++--
.../component/OrderItemsDetailPanel.vue | 206 ++++-----
.../order/orderManagement/component/log.vue | 186 ++++----
.../orderWeighing/ExpressWeighingForm.vue | 403 ++++++++++++++----
.../order/waveOrder/WavePickTaskListPanel.vue | 220 ++++++----
src/views/stock/external_stock/index.vue | 13 +-
src/views/stock/stock/component/erpStock.vue | 147 ++++---
src/views/stock/stock/component/info.vue | 307 ++++++-------
src/views/stock/stock/component/log.vue | 213 +++++----
src/views/stock/stock/component/storage.vue | 301 ++++++-------
.../entry/component/DirectInboundLogs.vue | 26 +-
.../entry/component/EntryBindingRelations.vue | 17 +-
.../storage/entry/component/entrydetail.vue | 26 +-
src/views/storage/entry/component/log.vue | 26 +-
src/views/storage/entry_owner/index.vue | 5 +-
.../config/components/LogPanel.vue | 190 ++++++---
.../inventory/component/panelstockdetail.vue | 35 +-
.../management/replenishmentDemand/index.vue | 243 ++++++-----
.../storage/receiving/component/Logs.vue | 26 +-
.../storage/receiving/component/Product.vue | 10 +-
.../storage/receiving/component/Storage.vue | 27 +-
src/views/storage/receiving_owner/index.vue | 5 +-
.../config/components/CheckItemsPanel.vue | 10 +-
.../config/components/CheckRecordsPanel.vue | 22 +-
.../stockcheck/config/components/LogPanel.vue | 162 +++----
src/views/storage/stockout/component/log.vue | 24 +-
.../storage/stockout/component/product.vue | 18 +-
.../stockout/component/stockoutdetail.vue | 324 ++++++++++----
src/views/store/stores/index.vue | 69 +--
.../newview/config/components/LogPanel.vue | 190 ++++++---
src/views/warehouses/index.vue | 147 +++----
42 files changed, 3045 insertions(+), 1803 deletions(-)
create mode 100644 src/components/task-progress/TaskProgressFloatWidget.vue
diff --git a/src/components/TaskProgressDialog.vue b/src/components/TaskProgressDialog.vue
index cdc4e6a9..7403a2ae 100644
--- a/src/components/TaskProgressDialog.vue
+++ b/src/components/TaskProgressDialog.vue
@@ -19,6 +19,15 @@
@close="emit('close')"
>
+
+ 收起后台
+
()
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
(e: 'close'): void
+ (e: 'minimize'): void
}>()
const normalizedPercent = computed(() => {
@@ -83,7 +95,12 @@ const tipText = computed(() => {
return ''
})
-const footerHint = computed(() =>
- progressState.value === 'running' ? '任务处理中,请稍候' : '任务已结束,可关闭窗口'
-)
+const footerHint = computed(() => {
+ if (progressState.value === 'running') {
+ return props.minimizable
+ ? '任务在后台执行,可收起窗口继续操作,不会中断'
+ : '任务处理中,请稍候'
+ }
+ return '任务已结束,可关闭窗口'
+})
diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue
index 1804667c..751f534b 100644
--- a/src/components/UpperTable/index.vue
+++ b/src/components/UpperTable/index.vue
@@ -109,6 +109,7 @@
:codes="getWaybillCellCodes(scope.row, column)"
:label="column.label || '运单号'"
:collapse="column.copyMultiCollapse === true"
+ :align="column.align || defaultAlign"
/>
-
-
-
-
-
-
- {{ row.camera_name || '-' }}
-
-
-
- {{ videoStatusLabel(row.status) }}
-
-
-
-
-
- 播放
- 录像不可用
- 不可播放
-
-
+
+
+
+
+
+
+
+ 已选 {{ count }} 项
-
- 暂无录像
+ {{ row.camera_name || '-' }}
+
+ {{ videoStatusLabel(row.status) }}
-
-
+
+ 播放
+ 录像不可用
+ 不可播放
+
+
@@ -852,6 +852,31 @@ const videoListLoading = ref(false)
const videoListRows = ref
([])
const videoPagination = reactive({ currentPage: 1, pageSize: 10, total: 0 })
+/** 拆包录像列配置(UpperTable) */
+const videoColumns = [
+ { prop: 'id', label: '录像ID', width: '90' },
+ { prop: 'camera_name', label: '摄像头', minWidth: '130', showOverflowTooltip: true },
+ { prop: 'status', label: '状态', width: '110' },
+ { prop: 'created_at', label: '创建时间', width: '170' },
+ { prop: 'actions', label: '操作', width: '110', fixed: 'right' }
+]
+
+function handleVideoPageSizeChange(pageSize: number) {
+ videoPagination.pageSize = pageSize
+ videoPagination.currentPage = 1
+ void loadVideoListPage(1)
+}
+
+/** 刷新当前页拆包录像;若刷新后当前页已无数据(总数变化),自动回退到最后一个有效页 */
+async function handleRefreshVideoList() {
+ const page = videoPagination.currentPage || 1
+ await loadVideoListPage(page)
+ if (videoListRows.value.length === 0 && videoPagination.total > 0 && page > 1) {
+ const lastPage = Math.max(1, Math.ceil(videoPagination.total / videoPagination.pageSize))
+ if (lastPage < page) await loadVideoListPage(lastPage)
+ }
+}
+
async function handleViewDetail(row: any) {
selectedRecord.value = row
detailVisible.value = true
@@ -1172,10 +1197,66 @@ onMounted(() => {
min-height: 160px;
}
-.detail-pagination {
- margin-top: 6px;
+/* 拆包录像:表格自己滚动,外层不滚(UpperTable 需要确定高度);已选数量在左下角 */
+.detail-scroll.detail-scroll--table {
+ overflow: hidden;
display: flex;
- justify-content: flex-end;
+ flex-direction: column;
+ padding: 8px 0 0;
+
+ /* 按钮行:与 storage/receiving 商品明细/操作日志一致,无边框/无背景 */
+ .header-actions {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 6px;
+ flex-shrink: 0;
+ gap: 4px;
+ flex-wrap: wrap;
+
+ .left-actions {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+
+ :deep(.el-button) {
+ margin: 0;
+ }
+ }
+ }
+
+ .detail-list-pane {
+ flex: 1;
+ min-height: 0;
+ display: flex;
+ flex-direction: column;
+ }
+
+ :deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ }
+
+ :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+ }
+
+ :deep(.pagination-container) {
+ flex-shrink: 0;
+ padding: 0;
+ border-top: none;
+ margin-top: 6px;
+ justify-content: space-between;
+ }
+
+ :deep(.pagination-info) {
+ font-size: 12px;
+ color: #606266;
+ }
}
.order-items-table-wrap {
diff --git a/src/views/express/waybill/index.vue b/src/views/express/waybill/index.vue
index 5994150e..75d37e01 100644
--- a/src/views/express/waybill/index.vue
+++ b/src/views/express/waybill/index.vue
@@ -253,7 +253,7 @@
+
+
+
@@ -285,6 +299,7 @@ import OperationCellRenderer from './components/OperationCellRenderer.vue'
import TransferByWaybillsDialog from './components/TransferByWaybillsDialog.vue'
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
import TaskProgressDialog from '@/components/TaskProgressDialog.vue'
+import TaskProgressFloatWidget from '@/components/task-progress/TaskProgressFloatWidget.vue'
import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue'
import { waybillWarehouseDetail } from '@/api/waybill.warehouse'
import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
@@ -832,12 +847,15 @@ const {
},
onSuccess: async () => {
ElMessage.success('揽收状态更新完成')
+ // 任务结束后若处于收起状态,自动还原弹窗展示结果
+ receiveProgressMinimized.value = false
upperTableRef.value?.clearSelection?.()
selectedRows.value = []
await loadData()
},
onError: (error: string) => {
ElMessage.error(error || '揽收状态更新失败')
+ receiveProgressMinimized.value = false
}
})
@@ -853,6 +871,41 @@ const receiveProgressStatusLabel = computed(() => {
return map[receiveProgressState.status] || receiveProgressState.status || '—'
})
+/** 进度弹窗是否已收起(收起后显示右下角浮条,后台继续轮询) */
+const receiveProgressMinimized = ref(false)
+
+/** 收起后台(对齐 order/orderManagement「建单」:表单可收起,任务不中断) */
+function minimizeReceiveProgress() {
+ receiveProgressMinimized.value = true
+}
+
+/** 还原进度弹窗 */
+function restoreReceiveProgress() {
+ receiveProgressMinimized.value = false
+}
+
+/** 关闭进度(运行中关闭会停止轮询,需二次确认避免误关) */
+async function handleCloseReceiveProgress() {
+ if (receiveProgressPolling.value) {
+ try {
+ await ElMessageBox.confirm(
+ '任务仍在后台执行,关闭后将不再显示进度,是否继续?',
+ '关闭进度窗口',
+ {
+ type: 'warning',
+ buttonSize: 'small',
+ confirmButtonText: '关闭',
+ cancelButtonText: '取消'
+ }
+ )
+ } catch {
+ return
+ }
+ }
+ receiveProgressMinimized.value = false
+ closeReceiveProgress()
+}
+
/** 提交揽收状态更新任务(选中 / 全部 共用) */
async function submitReceiveTask(waybillCodes: string[]) {
const cfg = currentTabConfig.value
diff --git a/src/views/mode/config/components/LogPanel.vue b/src/views/mode/config/components/LogPanel.vue
index edcab196..89607d2b 100644
--- a/src/views/mode/config/components/LogPanel.vue
+++ b/src/views/mode/config/components/LogPanel.vue
@@ -22,52 +22,38 @@
-
-
+
-
-
-
-
-
- {{ row.result }}
-
-
-
- {{ row.detail || '—' }}
-
+
+ 已选 {{ count }} 项
-
- 暂无操作日志
+
+ {{ row.result }}
-
-
-
-
@@ -256,14 +248,36 @@ watch(logs, (list) => {
min-height: 120px;
min-width: 0;
overflow: hidden;
-}
-
-.pagination-container {
- flex-shrink: 0;
display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 6px;
+ flex-direction: column;
+
+ :deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ box-shadow: none;
+ border-radius: 0;
+ }
+
+ :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+ }
+
+ :deep(.pagination-container) {
+ flex-shrink: 0;
+ padding: 0;
+ border-top: none;
+ margin-top: 6px;
+ justify-content: space-between;
+ }
+
+ :deep(.pagination-info) {
+ font-size: 12px;
+ color: #606266;
+ }
}
.empty-tip {
diff --git a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue
index 5846d57f..5ba33b47 100644
--- a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue
+++ b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue
@@ -1,46 +1,72 @@
-
+
-
-
-
-
-
+
+
+
+ 已选 {{ count }} 项
+
+
{{ row.operator_name ?? '—' }}
-
-
-
+
+
{{ formatOperationLabel(row) }}
-
-
-
+
+
{{ row.platform_name || row.platform_code || '—' }}
-
-
-
+
+
{{ row.external_log_type }}
—
-
-
-
+
+
{{ row.message ?? '—' }}
-
-
-
+
查看报文
—
-
-
-
- 暂无订单日志
-
-
-
-
-
import { computed, nextTick, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
-import { useResizeObserver } from '@vueuse/core'
import RequestData from '@/components/RequestData/index.vue'
+import UpperTable from '@/components/UpperTable/index.vue'
import { orderQueryOrderLogs } from '@/api/order.index/orderindex'
const props = defineProps<{
@@ -121,27 +107,43 @@ const requestId = ref(0)
const requestType = ref('')
const pagination = reactive({
- page: 1,
+ currentPage: 1,
pageSize: 20,
total: 0
})
-/* 表格高度:由容器实际高度驱动(Element Plus 不支持 height="100%") */
-const tableHostRef = ref(null)
+const queryTime = ref(0)
const tableRef = ref(null)
-const tableHeight = ref(220)
+const selectedRows = ref[]>([])
-useResizeObserver(tableHostRef, (entries) => {
- const h = entries[0]?.contentRect.height ?? 0
- if (h >= 100) {
- tableHeight.value = Math.floor(h)
- }
-})
+/** 列配置(对齐 storage/receiving 入库记录:UpperTable + 多选 + 分页) */
+const columns = [
+ { prop: 'created_at', label: '时间', width: '175' },
+ { prop: 'operator_name', label: '操作人', width: '110' },
+ { prop: 'operation_name', label: '操作类型', minWidth: '160', showOverflowTooltip: true },
+ { prop: 'platform_name', label: '平台', width: '100', showOverflowTooltip: true },
+ { prop: 'external_log_type', label: '外部日志', width: '108' },
+ { prop: 'message', label: '说明', minWidth: '220', showOverflowTooltip: true },
+ { prop: 'actions', label: '操作', width: '108', fixed: 'right' }
+]
+
+/** 日志行唯一键:优先 id,回退到业务字段组合(保证多选勾选状态正确) */
+function resolveLogRowKey(row: Record) {
+ return (
+ row?.id ??
+ row?.log_id ??
+ `${row?.created_at ?? ''}-${row?.operation_code ?? ''}-${row?.operator_name ?? ''}-${row?.message ?? ''}`
+ )
+}
+
+function handleSelectionChange(rows: Record[]) {
+ selectedRows.value = rows
+}
/** 切页后把表格滚动位置归零 */
function resetTableScroll() {
nextTick(() => {
- tableRef.value?.setScrollTop?.(0)
+ tableRef.value?.getTableRef?.()?.setScrollTop?.(0)
})
}
@@ -186,8 +188,10 @@ function hasExternalPayload(row: any): boolean {
watch(
() => orderId.value,
(newOrderId) => {
+ selectedRows.value = []
+ tableRef.value?.clearSelection?.()
if (newOrderId) {
- pagination.page = 1
+ pagination.currentPage = 1
loadOrderLogs()
} else {
tableData.value = []
@@ -198,20 +202,20 @@ watch(
)
async function handlePageChange(page: number) {
- pagination.page = page
+ pagination.currentPage = page
resetTableScroll()
await loadOrderLogs()
}
async function handlePageSizeChange(pageSize: number) {
pagination.pageSize = pageSize
- pagination.page = 1
+ pagination.currentPage = 1
resetTableScroll()
await loadOrderLogs()
}
async function handleRefresh() {
- pagination.page = 1
+ pagination.currentPage = 1
await loadOrderLogs()
}
@@ -219,10 +223,11 @@ async function loadOrderLogs() {
if (!orderId.value) return
loading.value = true
+ const startedAt = Date.now()
try {
const response: any = await orderQueryOrderLogs({
id: orderId.value,
- page: pagination.page,
+ page: pagination.currentPage,
pageSize: pagination.pageSize
})
if (response && ![1, 200].includes(response.code)) {
@@ -237,6 +242,7 @@ async function loadOrderLogs() {
tableData.value = []
pagination.total = 0
} finally {
+ queryTime.value = Date.now() - startedAt
loading.value = false
}
}
@@ -286,11 +292,40 @@ function viewData(row: any) {
}
}
+/* 与 storage/receiving(Product/Logs)一致:UpperTable 自适应高度 + 左下角「已选 N 项」 */
.table-host {
flex: 1;
min-height: 120px;
min-width: 0;
overflow: hidden;
+ display: flex;
+ flex-direction: column;
+}
+
+.table-host :deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+}
+
+.table-host :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+}
+
+.table-host :deep(.pagination-container) {
+ flex-shrink: 0;
+ padding: 0;
+ border-top: none;
+ margin-top: 6px;
+ justify-content: space-between;
+}
+
+.table-host :deep(.pagination-info) {
+ font-size: 12px;
+ color: #606266;
}
.cell-muted {
@@ -304,23 +339,6 @@ function viewData(row: any) {
line-height: 1.5;
}
-.pagination-container {
- flex-shrink: 0;
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 6px;
-
- /* 每页条数下拉框与 UpperTable 的分页器保持一致 */
- :deep(.el-select--small) {
- width: 80px;
- }
-
- :deep(.el-input__wrapper) {
- padding: 0 4px;
- }
-}
-
:deep(.el-drawer__body) {
height: 100%;
padding: 0;
diff --git a/src/views/order/orderWeighing/ExpressWeighingForm.vue b/src/views/order/orderWeighing/ExpressWeighingForm.vue
index 13609769..dc544fa7 100644
--- a/src/views/order/orderWeighing/ExpressWeighingForm.vue
+++ b/src/views/order/orderWeighing/ExpressWeighingForm.vue
@@ -1,88 +1,137 @@
-
+
+
+
+
+
运单称重
+
支持运单号模式与订单模式,重量单位为克(g)
+
+
+
-
-
-
- 运单号模式
- 订单模式
-
-
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
- 取消
- 保存
-
+
+ 称重重量单位为克(g),须为大于 0 的整数;保存后立即更新该运单的称重重量。
+
+
+
+
+
@@ -256,11 +305,209 @@ watch(
+
+
diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue
index f9b68f83..7c0b0762 100644
--- a/src/views/order/waveOrder/WavePickTaskListPanel.vue
+++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue
@@ -196,67 +196,61 @@
-
-
-
-
-
- {{ waveRow.wave_no || '—' }}
-
-
-
-
-
-
-
-
- {{ getWaveStatusText(waveRow.status) }}
-
-
-
-
-
- {{ formatWaveTime(waveRow.bind_time) }}
-
-
-
-
- {{ formatWaveTime(waveRow.pick_time) }}
-
-
-
- 该任务暂无关联波次
-
-
+
+
-
@@ -275,7 +269,6 @@
diff --git a/src/views/storage/entry/component/DirectInboundLogs.vue b/src/views/storage/entry/component/DirectInboundLogs.vue
index bfbd102c..4d9c2f42 100644
--- a/src/views/storage/entry/component/DirectInboundLogs.vue
+++ b/src/views/storage/entry/component/DirectInboundLogs.vue
@@ -35,6 +35,9 @@
@page-size-change="handlePageSizeChange"
@page-change="handlePageChange"
>
+
+
已选 {{ count }} 项
+
{{ formatDirectInboundType(row.inbound_type) }}
@@ -336,18 +339,33 @@ defineExpose({
min-height: 120px;
min-width: 0;
overflow: hidden;
+ display: flex;
+ flex-direction: column;
- /* 分页区与「操作日志」保持一致:去掉 UpperTable 默认的底部分隔线/内边距,
- 右对齐,仅保留 6px 上间距;左侧「已选 N 条 / 查询用时」文案一并去掉 */
+ :deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ }
+
+ :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+ }
+
+ /* 分页区:与 storage/receiving 商品明细/操作日志一致(左「已选 N 项」右分页) */
:deep(.pagination-container) {
padding: 0;
border-top: none;
margin-top: 6px;
- justify-content: flex-end;
+ justify-content: space-between;
}
:deep(.pagination-info) {
- display: none;
+ font-size: 12px;
+ color: #606266;
}
}
diff --git a/src/views/storage/entry/component/EntryBindingRelations.vue b/src/views/storage/entry/component/EntryBindingRelations.vue
index 690b60ca..6728650f 100644
--- a/src/views/storage/entry/component/EntryBindingRelations.vue
+++ b/src/views/storage/entry/component/EntryBindingRelations.vue
@@ -8,9 +8,6 @@
刷新
-
- 已选 {{ selectedRows.length }} 项
-
已绑定收货单 {{ receivingBindings.length }} 个
明细绑定 {{ itemBindingRows.length }} 条
@@ -34,6 +31,9 @@
@refresh="loadBindingData"
@selection-change="handleSelectionChange"
>
+
+
已选 {{ count }} 项
+
+
+ 已选 {{ count }} 项
+
{
min-height: 120px;
min-width: 0;
overflow: hidden;
+ display: flex;
+ flex-direction: column;
- /* 分页区与「操作日志」保持一致:去掉 UpperTable 默认的底部分隔线/内边距,
- 右对齐,仅保留 6px 上间距;左侧「已选 N 条 / 查询用时」文案一并去掉 */
+ :deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ }
+
+ :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+ }
+
+ /* 分页区:与 storage/receiving 商品明细/操作日志一致(左「已选 N 项」右分页) */
:deep(.pagination-container) {
padding: 0;
border-top: none;
margin-top: 6px;
- justify-content: flex-end;
+ justify-content: space-between;
}
:deep(.pagination-info) {
- display: none;
+ font-size: 12px;
+ color: #606266;
}
}
}
diff --git a/src/views/storage/entry/component/log.vue b/src/views/storage/entry/component/log.vue
index 919c3b87..d1cc295e 100644
--- a/src/views/storage/entry/component/log.vue
+++ b/src/views/storage/entry/component/log.vue
@@ -12,11 +12,6 @@
刷新
-
-
- 已选 {{ selectedRows.length }} 项
-
-
@@ -36,6 +31,9 @@
@refresh="handleRefresh"
@selection-change="handleSelectionChange"
>
+
+
已选 {{ count }} 项
+
{{ row.operator_name ?? '—' }}
{{ formatOperationLabel(row) }}
@@ -255,17 +253,6 @@ function viewData(row: any) {
margin-right: 0;
}
}
-
- .right-actions {
- display: flex;
- align-items: center;
- gap: 8px;
-
- .selection-text {
- font-size: 12px;
- color: #409eff;
- }
- }
}
.table-host {
@@ -289,17 +276,18 @@ function viewData(row: any) {
height: auto !important;
}
- /* 分页区:与「商品明细」一致(去掉底部分隔线/内边距,右对齐,仅保留 6px 上间距) */
+ /* 分页区:与 storage/receiving 商品明细/操作日志一致(左「已选 N 项」右分页) */
:deep(.pagination-container) {
flex-shrink: 0;
padding: 0;
border-top: none;
margin-top: 6px;
- justify-content: flex-end;
+ justify-content: space-between;
}
:deep(.pagination-info) {
- display: none;
+ font-size: 12px;
+ color: #606266;
}
}
diff --git a/src/views/storage/entry_owner/index.vue b/src/views/storage/entry_owner/index.vue
index 25bee5de..6b36d47d 100644
--- a/src/views/storage/entry_owner/index.vue
+++ b/src/views/storage/entry_owner/index.vue
@@ -50,6 +50,7 @@
:show-selection="true"
:loading="loading"
:queryTime="queryTime"
+ row-key="id"
@current-change="handleRowClick"
@sort-change="handleSortChange"
@page-change="handlePageChange"
@@ -695,10 +696,10 @@ async function handleExportSelected() {
@use "@/styles/status-text.scss";
/* 详情区外壳与 stock/external_stock 保持一致:不留上/下间距(各详情组件自带
- padding: 6px 10px 8px),只保留左右 10px,避免与组件内边距叠加 */
+ padding: 6px 10px 8px),只保留左右 10px;溢出交给面板自己处理,避免双重滚动条 */
.order-sub-container .main-content .lower-level .detail-container {
padding: 0 10px;
- overflow: auto;
+ overflow: hidden;
}
.empty-tip {
diff --git a/src/views/storage/generalreport/config/components/LogPanel.vue b/src/views/storage/generalreport/config/components/LogPanel.vue
index 3a79695a..35b9f1fb 100644
--- a/src/views/storage/generalreport/config/components/LogPanel.vue
+++ b/src/views/storage/generalreport/config/components/LogPanel.vue
@@ -7,47 +7,43 @@
-->
-
加载中…
-
-
-
-
-
-
-
- {{ row.result }}
-
-
-
- {{ row.detail || '—' }}
-
-
- 暂无操作日志
-
-
diff --git a/src/views/storage/inventory/component/panelstockdetail.vue b/src/views/storage/inventory/component/panelstockdetail.vue
index c24942d3..57deac83 100644
--- a/src/views/storage/inventory/component/panelstockdetail.vue
+++ b/src/views/storage/inventory/component/panelstockdetail.vue
@@ -311,6 +311,9 @@
@page-change="handlePageChange"
@page-size-change="handlePageSizeChange"
>
+
+
已选 {{ count }} 项
+
{
.detail-table-wrap {
flex: 1;
- min-height: 0;
+ min-height: 120px;
+ min-width: 0;
overflow: hidden;
+ display: flex;
+ flex-direction: column;
+
+ /* 与 storage/receiving 商品明细/操作日志一致:容器撑满 + 左下角「已选 N 项」 */
+ :deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ }
+
+ :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+ }
+
+ :deep(.pagination-container) {
+ flex-shrink: 0;
+ padding: 0;
+ border-top: none;
+ margin-top: 6px;
+ justify-content: space-between;
+ }
+
+ :deep(.pagination-info) {
+ font-size: 12px;
+ color: #606266;
+ }
}
.empty-tip {
diff --git a/src/views/storage/management/replenishmentDemand/index.vue b/src/views/storage/management/replenishmentDemand/index.vue
index 8e4b15bd..be8dd67d 100644
--- a/src/views/storage/management/replenishmentDemand/index.vue
+++ b/src/views/storage/management/replenishmentDemand/index.vue
@@ -68,122 +68,75 @@
-
-
-
-
-
- 无可用补货库位(存货区与分拣区均无库存)
-
-
-
-
-
-
-
-
-
-
-
- {{ bc.barcode }}
-
-
-
- -
-
-
-
-
-
-
-
- {{ row.shortage ?? '-' }}
-
-
-
-
-
- {{ row.replenishment_needed ?? 0 }}
-
-
-
-
-
-
- {{ statusLabel(row.replenishment_status) }}
-
-
-
-
-
-
- {{ row.replenishment_locations.length }}个
-
- -
-
-
-
- 暂无补货需求数据,可调整排序后重新查询
-
-
-
+
+ 已选 {{ count }} 项
-
@@ -191,6 +144,7 @@
@@ -256,14 +248,36 @@ watch(logs, (list) => {
min-height: 120px;
min-width: 0;
overflow: hidden;
-}
-
-.pagination-container {
- flex-shrink: 0;
display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 6px;
+ flex-direction: column;
+
+ :deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ box-shadow: none;
+ border-radius: 0;
+ }
+
+ :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+ }
+
+ :deep(.pagination-container) {
+ flex-shrink: 0;
+ padding: 0;
+ border-top: none;
+ margin-top: 6px;
+ justify-content: space-between;
+ }
+
+ :deep(.pagination-info) {
+ font-size: 12px;
+ color: #606266;
+ }
}
.empty-tip {
diff --git a/src/views/storage/stockout/component/log.vue b/src/views/storage/stockout/component/log.vue
index 371f3a9d..d657a939 100644
--- a/src/views/storage/stockout/component/log.vue
+++ b/src/views/storage/stockout/component/log.vue
@@ -12,11 +12,6 @@
刷新
-
-
- 已选 {{ selectedRows.length }} 项
-
-
@@ -37,6 +32,9 @@
@refresh="fetchStockoutLogs"
@selection-change="handleSelectionChange"
>
+
+ 已选 {{ count }} 项
+
刷新
-
- 已选 {{ selectedRows.length }} 项
-
出库单号:{{ orderInfo.stockout_order_code }}
@@ -29,7 +26,10 @@
@page-size-change="handlePageSizeChange"
@refresh="loadData"
@selection-change="handleSelectionChange"
- />
+ >
+
+ 已选 {{ count }} 项
+
@@ -157,11 +157,6 @@ watch(() => props.id, loadData, { immediate: true })
align-items: center;
gap: 6px;
- .selection-text {
- font-size: 12px;
- color: #409eff;
- }
-
.order-code {
font-size: 13px;
font-weight: 500;
@@ -197,10 +192,11 @@ watch(() => props.id, loadData, { immediate: true })
padding: 0;
border-top: none;
margin-top: 6px;
- justify-content: flex-end;
+ justify-content: space-between;
}
.table-host :deep(.pagination-info) {
- display: none;
+ font-size: 12px;
+ color: #606266;
}
diff --git a/src/views/storage/stockout/component/stockoutdetail.vue b/src/views/storage/stockout/component/stockoutdetail.vue
index af172631..3430e30f 100644
--- a/src/views/storage/stockout/component/stockoutdetail.vue
+++ b/src/views/storage/stockout/component/stockoutdetail.vue
@@ -1,99 +1,115 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ group.title }}
+
+
+
+
+
{{ field.label }}
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
+ placeholder="请选择来源平台"
+ clearable
+ filterable
+ style="width:100%"
+ @change="handleDetailPlatformChange"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 保存
-
-
- 重置
-
-
-
+
diff --git a/src/views/store/stores/index.vue b/src/views/store/stores/index.vue
index 81863289..2a4c5462 100644
--- a/src/views/store/stores/index.vue
+++ b/src/views/store/stores/index.vue
@@ -231,8 +231,14 @@
table-size="small"
:loading="balanceLogLoading"
:virtual-threshold="100000"
- :show-pagination="false"
+ :pagination="balanceLogPagination"
+ :page-sizes="[10, 20, 50, 100]"
+ @page-change="handleBalanceLogPageChange"
+ @page-size-change="handleBalanceLogSizeChange"
>
+
+ 已选 {{ count }} 项
+
{{ formatDate(getBalanceLogTime(row)) || '—' }}
@@ -266,21 +272,6 @@
-
-
-
{
min-height: 120px;
min-width: 0;
overflow: hidden;
+ display: flex;
+ flex-direction: column;
- /* 对齐「商品明细」:表格自带 border,不需要卡片阴影/圆角 */
+ /* 对齐「商品明细」:表格自带 border,不需要卡片阴影/圆角;
+ UpperTable 行内分页需要确定高度 */
:deep(.upper-table-container) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
box-shadow: none;
border-radius: 0;
}
+ :deep(.table-container) {
+ flex: 1;
+ min-height: 0;
+ height: auto !important;
+ }
+
+ /* 分页区:左侧「已选 N 项」+ 右侧分页器,无分隔线 */
+ :deep(.pagination-container) {
+ flex-shrink: 0;
+ padding: 0;
+ border-top: none;
+ margin-top: 6px;
+ justify-content: space-between;
+ }
+
+ :deep(.pagination-info) {
+ font-size: 12px;
+ color: #606266;
+ }
+
/* 表格内部空态(#empty 插槽):交给 el-table 自身居中 */
.empty-tip {
height: auto;
@@ -3412,23 +3430,6 @@ onMounted(() => {
}
}
- /* 分页与「商品明细」面板一致:右下对齐、无分隔线、每页条数下拉 80px */
- .pagination-container {
- flex-shrink: 0;
- display: flex;
- justify-content: flex-end;
- align-items: center;
- margin-top: 6px;
-
- :deep(.el-select--small) {
- width: 80px;
- }
-
- :deep(.el-input__wrapper) {
- padding: 0 4px;
- }
- }
-
.open-account-form-grid {
.el-row {
width: 100%;
diff --git a/src/views/system/setting/basicManagement/newview/config/components/LogPanel.vue b/src/views/system/setting/basicManagement/newview/config/components/LogPanel.vue
index c876da1b..05c407ba 100644
--- a/src/views/system/setting/basicManagement/newview/config/components/LogPanel.vue
+++ b/src/views/system/setting/basicManagement/newview/config/components/LogPanel.vue
@@ -7,48 +7,44 @@
-->
-
加载中…
-
-
-
-
-
-
-
- {{ row.result }}
-
-
-
- {{ row.detail || '—' }}
-
-
- 暂无操作日志
-
-
diff --git a/src/views/warehouses/index.vue b/src/views/warehouses/index.vue
index 404a0b3b..b534b580 100644
--- a/src/views/warehouses/index.vue
+++ b/src/views/warehouses/index.vue
@@ -202,49 +202,30 @@
-
-
+
-
-
- {{ row.business_type || '—' }}
-
-
-
-
-
- {{ row.reason || '—' }}
-
-
- {{ row.operator_name || '—' }}
-
-
- {{ row.created_at || '—' }}
-
-
- 暂无操作日志
-
-
-
-
-
@@ -543,7 +524,6 @@