From b1e21adbd4fccedc31701f2564b01cabe9941a5f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 08 二月 2025 17:27:41 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1

---
 admin/src/components/common/GlobalWindow.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 4ae9ce1..504f62f 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -22,6 +22,7 @@
       <slot name="footer">
         <el-button v-if="showConfirm" @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
         <slot name="btns" />
+        <el-button type="primary" v-if="isDownload" @click="downloadFile">涓嬭浇鍌即閫氱煡鍗�</el-button>
         <el-button @click="close">{{ backText }}</el-button>
       </slot>
     </div>
@@ -68,6 +69,11 @@
     visible: {
       type: Boolean,
       required: true
+    },
+    // 鏄惁鏄剧ず涓嬭浇鎸夐挳
+    isDownload: {
+      type: Boolean,
+      required: false
     }
   },
   methods: {
@@ -77,6 +83,9 @@
     close () {
       this.$emit('close')
       this.$emit('update:visible', false)
+    },
+    downloadFile() {
+      this.$emit('downloadFile')
     }
   }
 }
@@ -87,7 +96,7 @@
 // 杈撳叆妗嗛珮搴�
 $input-height: 32px;
 .global-window {
-  top: 56px !important;
+  top: 0;
   left: 250px !important;
   // 澶撮儴鏍囬
   ::v-deep .el-drawer__header {
@@ -125,11 +134,11 @@
     .window__body {
       // width: 1100px;
       // margin: 0 auto;
-      // background-color: #fff;
+      background-color: #fff;
       width: 100%;
       height: 100%;
       overflow-y: auto;
-      padding: 12px 16px;
+      padding: 0 16px 12px 16px;
       // 鏍囩
       // .el-form-item__label {
       //   float: none;

--
Gitblit v1.9.3