feat: 类型多选改造

罗广辉

2026-06-03 d04ecbb2aa47d93e05d28bb551e7bad83d97d60f

 applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue

@@ -33,7 +33,7 @@
                  <div class="info-item">
                     <span class="label">工单类型</span>
                     <span class="val" v-if="selectedWorkOrder">
                        {{ getDictLabelXT(selectedWorkOrder.workOrderType, workOrderTypeXT) }}
                        {{ getTaskTypeLabel(selectedWorkOrder.workOrderType, workOrderTypeXT) }}
                     </span>
                     <span class="val grayText" v-else>选择工单后自动带出</span>
                  </div>
@@ -98,20 +98,15 @@
                        巡查任务类型
                     </template>
                     <template v-slot="{ row, $index }">
                        <el-select
                        <el-cascader
                           class="gd-select"
                           popper-class="gd-select-popper"
                           v-model="row.patrolTaskType"
                           :options="workOrderTypeXT"
                           :props="taskTypeCascaderProps"
                           placeholder="请选择"
                           @change="handlePatrolTaskTypeChange($index, $event)"
                        >
                           <el-option
                              v-for="item in workOrderTypeXT"
                              :key="item.dictValue"
                              :label="item.dictLabel"
                              :value="item.dictValue"
                           />
                        </el-select>
                        />
                     </template>
                  </el-table-column>
                  <el-table-column prop="executeTime" width="200">
@@ -165,7 +160,7 @@
                           v-model="row.deviceFlyerId"
                           placeholder="请选择"
                           filterable
                           :disabled="dialogReadonly || !taskList[$index].patrolTaskType"
                           :disabled="dialogReadonly || !hasTaskTypeValue(taskList[$index].patrolTaskType)"

                        >
                           <el-option
@@ -268,18 +263,25 @@
import { computed, ref, onMounted, inject } from 'vue'
import { ElMessage } from 'element-plus'
import { Plus, Delete } from '@element-plus/icons-vue'
import { geomAnalysis, getDictLabel, getDictLabelXT } from '@ztzf/utils'
import { geomAnalysis, getDictLabel } from '@ztzf/utils'

import { gdPatrolTaskSaveApi, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
import { airlineListApi, algorithmGroupedApi } from '@/api/zkxt'
import {
   getTaskTypeLabel,
   getTaskTypeLeafValues,
   taskTypeCascaderProps,
   toTaskTypeCascaderValue,
   toTaskTypeRequestValue,
} from '../taskTypeOptions'

// 初始化任务行
const initTaskRow = () => ({
   patrolTaskName: '',
   patrolTaskType: '',
   patrolTaskType: [],
   executeTime: '',
   patrolRouteUrl: '',
   deviceFlyerId: '',
@@ -339,13 +341,14 @@
      // 将工单类型赋值给所有子任务行
      const workOrderType = selectedWorkOrder.value?.workOrderType
      if (workOrderType) {
         const patrolTaskType = toTaskTypeCascaderValue(workOrderType)
         taskList.value.forEach((task, index) => {
            taskList.value[index] = {
               ...initTaskRow(),
               patrolTaskType: workOrderType,
               patrolTaskType,
            }
            // 获取对应的飞手列表
            getFlyerList(index, workOrderType)
            getFlyerList(index, patrolTaskType)
         })
      }
   } else {
@@ -373,7 +376,7 @@
   const newTask = initTaskRow()
   // 如果已选择工单，自动填充工单类型
   if (selectedWorkOrder.value?.workOrderType) {
      newTask.patrolTaskType = selectedWorkOrder.value.workOrderType
      newTask.patrolTaskType = toTaskTypeCascaderValue(selectedWorkOrder.value.workOrderType)
   }
   const newIndex = taskList.value.length
   taskList.value.push(newTask)
@@ -437,11 +440,16 @@

// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
   const leafValues = getTaskTypeLeafValues(skilledTaskType)
   if (!leafValues.length) {
      flyerListMap.value[index] = []
      return
   }
   const obj = getPolygonCenter(geomAnalysis(selectedWorkOrder.value.geom))
   const res = await gdFlyerPageApi({
      size: 999,
      current: 1,
      skilledTaskType,
      skilledTaskType: leafValues.join(','),
      // longitude: obj.longitude || '',
      // latitude: obj.latitude || '',
   })
@@ -466,7 +474,18 @@

// 判断一行是否已填写（至少填写了任务名称）
function isTaskRowFilled(task) {
   return !!(task.patrolTaskName || task.executeTime || task.patrolRouteUrl || task.deviceFlyerId || task.deviceId)
   return !!(
      task.patrolTaskName ||
      hasTaskTypeValue(task.patrolTaskType) ||
      task.executeTime ||
      task.patrolRouteUrl ||
      task.deviceFlyerId ||
      task.deviceId
   )
}

function hasTaskTypeValue(value) {
   return !!toTaskTypeRequestValue(value).length
}

// 提交新增
@@ -491,7 +510,7 @@
         ElMessage.warning(`第${i + 1}行: 请输入巡查任务名称`)
         return
      }
      if (!task.patrolTaskType) {
      if (!hasTaskTypeValue(task.patrolTaskType)) {
         ElMessage.warning(`第${i + 1}行: 请选择巡查任务类型`)
         return
      }
@@ -518,6 +537,7 @@
      // 只提交已填写的任务行
      const dataList = filledTasks.map(item => ({
         ...item,
         patrolTaskType: toTaskTypeRequestValue(item.patrolTaskType),
         workOrderId: selectedWorkOrderId.value,
         id: undefined,
      }))
@@ -546,11 +566,11 @@
      // 编辑/查看模式 - 加载已有数据
      selectedWorkOrderId.value = row?.workOrderId
      handleWorkOrderChange(row?.workOrderId)
      taskList.value = [{ ...row }]
      taskList.value = [{ ...row, patrolTaskType: toTaskTypeCascaderValue(row?.patrolTaskType) }]
      flyerListMap.value = {}
      // 如果有巡查类型，加载对应的飞手列表
      if (row?.patrolTaskType) {
         getFlyerList(0, row.patrolTaskType)
         getFlyerList(0, taskList.value[0].patrolTaskType)
      }
   }
}