From 5805beb0cd42ad56e1e46e6eb49c998f308b9319 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/common/GlobalAlertWindow.vue | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/common/GlobalAlertWindow.vue b/admin/src/components/common/GlobalAlertWindow.vue
index 0907de8..f252722 100644
--- a/admin/src/components/common/GlobalAlertWindow.vue
+++ b/admin/src/components/common/GlobalAlertWindow.vue
@@ -9,6 +9,7 @@
:close-on-click-modal="false"
:wrapper-closable="false"
:append-to-body="true"
+ :show-close="!showClose"
@close="close"
>
<div slot="title" class="window__header">
@@ -20,7 +21,7 @@
<div v-if="withFooter" class="window__footer">
<slot name="footer">
<el-button @click="confirm" :loading="confirmWorking" type="primary">纭畾</el-button>
- <el-button @click="close">鍙栨秷</el-button>
+ <el-button v-if="!showCancel" @click="close">鍙栨秷</el-button>
</slot>
</div>
</el-dialog>
@@ -34,6 +35,14 @@
type: String,
default: '50%'
},
+ showClose: {
+ type: Boolean,
+ default: false
+ },
+ showCancel: {
+ type: Boolean,
+ default: false
+ },
// 鏄惁鍖呭惈搴曢儴鎿嶄綔
withFooter: {
type: Boolean,
--
Gitblit v1.9.3