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/GlobalAlertWindow.vue | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/common/GlobalAlertWindow.vue b/admin/src/components/common/GlobalAlertWindow.vue
index 53b0597..f252722 100644
--- a/admin/src/components/common/GlobalAlertWindow.vue
+++ b/admin/src/components/common/GlobalAlertWindow.vue
@@ -6,8 +6,10 @@
:with-header="true"
:width="width"
:close-on-press-escape="false"
+ :close-on-click-modal="false"
:wrapper-closable="false"
:append-to-body="true"
+ :show-close="!showClose"
@close="close"
>
<div slot="title" class="window__header">
@@ -19,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>
@@ -33,6 +35,14 @@
type: String,
default: '50%'
},
+ showClose: {
+ type: Boolean,
+ default: false
+ },
+ showCancel: {
+ type: Boolean,
+ default: false
+ },
// 鏄惁鍖呭惈搴曢儴鎿嶄綔
withFooter: {
type: Boolean,
--
Gitblit v1.9.3