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/index.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/index.vue b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
index 46f1a72..0890b43 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/index.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
@@ -3,7 +3,13 @@
<basic-container>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="飞手姓名" prop="flyerName">
- <el-select
+ <el-input
+ class="gd-input gray"
+ v-model="searchParams.flyerName"
+ placeholder="请输入飞手姓名"
+ clearable
+ />
+ <!-- <el-select
class="gd-select gray"
popper-class="gd-select-popper"
v-model="searchParams.flyerName"
@@ -15,7 +21,7 @@
:label="item.name"
:value="item.id"
/>
- </el-select>
+ </el-select> -->
</el-form-item>
<el-form-item label="擅长机型" prop="skilledUavType">
@@ -43,7 +49,7 @@
</el-form>
<div class="gd-table-toolbar">
- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="addFlyingHand">新增</el-button>
+ <el-button :icon="Plus" color="#4C34FF" type="primary" @click="addFlyingHand">飞手建档</el-button>
</div>
<div class="gd-table-container" v-loading="loading">
@@ -66,7 +72,7 @@
</el-table-column>
<el-table-column prop="skilledTaskType" show-overflow-tooltip label="擅长任务类型">
<template v-slot="{ row }">
- {{ getDictLabel(row.skilledTaskType, dictObj.skilledTaskType) }}
+ {{ getDictLabel(row.skilledTaskType, dictObj.workOrderType) }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="operation-btns" width="180">
@@ -107,7 +113,7 @@
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDictLabel } from '@ztzf/utils'
import { getFlyingHandPage, removeFlyingHand } from './flyingHandApi'
-import { deviceFlyerApi } from '@/api/zkxt'
+import { deviceFlyerApi,deviceFlyerDetailApi } from '@/api/zkxt'
import FlyingHandDialog from './FlyingHandDialog.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { prod } from 'mathjs'
@@ -130,7 +136,7 @@
const flyingHandData = ref({})
const dictObj = ref({
- skilledTaskType: [], // 擅长任务类型
+ workOrderType: [], // 擅长任务类型
skilledUavType: [], // 擅长机型
technicalStrength: [] // 技术特长
})
@@ -172,8 +178,18 @@
// 查看飞手
function viewFlyingHand(row) {
dialogType.value = 'view'
- flyingHandData.value = { ...row }
- dialogVisible.value = true
+ if (row.flyerId) {
+ deviceFlyerDetailApi(row.flyerId).then(res => {
+ flyingHandData.value = { ...row }
+ flyingHandData.value.licenseFrontFileUrl = res.data.data.licenseFrontFileUrl
+ flyingHandData.value.licenseBackFileUrl = res.data.data.licenseBackFileUrl
+ flyingHandData.value.certification = [res.data.data.licenseFrontFileUrl, res.data.data.licenseBackFileUrl]
+ dialogVisible.value = true
+ })
+ } else {
+ flyingHandData.value = { ...row }
+ dialogVisible.value = true
+ }
}
// 编辑飞手
@@ -206,7 +222,7 @@
// 获取字典
function getDictList() {
- getDictionaryByCode('skilledTaskType,skilledUavType,technicalStrength').then(res => {
+ getDictionaryByCode('workOrderType,skilledUavType,technicalStrength').then(res => {
dictObj.value = res.data.data
})
}
@@ -227,4 +243,4 @@
getFlyingHandList()
})
</script>
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3