From daeb81442579b4b7bf99d4f2d0af9fba2d3491e7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 22 May 2026 10:46:30 +0800
Subject: [PATCH] feat: 飞手改为id
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 11 +++--------
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 18 ++++++++++++------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index cc007fb..0df2f3f 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -161,12 +161,12 @@
<el-select
no-data-text="暂无推荐飞手"
class="gd-select"
- popper-class="gd-select-popper"
+ popper-class="gd-select-popper"
v-model="row.deviceFlyerId"
placeholder="请选择"
filterable
:disabled="dialogReadonly || !taskList[$index].patrolTaskType"
- @change="handleFlyerChange($index, $event)"
+
>
<el-option
v-for="item in flyerListMap[$index] || []"
@@ -258,7 +258,6 @@
executeTime: '',
patrolRouteUrl: '',
deviceFlyerId: '',
- recommendFlyerName: '',
deviceId: null,
taskDesc: '',
})
@@ -372,15 +371,11 @@
async function handlePatrolTaskTypeChange(index, skilledTaskType) {
// 清空该行已选择的飞手
taskList.value[index].deviceFlyerId = ''
- taskList.value[index].recommendFlyerName = ''
// 获取对应的飞手列表
await getFlyerList(index, skilledTaskType)
}
-function handleFlyerChange(index, flyerId) {
- const selectedFlyer = (flyerListMap.value[index] || []).find(item => item.flyerId === flyerId)
- taskList.value[index].recommendFlyerName = selectedFlyer?.flyerName || ''
-}
+
import * as turf from '@turf/turf'
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index 4ba9521..ac11597 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -58,7 +58,7 @@
</el-col>
<el-col :span="12">
<div class="label">推荐飞手</div>
- <div class="val">{{ formData.recommendFlyerName }}</div>
+ <div class="val">{{ getFlyerName(formData.deviceFlyerId) }}</div>
</el-col>
<el-col :span="12">
<div class="label">选择设备</div>
@@ -149,16 +149,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="推荐飞手" prop="recommendFlyerName">
+ <el-form-item label="推荐飞手" prop="deviceFlyerId">
<el-select
class="gd-select"
popper-class="gd-select-popper"
- v-model="formData.recommendFlyerName"
+ v-model="formData.deviceFlyerId"
placeholder="请选择"
filterable
clearable
>
- <el-option v-for="item in flyerList" :key="item.id" :label="item.flyerName" :value="item.flyerName" />
+ <el-option v-for="item in flyerList" :key="item.id" :label="item.flyerName" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
@@ -287,7 +287,7 @@
patrolTaskType: '',
executeTime: '',
patrolRouteUrl: '',
- recommendFlyerName: '',
+ deviceFlyerId: null,
deviceId: null,
taskDesc: '',
workOrderId: null,
@@ -338,7 +338,7 @@
patrolTaskType: fieldRules(true),
executeTime: fieldRules(true),
patrolRouteUrl: fieldRules(true),
- recommendFlyerName: fieldRules(true),
+ deviceFlyerId: fieldRules(true),
deviceId: fieldRules(true),
}
@@ -384,6 +384,12 @@
return item ? item.nickname : id
}
+// 获取飞手名称
+function getFlyerName(id) {
+ const item = flyerList.value.find(item => item.id === id)
+ return item ? item.flyerName : id
+}
+
// 获取工单名称
function getWorkOrderName(id) {
if (workOrderDetail.value?.id === id) return workOrderDetail.value.workOrderName
--
Gitblit v1.9.3