From e4439e5d0a2cba9983f013bd044fe4e22c7b7077 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 11 Feb 2026 16:35:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 71823fb..21409bd 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -60,7 +60,7 @@
:model="formData"
:rules="rules"
class="gd-dialog-form"
- label-width="160px"
+ label-width="auto"
v-else
>
<el-row>
@@ -90,7 +90,7 @@
class="gd-input"
v-model="formData.flyerPhone"
placeholder="请输入"
- :disabled="dialogType === 'view'"
+ :disabled="true"
/>
</el-form-item>
</el-col>
@@ -101,7 +101,7 @@
v-model.number="formData.flightHours"
placeholder="请输入"
type="number"
- :disabled="dialogType === 'view'"
+ :disabled="true"
/>
</el-form-item>
</el-col>
@@ -248,6 +248,7 @@
skilledUavType: '',
certification: [], // 证书
regionCode: '', // 区域编码
+ flyerAddress: '', // 飞手地址
})
const formData = ref(initForm()) // 表单数据
@@ -268,14 +269,14 @@
flyerId: [
{ required: true, message: '请输入', trigger: 'blur' }
],
- flyerPhone: [
- { required: true, message: '请输入', trigger: 'blur' },
- { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
- ],
- flightHours: [
- { required: true, message: '请输入', trigger: 'blur' },
- { type: 'number', min: 0, message: '飞行时长必须大于等于0', trigger: 'blur' }
- ],
+ // flyerPhone: [
+ // { required: true, message: '请输入', trigger: 'blur' },
+ // { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
+ // ],
+ // flightHours: [
+ // { required: true, message: '请输入', trigger: 'blur' },
+ // { type: 'number', min: 0, message: '飞行时长必须大于等于0', trigger: 'blur' }
+ // ],
technicalSkills: [
{ required: true, message: '请选择', trigger: 'change' }
],
@@ -317,7 +318,10 @@
const result = flyingHandList.value.find(item => item.id === val) || []
formData.value.flyerName = result.name
formData.value.regionCode = result.regionCode
- formData.value.certification = formData.value.certification.concat(result.licenseFrontFileUrl || [], result.licenseBackFileUrl || [])
+ 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