Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

src/components/costAudit/CostAuditDialog.vue

@@ -13,7 +13,6 @@
     :close-on-press-escape="closeOnPressEscape"
     :show-close="showClose"
     :before-close="handleBeforeClose"
-    :z-index="effectiveZIndex"
     v-bind="mergedDialogProps"
     @open="handleOpen"
     @close="handleClose"
@@ -165,13 +164,14 @@
       mergedDialogProps() {
         return {
           ...this.dialogProps,
-          'modal-append-to-body': true,
-          'append-to-body': true,
+          // 保留用户传入的值，不硬编码覆盖
+          'modal-append-to-body': this.modalAppendToBody,
+          'append-to-body': this.appendToBody,
         }
       },
       effectiveZIndex() {
-        // 使用动态计算的zIndex优先，否则使用传入的zIndex
-        return this.zIndex
+        // 确保返回的zIndex值总是有效且足够大
+        return this.currentZIndex || this.zIndex || 2000
       },
     },
     methods: {

src/views/costAudit/auditInfo/auditManage/auditDocumentsMain.vue

@@ -145,7 +145,7 @@
       :visible="documentDialogVisible"
       width="82%"
       :close-on-click-modal="false"
-      :z-index="9400"
+      :z-index="9999"
       @cancel="handleCancel"
       @confirm="handleConfirm"
     >
@@ -321,7 +321,7 @@
       :visible="dialogVisible"
       :width="dialogWidth"
       :close-on-click-modal="false"
-      :z-index="9500"
+      :z-index="10000"
       @cancel="handleCancel"
       @confirm="handleConfirm"
     >