From c44ade277c2df14948956d7faade8bba2e39ed0c Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 06 Jun 2026 11:05:50 +0800
Subject: [PATCH] feat: 类型多选改造1
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 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 ad0e5d6..ab432d4 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
@@ -92,7 +92,7 @@
/>
</template>
</el-table-column>
- <el-table-column prop="patrolTaskType" min-width="100">
+ <el-table-column prop="patrolTaskType" min-width="120">
<template #header>
<span class="required-star">*</span>
巡查任务类型
@@ -103,8 +103,9 @@
popper-class="gd-select-popper"
v-model="row.patrolTaskType"
:options="workOrderTypeXT"
- :props="taskTypeCascaderProps"
+ :props="{...taskTypeCascaderProps,multiple:true}"
placeholder="请选择"
+ collapse-tags
@change="handlePatrolTaskTypeChange($index, $event)"
/>
</template>
@@ -160,8 +161,7 @@
v-model="row.deviceFlyerId"
placeholder="请选择"
filterable
- :disabled="dialogReadonly || !hasTaskTypeValue(taskList[$index].patrolTaskType)"
-
+ :disabled="dialogReadonly || !taskList[$index].patrolTaskType"
>
<el-option
v-for="item in flyerListMap[$index] || []"
@@ -272,10 +272,8 @@
import { airlineListApi, algorithmGroupedApi } from '@/api/zkxt'
import {
getTaskTypeLabel,
- getTaskTypeLeafValues,
taskTypeCascaderProps,
toTaskTypeCascaderValue,
- toTaskTypeRequestValue,
} from '../taskTypeOptions'
// 初始化任务行
@@ -440,8 +438,7 @@
// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
- const leafValues = getTaskTypeLeafValues(skilledTaskType)
- if (!leafValues.length) {
+ if (!skilledTaskType.length) {
flyerListMap.value[index] = []
return
}
@@ -449,7 +446,7 @@
const res = await gdFlyerPageApi({
size: 999,
current: 1,
- skilledTaskType: leafValues.join(','),
+ skilledTaskType: skilledTaskType.map(item => item[1])?.join?.(','),
// longitude: obj.longitude || '',
// latitude: obj.latitude || '',
})
@@ -476,7 +473,6 @@
function isTaskRowFilled(task) {
return !!(
task.patrolTaskName ||
- hasTaskTypeValue(task.patrolTaskType) ||
task.executeTime ||
task.patrolRouteUrl ||
task.deviceFlyerId ||
@@ -484,9 +480,6 @@
)
}
-function hasTaskTypeValue(value) {
- return !!toTaskTypeRequestValue(value).length
-}
// 提交新增
async function handleSubmit() {
@@ -508,10 +501,6 @@
// 已填写的行需要校验完整性
if (!task.patrolTaskName) {
ElMessage.warning(`第${i + 1}行: 请输入巡查任务名称`)
- return
- }
- if (!hasTaskTypeValue(task.patrolTaskType)) {
- ElMessage.warning(`第${i + 1}行: 请选择巡查任务类型`)
return
}
if (!task.executeTime) {
@@ -537,7 +526,6 @@
// 只提交已填写的任务行
const dataList = filledTasks.map(item => ({
...item,
- patrolTaskType: toTaskTypeRequestValue(item.patrolTaskType),
workOrderId: selectedWorkOrderId.value,
id: undefined,
}))
--
Gitblit v1.9.3