From 2f919191f1c7739eb0ef54392cd265284b55af9e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 一月 2024 19:58:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 company/src/components/common/GlobalWindow.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/company/src/components/common/GlobalWindow.vue b/company/src/components/common/GlobalWindow.vue
index 7967500..f973e7c 100644
--- a/company/src/components/common/GlobalWindow.vue
+++ b/company/src/components/common/GlobalWindow.vue
@@ -20,7 +20,7 @@
     </div>
     <div v-if="withFooter" class="window__footer">
       <slot name="footer">
-        <el-button @click="confirm" :loading="confirmWorking" type="primary">纭畾</el-button>
+        <el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
         <el-button @click="close">杩斿洖</el-button>
       </slot>
     </div>
@@ -40,6 +40,11 @@
       type: Boolean,
       default: true
     },
+    // 鎻愪氦鎸夐挳鏂囧瓧
+    text: {
+      type: String,
+      default: '纭畾'
+    },
     // 纭鎸夐挳loading鐘舵��
     confirmWorking: {
       type: Boolean,

--
Gitblit v1.9.3