From 0bdbb3fce49bb4e8266a9e5cb4cf6a903e88223d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 08 Apr 2026 19:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
index 401a900..6dd91c9 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -60,23 +60,37 @@
:model="formData"
:rules="rules"
class="gd-dialog-form"
- label-width="160px"
+ label-width="auto"
v-else
>
<el-row>
<el-col :span="12">
<el-form-item label="飞手姓名" prop="flyerId">
- <el-select
+ <el-select v-if="dialogType === 'add'"
class="gd-select"
popper-class="gd-select-popper"
v-model="formData.flyerId"
placeholder="请选择"
clearable
@change="handleChange"
- :disabled="dialogType === 'view'"
>
<el-option
v-for="item in flyingHandList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ <el-select v-else
+ class="gd-select"
+ popper-class="gd-select-popper"
+ v-model="formData.flyerId"
+ placeholder="请选择"
+ clearable
+ :disabled="dialogType === 'edit'"
+ >
+ <el-option
+ v-for="item in flyingHandEditList"
:key="item.id"
:label="item.name"
:value="item.id"
@@ -215,6 +229,8 @@
const dictObj = inject('dictObj') // 擅长任务类型
const flyingHandList = inject('flyingHandList') // 飞手列表
+const flyingHandEditList = inject('flyingHandEditList') // 飞手建档列表
+
const emit = defineEmits(['update:modelValue', 'confirm'])
@@ -248,6 +264,7 @@
skilledUavType: '',
certification: [], // 证书
regionCode: '', // 区域编码
+ flyerAddress: '', // 飞手地址
})
const formData = ref(initForm()) // 表单数据
@@ -319,6 +336,7 @@
formData.value.regionCode = result.regionCode
formData.value.flyerPhone = result.phone
formData.value.flightHours = result.duration || 0
+ formData.value.flyerAddress = result.address
// formData.value.certification = formData.value.certification.concat(result.licenseFrontFileUrl || [], result.licenseBackFileUrl || [])
}
--
Gitblit v1.9.3