From d522036e071bfc17a6874558bfb3a6f1be83d846 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 12 Feb 2026 11:28:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/flyingHand/index.vue | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 0890b43..a291e82 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/index.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
@@ -112,7 +112,7 @@
import { onMounted, ref, nextTick } from 'vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDictLabel } from '@ztzf/utils'
-import { getFlyingHandPage, removeFlyingHand } from './flyingHandApi'
+import { getFlyingHandPage, removeFlyingHand,getAllFlyerIds } from './flyingHandApi'
import { deviceFlyerApi,deviceFlyerDetailApi } from '@/api/zkxt'
import FlyingHandDialog from './FlyingHandDialog.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
@@ -159,6 +159,7 @@
function handleSearch() {
searchParams.value.current = 1
getList()
+ getFlyingHandList()
}
// 重置查询
@@ -166,6 +167,7 @@
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
getList()
+ getFlyingHandList()
}
// 添加飞手
@@ -212,12 +214,14 @@
await removeFlyingHand({ ids: ids })
ElMessage.success('删除成功')
getList()
+ getFlyingHandList()
}
// 处理弹窗确认
function handleConfirm() {
dialogVisible.value = false
getList()
+ getFlyingHandList()
}
// 获取字典
@@ -229,13 +233,22 @@
// 获取飞手列表
const flyingHandList = ref([])
+const flyingHandEditList = ref([])
function getFlyingHandList() {
- deviceFlyerApi({ current: 1, size: 10 }).then(res => {
- flyingHandList.value = res?.data?.data ?? []
- })
+ getAllFlyerIds().then(resIds => {
+ console.log(resIds.data.data, '99999')
+ deviceFlyerApi({ current: 1, size: 9999 }).then(res => {
+ flyingHandEditList.value = res?.data?.data ?? []
+ flyingHandList.value = res?.data?.data ?? []
+ // 把已经建档的飞手从flyingHandList.value里面移除
+ flyingHandList.value = flyingHandList.value.filter(item => !resIds.data.data.includes(item.id))
+ console.log(flyingHandList.value, '11111')
+ })
+ })
}
provide('flyingHandList', flyingHandList)
+provide('flyingHandEditList', flyingHandEditList)
onMounted(() => {
getList()
--
Gitblit v1.9.3