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/ticket.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 5426146..1417c2f 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -420,7 +420,7 @@
>存草稿</el-button
>
- <el-button @click="handleCancel">取 消</el-button>
+ <el-button @click="handleCancel" :icon="CircleClose">取 消</el-button>
</div>
</template>
</el-dialog>
@@ -745,7 +745,7 @@
@click="rejectTicket"
>不通过</el-button
>
- <el-button @click="detailVisible = false">取消</el-button>
+ <el-button @click="detailVisible = false":icon="CircleClose">取消</el-button>
</template>
<template v-else-if="currentDetail.status === 0">
<el-button
@@ -958,6 +958,7 @@
import elTooltipCopy from '@/components/ElTooltipCopy.vue';
import getBaseConfig from '@/buildConfig/config';
import CreateQRcode from '@/components/CreateQRcode/CreateQRcode.vue';
+import { CircleClose } from '@element-plus/icons-vue';
const { envName } = getBaseConfig();
function regExp(label, name) {
var reg = new RegExp(label + '=([^&]*)(&|$)', 'g');
@@ -1249,6 +1250,9 @@
this.fetchTableData();
},
computed: {
+ CircleClose() {
+ return CircleClose
+ },
firstRowData() {
return this.tableData.length > 0 ? this.tableData[0] : null;
},
--
Gitblit v1.9.3