From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/common/GlobalWindow.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 359891b..4ae9ce1 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -8,7 +8,7 @@
:close-on-press-escape="false"
:wrapper-closable="false"
:append-to-body="true"
- :modal="false"
+ :modal="true"
@close="close"
>
<div slot="title" class="window__header">
@@ -20,7 +20,7 @@
</div>
<div v-if="withFooter" class="window__footer">
<slot name="footer">
- <el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
+ <el-button v-if="showConfirm" @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
<slot name="btns" />
<el-button @click="close">{{ backText }}</el-button>
</slot>
@@ -55,6 +55,10 @@
type: Boolean,
default: false
},
+ showConfirm: {
+ type: Boolean,
+ default: true
+ },
// 鏍囬
title: {
type: String,
@@ -83,7 +87,7 @@
// 杈撳叆妗嗛珮搴�
$input-height: 32px;
.global-window {
- top: 80px !important;
+ top: 56px !important;
left: 250px !important;
// 澶撮儴鏍囬
::v-deep .el-drawer__header {
--
Gitblit v1.9.3