From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/common/GlobalWindow.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/company/src/components/common/GlobalWindow.vue b/company/src/components/common/GlobalWindow.vue
index f973e7c..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>
@@ -44,6 +44,10 @@
text: {
type: String,
default: '纭畾'
+ },
+ goText: {
+ type: String,
+ default: '杩斿洖'
},
// 纭鎸夐挳loading鐘舵��
confirmWorking: {
@@ -78,7 +82,7 @@
$input-height: 32px;
.global-window {
top: 80px !important;
- left: 218px !important;
+ left: 250px !important;
// 澶撮儴鏍囬
::v-deep .el-drawer__header {
padding: 0 10px 0 0;
--
Gitblit v1.9.3