From c1785f39c1b6a2e3cd2380de1dd6c87a684215b1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 26 五月 2025 14:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/common/GlobalWindow.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/company/src/components/common/GlobalWindow.vue b/company/src/components/common/GlobalWindow.vue
index 298b468..0952112 100644
--- a/company/src/components/common/GlobalWindow.vue
+++ b/company/src/components/common/GlobalWindow.vue
@@ -21,7 +21,7 @@
<div v-if="withFooter" class="window__footer">
<slot name="footer">
<el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
- <el-button @click="close">杩斿洖</el-button>
+ <el-button @click="close">{{goText}}</el-button>
</slot>
</div>
</el-drawer>
@@ -45,6 +45,10 @@
type: String,
default: '纭畾'
},
+ goText: {
+ type: String,
+ default: '杩斿洖'
+ },
// 纭鎸夐挳loading鐘舵��
confirmWorking: {
type: Boolean,
--
Gitblit v1.9.3