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/orderLog.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 9b7ac72..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="12">
+ <el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
<el-select
v-model="form.file_id"
@@ -296,6 +296,15 @@
:value="item.wayline_id"
/>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="安全返航真高" prop="rth_altitude">
+ <el-input-number
+ v-model="form.rth_altitude"
+ :min="30"
+ :max="300"
+ ></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -395,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>
@@ -589,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"
@@ -794,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"
@@ -803,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>
@@ -846,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');
@@ -1669,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;
--
Gitblit v1.9.3