From ac04d6c2bdd933609818872e6e840ec5184e9634 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 05 Dec 2025 09:28:55 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.1' into test
---
src/views/tickets/component/AddEditDetails.vue | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/views/tickets/component/AddEditDetails.vue b/src/views/tickets/component/AddEditDetails.vue
index e0c0330..740f228 100644
--- a/src/views/tickets/component/AddEditDetails.vue
+++ b/src/views/tickets/component/AddEditDetails.vue
@@ -47,10 +47,11 @@
</el-col>
<el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
- <el-select v-model="formParams.file_id" placeholder="请选择航线" filterable @change="getFlyingNest" :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'">
+ <el-select v-if="txtTitle === '新建工单'" v-model="formParams.file_id" placeholder="请选择航线" filterable @change="getFlyingNest">
<el-option v-for="item in lineList" :key="item.wayline_id" :label="item.name"
:value="item.wayline_id" />
</el-select>
+ <el-input v-else v-model="formParams.wayline_file_region_vo.name" :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -92,12 +93,12 @@
<el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"
- v-model="formParams.date_range"
- type="daterange"
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- :disabled-date="disabledDate" />
+ v-model="formParams.date_range"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ :disabled-date="disabledDate" />
</el-form-item>
</el-col>
<el-col :span="2">
@@ -134,7 +135,7 @@
<template #footer v-if="txtTitle === '新建工单'">
<div class="dialog-footer">
<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 type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button>-->
<el-button @click="cancel" icon="el-icon-circle-close">取消</el-button>
</div>
</template>
@@ -215,15 +216,15 @@
{ required: true, message: '请输入工单名称', trigger: 'blur' },
{ max: 100, message: '工单名称不能超过100个字', trigger: 'blur' }
],
- file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
- device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
- content: [
+ file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
+ device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
+ content: [
{ required: true, message: '请输入工单内容', trigger: 'blur' },
{ max: 255, message: '工单内容不能超过255个字', trigger: 'blur' }
],
- date_range: [{ required: true, message: '请选择时间不能为空', trigger: 'blur' }],
- rep_fre_type: [{ required: true, message: '请选择周期', trigger: 'blur' }],
- deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }]
+ date_range: [{ required: true, message: '请选择时间不能为空', trigger: 'blur' }],
+ rep_fre_type: [{ required: true, message: '请选择周期', trigger: 'blur' }],
+ deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }]
})
//周期
const weeks = ref(['每天', '周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日'])
@@ -292,10 +293,11 @@
// initMapLine 方法
const initMapLine = async (infos = {}, cb = () => {}) => {
- const currentLine = lineList.value.find(item => item.wayline_id == formParams.value.file_id)
+ let currentLine = lineList.value.find(item => item.wayline_id == formParams.value.file_id)
-
- if (!currentLine) return
+ if (!currentLine) {
+ currentLine = formParams.value.wayline_file_region_vo
+ }
await nextTick()
if (mapContainerRef.value?.initAddEntity) {
@@ -445,7 +447,6 @@
formParams.value = {
...data
}
- console.log(formParams.value, '898789')
drone_sns.value = data.device_list
initMapLine(data.device_map_infos)
} else {
--
Gitblit v1.9.3