From 233f450bdd832e767249d116abb089a8056426cd Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 25 Sep 2025 10:08:10 +0800
Subject: [PATCH] feat：调整返航高度宽度和调整图标
---
src/views/tickets/ticket.vue | 27 ++++++++++++++++-----------
src/views/tickets/orderLog.vue | 26 +++++++++++++++++++-------
2 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index ff73d40..5d9ac66 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -281,7 +281,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
<el-select
v-model="form.file_id"
@@ -298,7 +298,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude">
<el-input-number
v-model="form.rth_altitude"
@@ -404,9 +404,9 @@
</el-form>
<template #footer>
<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" :icon="CircleClose">取消</el-button>
+ <el-button type="danger" @click="submitForm(1)" icon="el-icon-position">发起</el-button>
+ <el-button type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button>
+ <el-button @click="dialogVisible = false" icon="el-icon-circle-close">取消</el-button>
</div>
</template>
</el-dialog>
@@ -598,12 +598,14 @@
type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
@click="submitForm(1)"
+ icon="el-icon-position"
>发布</el-button
>
<el-button
type="primary"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
@click="submitForm(0)"
+ icon="el-icon-plus"
>保存</el-button
>
<!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@@ -803,6 +805,7 @@
type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
@click="submitForm(1)"
+ icon="el-icon-position"
>发布</el-button
>
<!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@@ -812,15 +815,17 @@
type="primary"
v-if="form.status == 1 && hasPaddingBtnPermission()"
@click="orderLogPass(form.id)"
+ icon="el-icon-check"
>通过</el-button
>
<el-button
type="danger"
v-if="form.status == 1 && hasRejectionBtnPermission()"
@click="orderLogReject(form.id)"
+ icon="el-icon-close"
>驳回</el-button
>
- <el-button @click="detailVisibleCopy = false">取消</el-button>
+ <el-button @click="detailVisibleCopy = false" icon="el-icon-circle-close">取消</el-button>
</div>
</template>
</el-dialog>
@@ -855,7 +860,8 @@
import 'dayjs/locale/zh-cn'; // 导入中文语言包
import weekday from 'dayjs/plugin/weekday';
import elTooltipCopy from '@/components/ElTooltipCopy.vue';
-import { CircleClose } from '@element-plus/icons-vue';
+import { CircleClose, Promotion, Select } from '@element-plus/icons-vue';
+import fqSvg from '@/assets/images/fq.svg'
dayjs.extend(weekday);
dayjs.locale('zh-cn');
@@ -1678,6 +1684,12 @@
</script>
<style lang="scss" scoped>
+:deep(.el-input-number) {
+ width: 200px;
+}
+:deep(.el-form-item__label) {
+ width: 100px !important;
+}
::v-deep(.el-tabs) {
height: 100%;
display: flex;
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index e4348d0..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>
@@ -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>
--
Gitblit v1.9.3