From 1ee913c8ccdfebc117fbf44ec68ef78beb287db0 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 1 Jun 2026 16:31:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0=E5=88=97=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_detail.vue        |  9 ++++-
 src/views/wpm_bx/mlogbw_check_table.vue | 45 ++++++++++++++-----------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index c1970b61..c12df44e 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -364,7 +364,13 @@
 				</scTable>
 			</el-card>
 			<!-- 输出物料  输出物料追踪类型为单个-->
-			<el-card v-else style="width: 100%;margin-bottom:1vh" header="输出物料" shadow="never">
+			<el-card v-else style="width: 100%;margin-bottom:1vh" shadow="never">
+				<template #header>
+					<div style="display:flex;align-items:center;justify-content:space-between;">
+						<span>输出物料</span>
+						<el-button size="small" v-if="checkTableShow" @click="$refs.checkTable.openColumnSetting()">列设置</el-button>
+					</div>
+				</template>
 				<check-table
 					v-if="checkTableShow"
 					ref="checkTable"
@@ -386,6 +392,7 @@
 					style="width: 100%;height: 500px;"
 				></check-table>
 			</el-card>
+			<div style="height: 200px;"></div>
 			<save-dialog
 				v-if="dialog.save"
 				ref="saveDialog"
diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue
index f4503047..c9822508 100644
--- a/src/views/wpm_bx/mlogbw_check_table.vue
+++ b/src/views/wpm_bx/mlogbw_check_table.vue
@@ -32,24 +32,14 @@
 							:apiObj="$API.common.upload"
 							@success="upSuccess"
 						></scFileImport><!-- :templateUrl="checkTemplate" -->
-						<el-popover
-							v-model:visible="columnSettingVisible"
-							placement="bottom-end"
-							:width="200"
-							trigger="click"
-						>
-							<template #reference>
-								<el-button size="small">列设置</el-button>
-							</template>
-							<div class="col-setting-panel">
-								<div v-for="col in allColumnOptions" :key="col.key" class="col-setting-item">
-									<el-checkbox
-										:model-value="isColVisible(col.key)"
-										@change="toggleColumn(col.key)"
-									>{{ col.label }}</el-checkbox>
-								</div>
-							</div>
-						</el-popover>
+					</div>
+				</div>
+				<div v-if="columnSettingVisible" class="col-setting-float-panel" @click.stop>
+					<div v-for="col in allColumnOptions" :key="col.key" class="col-setting-item">
+						<el-checkbox
+							:model-value="isColVisible(col.key)"
+							@change="toggleColumn(col.key)"
+						>{{ col.label }}</el-checkbox>
 					</div>
 				</div>
 			</div>
@@ -582,7 +572,14 @@ export default {
 			if (event.target && event.target.closest(".action-more")) {
 				return;
 			}
+			if (event.target && event.target.closest(".col-setting-float-panel")) {
+				return;
+			}
 			this.openedActionMenu = null;
+			this.columnSettingVisible = false;
+		},
+		openColumnSetting() {
+			this.columnSettingVisible = !this.columnSettingVisible;
 		},
 		check_add(){
 			let that = this;
@@ -1471,7 +1468,17 @@ tbody tr:nth-child(odd) .sticky-cell{
 .more-menu-btn:hover{
 	background: #fef0f0;
 }
-.col-setting-panel{
+.col-setting-float-panel{
+	position: absolute;
+	right: 0;
+	top: 35px;
+	z-index: 100;
+	background: #fff;
+	border: 1px solid #ebeef5;
+	border-radius: 4px;
+	box-shadow: 0 2px 12px rgba(0,0,0,0.12);
+	padding: 8px 12px;
+	min-width: 150px;
 	max-height: 300px;
 	overflow-y: auto;
 }