From a623394c7e5d67556ce63d0fb6d6e45b8dee959d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 25 Sep 2025 10:08:49 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.3' into feature/v6.0/6.0.4
---
src/views/tickets/ticket.vue | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index eb4823c..5011d18 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -415,12 +415,12 @@
</el-form>
<template #footer>
<div class="dialog-footer-new">
- <el-button type="danger" :loading="submitLoading" @click="submitForm">发布</el-button>
- <el-button type="infoprimary" plain :loading="draftLoading" @click="saveDraft"
+ <el-button type="danger" :loading="submitLoading" @click="submitForm" icon="el-icon-position">发布</el-button>
+ <el-button type="infoprimary" plain :loading="draftLoading" @click="saveDraft" icon="el-icon-document-add"
>存草稿</el-button
>
- <el-button @click="handleCancel" :icon="CircleClose">取 消</el-button>
+ <el-button @click="handleCancel" icon="el-icon-circle-close">取 消</el-button>
</div>
</template>
</el-dialog>
@@ -644,7 +644,7 @@
:src="getThumbUrl(currentDetail.mediaUrl)"
:preview-src-list="[getPreviewUrl(currentDetail.mediaUrl)]"
fit="contain"
- style="width: 700px; height: 520px; cursor: pointer"
+ style="pxToRemNum(width: 700px); pxToRemNum(height: 520px); cursor: pointer"
>
<template #placeholder>
<div class="image-placeholder">
@@ -736,6 +736,7 @@
type="primary"
:loading="approveLoading"
@click="approveTicket"
+ icon="el-icon-check"
>通过</el-button
>
<el-button
@@ -743,9 +744,10 @@
type="danger"
:loading="rejectLoading"
@click="rejectTicket"
+ icon="el-icon-close"
>不通过</el-button
>
- <el-button @click="detailVisible = false":icon="CircleClose">取消</el-button>
+ <el-button @click="detailVisible = false" icon="el-icon-circle-close">取消</el-button>
</template>
<template v-else-if="currentDetail.status === 0">
<el-button
@@ -753,6 +755,7 @@
type="primary"
:loading="dispatchLoading"
@click="approveAndDispatch"
+ icon="el-icon-check"
>受理</el-button
>
<el-button
@@ -760,9 +763,10 @@
type="danger"
:loading="rejectLoading"
@click="rejectTicket"
+ icon="el-icon-close"
>不受理</el-button
>
- <el-button @click="detailVisible = false">取消</el-button>
+ <el-button @click="detailVisible = false" icon="el-icon-circle-close">取消</el-button>
</template>
<template v-if="currentDetail.status === 3">
<!-- 处理中 -->
@@ -771,15 +775,16 @@
type="primary"
:loading="completeLoading"
@click="completeTicket"
+ icon="el-icon-circle-check"
>完成工单</el-button
>
- <el-button @click="detailVisible = false">取消</el-button>
+ <el-button @click="detailVisible = false" icon="el-icon-circle-close">取消</el-button>
</template>
<template v-else-if="currentDetail.status === 4">
<!-- 已完成 -->
<!-- <el-button v-if="hasProcessedAndOverBtnPermission()" type="primary" :loading="finalizeLoading"
@click="finalizeTicket">完结工单</el-button> -->
- <el-button @click="detailVisible = false">取消</el-button>
+ <el-button @click="detailVisible = false" icon="el-icon-circle-close">取消</el-button>
</template>
</div>
<div
@@ -832,7 +837,7 @@
</el-form-item>
</el-form>
<template #footer>
- <el-button @click="dispatchDialogVisible = false">取消</el-button>
+ <el-button @click="dispatchDialogVisible = false" icon="el-icon-circle-close">取消</el-button>
<el-button type="primary" :loading="dispatchLoading" @click="submitDispatch"
>确认派发</el-button
>
@@ -909,9 +914,9 @@
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="handleBatchApprove">通过</el-button>
- <el-button type="danger" @click="handleBatchReject">不通过</el-button>
- <el-button @click="cancleBatchReject">取消</el-button>
+ <el-button type="primary" @click="handleBatchApprove" icon="el-icon-check">通过</el-button>
+ <el-button type="danger" @click="handleBatchReject" icon="el-icon-close">不通过</el-button>
+ <el-button @click="cancleBatchReject" icon="el-icon-circle-close">取消</el-button>
</div>
</template>
</el-dialog>
@@ -935,6 +940,7 @@
</template>
<script>
+import { pxToRem, pxToRemNum } from '@/utils/rem'
import { getSmallImg, getShowImg } from '@/utils/util';
import { ElMessageBox, ElLoading } from 'element-plus';
import { calculateDefaultRange } from '@/utils/util';
@@ -3572,7 +3578,7 @@
opacity: 0.3 !important;
}
.PopUpTableScrolls {
- height: 600px;
+ max-height: 600px;
overflow-y: scroll;
overflow-x: hidden;
}
--
Gitblit v1.9.3