From 08a8157bcea47af44cc5477e5f698a0cea22a69c Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 04 Aug 2026 16:41:29 +0800
Subject: [PATCH] feat:下拉框增加灰色
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 82 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 29 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 1f1580c..0def9b4 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -17,7 +17,7 @@
<div class="val">{{ formData.flyerPhone }}</div>
</el-col>
<el-col :span="12">
- <div class="label">飞行时长</div>
+ <div class="label">飞行时长(小时)</div>
<div class="val">{{ formData.flightHours }}</div>
</el-col>
<el-col :span="12">
@@ -30,7 +30,7 @@
</el-col>
<el-col :span="12">
<div class="label">擅长任务类型</div>
- <div class="val">{{ getDictLabel(formData.skilledTaskType, dictObj.workOrderType) }}</div>
+ <div class="val">{{ getTaskTypeLabel(formData.skilledTaskType, workOrderTypeXT) }}</div>
</el-col>
<el-col :span="12">
<div class="label">项目经验</div>
@@ -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"
@@ -90,7 +104,7 @@
class="gd-input"
v-model="formData.flyerPhone"
placeholder="请输入"
- :disabled="dialogType === 'view'"
+ :disabled="true"
/>
</el-form-item>
</el-col>
@@ -101,7 +115,7 @@
v-model.number="formData.flightHours"
placeholder="请输入"
type="number"
- :disabled="dialogType === 'view'"
+ :disabled="true"
/>
</el-form-item>
</el-col>
@@ -145,26 +159,23 @@
</el-col>
<el-col :span="12">
<el-form-item label="擅长任务类型" prop="skilledTaskType">
- <el-select
- class="gd-select"
- popper-class="gd-select-popper"
+ <el-cascader
+ class="gd-cascader"
+ popper-class="gd-cascader-popper"
v-model="formData.skilledTaskType"
+ :options="workOrderTypeXT"
+ :props="{ ...taskTypeCascaderProps, multiple: true }"
placeholder="请选择"
:disabled="dialogType === 'view'"
- >
- <el-option
- v-for="item in dictObj.workOrderType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
+ clearable
+ collapse-tags
+ />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目经验" prop="projectExperience">
<el-input
- class="gd-input"
+ class="gd-input-text"
v-model="formData.projectExperience"
placeholder="请输入"
type="textarea"
@@ -193,6 +204,10 @@
import { submitFlyingHand } from './flyingHandApi'
import { ElMessage } from 'element-plus'
import { getDictLabel } from '@ztzf/utils'
+import {
+ getTaskTypeLabel,
+ taskTypeCascaderProps,
+} from '../orderManage/taskTypeOptions'
import { fieldRules } from '@ztzf/utils'
@@ -213,8 +228,11 @@
})
const dictObj = inject('dictObj') // 擅长任务类型
+const workOrderTypeXT = inject('workOrderTypeXT', ref([]))
const flyingHandList = inject('flyingHandList') // 飞手列表
+const flyingHandEditList = inject('flyingHandEditList') // 飞手建档列表
+
const emit = defineEmits(['update:modelValue', 'confirm'])
@@ -246,8 +264,10 @@
projectExperience: '',
technicalStrength: '',
skilledUavType: '',
+ skilledTaskType: [],
certification: [], // 证书
regionCode: '', // 区域编码
+ flyerAddress: '', // 飞手地址
})
const formData = ref(initForm()) // 表单数据
@@ -268,14 +288,14 @@
flyerId: [
{ required: true, message: '请输入', trigger: 'blur' }
],
- flyerPhone: [
- { required: false, 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' }
],
@@ -301,6 +321,7 @@
if (newData) {
Object.assign(formData.value, newData)
formData.value.flightHours = Number(newData.flightHours)
+ formData.value.skilledTaskType = newData.skilledTaskType || []
}
},
{ deep: true, immediate: true }
@@ -317,7 +338,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 || [])
}
@@ -333,7 +357,7 @@
projectExperience: '',
technicalStrength: '',
skilledUavType: '',
- skilledTaskType: ''
+ skilledTaskType: []
})
}
--
Gitblit v1.9.3