From 656fcfd2d3d35aff12cbbec41f48cec99fdef1cb Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 19 Sep 2025 18:50:01 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.2' into prod
---
src/views/tickets/orderLog.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index d37b21f..9b7ac72 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -397,7 +397,7 @@
<div class="dialog-footer">
<el-button type="danger" @click="submitForm(1)">发起</el-button>
<el-button type="primary" @click="submitForm(0)">存草稿</el-button>
- <el-button @click="dialogVisible = false">取消</el-button>
+ <el-button @click="dialogVisible = false" :icon="CircleClose">取消</el-button>
</div>
</template>
</el-dialog>
@@ -846,6 +846,7 @@
import 'dayjs/locale/zh-cn'; // 导入中文语言包
import weekday from 'dayjs/plugin/weekday';
import elTooltipCopy from '@/components/ElTooltipCopy.vue';
+import { CircleClose } from '@element-plus/icons-vue';
dayjs.extend(weekday);
dayjs.locale('zh-cn');
@@ -1076,6 +1077,9 @@
}
},
computed: {
+ CircleClose() {
+ return CircleClose
+ },
...mapGetters(['userInfo', 'permission']),
filteredTabs() {
// rejection_and_draft 权限控制“已驳回”和“草稿”tab
--
Gitblit v1.9.3