From c80197d5bacf7a3d5936846d1eef96587012e30b Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Thu, 7 Aug 2025 10:25:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BA=B8=E5=BC=A0?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F&=E6=95=B0=E6=8D=AE=E6=BA=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DataSourceManagementDialog.vue |  9 +++++
 .../labelSetting/components/PaperList.vue     | 12 ------
 .../components/PaperManagementDialog.vue      | 39 ++++++++++++-------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/labelSetting/components/DataSourceManagementDialog.vue b/src/views/modules/labelSetting/components/DataSourceManagementDialog.vue
index a2cbd3c..dc9705e 100644
--- a/src/views/modules/labelSetting/components/DataSourceManagementDialog.vue
+++ b/src/views/modules/labelSetting/components/DataSourceManagementDialog.vue
@@ -5,6 +5,7 @@
     width="500px"
     :before-close="handleClose"
     :close-on-click-modal="false"
+    :append-to-body="true"
   >
     <div class="data-source-management">
       <!-- 标签类型选择 -->
@@ -15,6 +16,7 @@
             placeholder="请选择标签类型"
             @change="handleLabelTypeChange"
             style="width: 200px;"
+            :popper-append-to-body="true"
           >
             <el-option
               v-for="item in labelTypes"
@@ -225,6 +227,13 @@ export default {
     },
 
     handleClose() {
+      // 清理状态
+      this.selectedLabelType = '';
+      this.viewFields = [];
+      this.modifiedFields.clear();
+      this.loading = false;
+      this.saving = false;
+      
       this.dialogVisible = false;
     }
   }
diff --git a/src/views/modules/labelSetting/components/PaperList.vue b/src/views/modules/labelSetting/components/PaperList.vue
index 1390327..f6ff36a 100644
--- a/src/views/modules/labelSetting/components/PaperList.vue
+++ b/src/views/modules/labelSetting/components/PaperList.vue
@@ -505,16 +505,4 @@ export default {
 }
 </style>
 
-<!-- 修复对话框遮挡层问题 -->
-<style>
-/* 删除确认对话框的z-index要高于纸张管理对话框 */
-.el-dialog__wrapper {
-  z-index: 2100 !important;
-}
-
-.el-overlay {
-  z-index: 2099 !important;
-}
 
-
-</style>
diff --git a/src/views/modules/labelSetting/components/PaperManagementDialog.vue b/src/views/modules/labelSetting/components/PaperManagementDialog.vue
index af028ee..0fe8557 100644
--- a/src/views/modules/labelSetting/components/PaperManagementDialog.vue
+++ b/src/views/modules/labelSetting/components/PaperManagementDialog.vue
@@ -1,12 +1,13 @@
 <template>
   <el-dialog
     title="纸张管理"
-    :visible="visible"
+    :visible.sync="dialogVisible"
     :close-on-click-modal="false"
     width="900px"
     top="5vh"
     custom-class="paper-management-dialog"
-    @close="handleClose"
+    :append-to-body="true"
+    @close="handleDialogClose"
   >
     <div class="paper-management-content">
       <!-- 纸张表单区域 -->
@@ -73,7 +74,8 @@ export default {
       paperList: [],
       currentPaper: null,
       isEditMode: false,
-      listLoading: false
+      listLoading: false,
+      dialogVisible: false
     }
   },
   computed: {
@@ -85,15 +87,25 @@ export default {
   watch: {
     visible: {
       handler(newVal) {
+        this.dialogVisible = newVal
         if (newVal) {
           this.initDialog()
-        } else {
-          this.resetDialog()
         }
       },
       immediate: true
+    },
+    dialogVisible(newVal) {
+      // 当对话框关闭时，通知父组件
+      this.$emit('update:visible', newVal)
     }
   },
+  beforeDestroy() {
+    // 确保组件销毁前清理状态
+    this.paperList = []
+    this.currentPaper = null
+    this.isEditMode = false
+    this.listLoading = false
+  },
   methods: {
     // 初始化对话框
     async initDialog() {
@@ -232,7 +244,15 @@ export default {
 
     // 关闭对话框
     handleClose() {
-      this.$emit('update:visible', false)
+      this.dialogVisible = false
+    },
+
+    // 对话框关闭事件处理
+    handleDialogClose() {
+      // 延迟清理状态，避免销毁时机冲突
+      this.$nextTick(() => {
+        this.resetDialog()
+      })
     }
   }
 }
@@ -352,15 +372,8 @@ export default {
 .paper-management-dialog {
   border-radius: 8px !important;
   box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12) !important;
-  z-index: 2000 !important;
-}
-
-.paper-management-dialog .el-dialog__wrapper {
-  z-index: 2000 !important;
 }
 
-
-
 .paper-management-dialog .el-dialog__header {
   padding: 16px 20px 12px !important;
   border-bottom: 1px solid #e4e7ed !important;