From d75d83bd2a1f4e13634f84f8a4de1f7457187b2b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 05 Mar 2026 14:56:13 +0800
Subject: [PATCH] feat:部门管理，删除相关处理
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 201 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 165 insertions(+), 36 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 39fd082..16684d8 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
@@ -5,7 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
- width="60%"
+ width="75%"
:close-on-click-modal="false"
>
<div class="gd-dialog-form">
@@ -21,51 +21,68 @@
clearable
filterable
:disabled="dialogMode !== 'add'"
- @change="handleWorkOrderChange"
>
<el-option v-for="item in workOrderList" :key="item.id" :label="item.workOrderName" :value="item.id" />
</el-select>
</div>
<!-- 工单信息展示 -->
- <div class="work-order-info" v-if="selectedWorkOrder">
+ <div class="work-order-info">
<el-row class="detail-row-view">
<el-col :span="12">
<div class="info-item">
<span class="label">工单类型</span>
- <span class="val">{{ getDictLabel(selectedWorkOrder.workOrderType, dictObj.workOrderType) }}</span>
+ <span class="val" v-if="selectedWorkOrder">
+ {{ getDictLabel(selectedWorkOrder.workOrderType, dictObj.workOrderType) }}
+ </span>
+ <span class="val grayText" v-else>选择工单后自动带出</span>
</div>
</el-col>
<el-col :span="12">
<div class="info-item">
<span class="label">执行时间范围</span>
- <span class="val">{{ selectedWorkOrder.executeStartTime }} ~ {{ selectedWorkOrder.executeEndTime }}</span>
+ <span class="val" v-if="selectedWorkOrder">
+ {{ selectedWorkOrder.executeStartTime }} ~ {{ selectedWorkOrder.executeEndTime }}
+ </span>
+ <span class="val grayText" v-else>选择工单后自动带出</span>
</div>
</el-col>
<el-col :span="12">
<div class="info-item">
<span class="label">设备需求</span>
- <span class="val">{{ getDictLabel(selectedWorkOrder.deviceLoadDemand, dictObj.deviceLoadDemand) }}</span>
+ <span class="val" v-if="selectedWorkOrder">
+ {{ getDictLabel(selectedWorkOrder.deviceLoadDemand, dictObj.deviceLoadDemand) }}
+ </span>
+ <span class="val grayText" v-else>选择工单后自动带出</span>
</div>
</el-col>
<el-col :span="12">
<div class="info-item">
<span class="label">工单备注</span>
- <span class="val">{{ selectedWorkOrder.remark }}</span>
+ <span class="val" v-if="selectedWorkOrder">{{ selectedWorkOrder.remark }}</span>
+ <span class="val grayText" v-else>选择工单后自动带出</span>
</div>
</el-col>
</el-row>
</div>
<!-- 子任务表格表单 -->
- <div class="task-table-section" v-if="selectedWorkOrderId">
+ <div
+ class="task-table-section"
+ :class="{ 'disabled-section': !selectedWorkOrderId }"
+ @click="handleTaskSectionClick"
+ >
<div class="detail-title" :style="{ marginTop: pxToRem(10) }">添加子任务</div>
<div class="task-table-container">
<el-table :data="taskList">
<el-table-column width="50" label="">
<template v-slot="{ $index }">{{ $index + 1 }}</template>
</el-table-column>
- <el-table-column prop="patrolTaskName" label="巡查任务名称" min-width="120">
+ <el-table-column prop="patrolTaskName" min-width="120">
+ <template #header>
+ <span class="required-star">*</span>
+ 巡查任务名称
+ </template>
<template v-slot="{ row }">
<el-input
class="gd-input"
@@ -75,18 +92,21 @@
/>
</template>
</el-table-column>
- <el-table-column prop="patrolTaskType" label="巡查任务类型" min-width="140">
+ <el-table-column prop="patrolTaskType" min-width="140">
+ <template #header>
+ <span class="required-star">*</span>
+ 巡查任务类型
+ </template>
<template v-slot="{ row, $index }">
<el-select
class="gd-select"
popper-class="gd-select-popper"
v-model="row.patrolTaskType"
placeholder="请选择"
- :disabled="dialogReadonly"
@change="handlePatrolTaskTypeChange($index, $event)"
>
<el-option
- v-for="item in dictObj.patrolTaskType"
+ v-for="item in dictObj.workOrderType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -94,11 +114,16 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="executeTime" label="任务执行时间" min-width="180">
+ <el-table-column prop="executeTime" min-width="180">
+ <template #header>
+ <span class="required-star">*</span>
+ 任务执行时间
+ </template>
<template v-slot="{ row }">
+ <!-- gd-date-picker-popper-->
<el-date-picker
class="gd-date-picker"
- popper-class="gd-date-picker-popper"
+ popper-class=""
v-model="row.executeTime"
type="datetime"
placeholder="请选择"
@@ -107,7 +132,11 @@
/>
</template>
</el-table-column>
- <el-table-column prop="patrolRouteUrl" label="巡查任务航线" min-width="120">
+ <el-table-column prop="patrolRouteUrl" min-width="120">
+ <template #header>
+ <span class="required-star">*</span>
+ 巡查任务航线
+ </template>
<template v-slot="{ row }">
<el-select
class="gd-select"
@@ -115,14 +144,21 @@
v-model="row.patrolRouteUrl"
placeholder="请选择"
:disabled="dialogReadonly"
+ :loading="routeLoading"
+ no-data-text="暂无航线"
>
<el-option v-for="item in routeOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</template>
</el-table-column>
- <el-table-column prop="recommendFlyerName" label="推荐飞手" min-width="120">
+ <el-table-column prop="recommendFlyerName" min-width="120">
+ <template #header>
+ <span class="required-star">*</span>
+ 推荐飞手
+ </template>
<template v-slot="{ row, $index }">
<el-select
+ no-data-text="暂无推荐飞手"
class="gd-select"
popper-class="gd-select-popper"
v-model="row.recommendFlyerName"
@@ -139,7 +175,11 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="deviceId" label="选择设备" min-width="120">
+ <el-table-column prop="deviceId" min-width="120">
+ <template #header>
+ <span class="required-star">*</span>
+ 选择设备
+ </template>
<template v-slot="{ row }">
<el-select
class="gd-select"
@@ -158,7 +198,7 @@
<el-input class="gd-input" v-model="row.taskDesc" placeholder="请输入" :disabled="dialogReadonly" />
</template>
</el-table-column>
- <el-table-column label="操作" width="80" fixed="right" v-if="dialogMode === 'add'">
+ <el-table-column label="操作" width="90" fixed="right" v-if="dialogMode === 'add'">
<template v-slot="{ $index }">
<el-button type="primary" :icon="Plus" circle size="small" @click="addTaskRow" />
<el-button
@@ -196,7 +236,7 @@
import { computed, ref, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
import { Plus, Delete } from '@element-plus/icons-vue'
-import { getDictLabel } 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'
@@ -213,15 +253,13 @@
deviceId: null,
taskDesc: '',
})
-// todo 时间线
const dictObj = inject('dictObj')
-
const emit = defineEmits(['success'])
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const dialogReadonly = computed(() => dialogMode.value === 'view')
-const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
+const titleEnum = ref({ edit: '新增', view: '查看', add: '新增' })
// 工单相关
const workOrderList = ref([]) // 工单列表
@@ -231,7 +269,8 @@
// 下拉选项
const flyerListMap = ref({}) // 飞手列表，按行索引存储
const deviceList = ref([]) // 设备列表
-const routeOptions = inject('routeOptions')
+const routeOptions = ref([]) // 航线选项（根据工单范围获取）
+const routeLoading = ref(false) // 航线加载中
// 子任务列表
const taskList = ref([initTaskRow()])
@@ -240,14 +279,50 @@
function handleWorkOrderChange(val) {
if (val) {
selectedWorkOrder.value = workOrderList.value.find(item => item.id === val)
+ // 根据工单范围获取航线列表
+ getAirListByGeom()
+ // 将工单类型赋值给所有子任务行
+ const workOrderType = selectedWorkOrder.value?.workOrderType
+ if (workOrderType) {
+ taskList.value.forEach((task, index) => {
+ task.patrolTaskType = workOrderType
+ // 获取对应的飞手列表
+ getFlyerList(index, workOrderType)
+ })
+ }
} else {
selectedWorkOrder.value = null
+ routeOptions.value = []
}
+}
+
+// 根据工单geom范围获取航线列表
+function getAirListByGeom() {
+ const geom = selectedWorkOrder.value?.geom
+ if (!geom) return
+ const coordinates = geomAnalysis(geom)
+ if (!coordinates || !coordinates.length) return
+ routeLoading.value = true
+ airlineListApi(coordinates).then(res => {
+ routeOptions.value = res.data.data || []
+ }).finally(() => {
+ routeLoading.value = false
+ })
}
// 添加任务行
function addTaskRow() {
- taskList.value.push(initTaskRow())
+ const newTask = initTaskRow()
+ // 如果已选择工单，自动填充工单类型
+ if (selectedWorkOrder.value?.workOrderType) {
+ newTask.patrolTaskType = selectedWorkOrder.value.workOrderType
+ }
+ const newIndex = taskList.value.length
+ taskList.value.push(newTask)
+ // 获取对应的飞手列表
+ if (newTask.patrolTaskType) {
+ getFlyerList(newIndex, newTask.patrolTaskType)
+ }
}
// 删除任务行
@@ -268,9 +343,16 @@
}
}
+// 处理任务区域点击事件（未选择工单时提示）
+function handleTaskSectionClick() {
+ if (!selectedWorkOrderId.value) {
+ ElMessage.warning('请先选择工单')
+ }
+}
+
// 获取工单列表
async function getWorkOrderList() {
- const res = await gdWorkOrderPageApi({ size: 999, workOrderStatus: dialogMode.value ==='add' ? '20' : '' })
+ const res = await gdWorkOrderPageApi({ size: 999, workOrderStatus: dialogMode.value === 'add' ? '20' : '' })
workOrderList.value = res?.data?.data?.records ?? []
}
@@ -282,11 +364,26 @@
await getFlyerList(index, skilledTaskType)
}
+import * as turf from '@turf/turf'
+
+function getPolygonCenter(rawData) {
+ const coordinates = [rawData.map(p => [p.longitude, p.latitude])];
+ const polygon = turf.polygon(coordinates);
+ const center = turf.centroid(polygon);
+ const [centerLon, centerLat] = center.geometry.coordinates;
+ return {longitude: centerLon, latitude: centerLat};
+}
+
+
// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
+ const obj = getPolygonCenter(geomAnalysis(selectedWorkOrder.value.geom))
const res = await gdFlyerPageApi({
size: 999,
+ current: 1,
skilledTaskType,
+ longitude: obj.longitude || '',
+ latitude: obj.latitude || '',
})
flyerListMap.value[index] = res?.data?.data?.records ?? []
}
@@ -294,7 +391,7 @@
// 获取设备列表
async function getDeviceList() {
const res = await gdManageDeviceListApi({
- deviceIds: selectedWorkOrder.value.recommendDeviceIds,
+ deviceIds: selectedWorkOrder.value?.recommendDeviceIds,
})
deviceList.value = res?.data?.data ?? []
}
@@ -302,9 +399,15 @@
watch(
() => selectedWorkOrderId.value,
() => {
+ handleWorkOrderChange(selectedWorkOrderId.value)
getDeviceList()
}
)
+
+// 判断一行是否已填写（至少填写了任务名称）
+function isTaskRowFilled(task) {
+ return !!(task.patrolTaskName || task.executeTime || task.patrolRouteUrl || task.recommendFlyerName || task.deviceId)
+}
// 提交新增
async function handleSubmit() {
@@ -312,13 +415,18 @@
ElMessage.warning('请选择关联工单')
return
}
- if (!taskList.value.length) {
- ElMessage.warning('请添加至少一个子任务')
+ // 过滤出已填写的任务行
+ const filledTasks = taskList.value.filter(task => isTaskRowFilled(task))
+ if (!filledTasks.length) {
+ ElMessage.warning('请至少填写一个子任务')
return
}
- // 校验子任务
+ // 只校验已填写的子任务
for (let i = 0; i < taskList.value.length; i++) {
const task = taskList.value[i]
+ // 跳过未填写的行
+ if (!isTaskRowFilled(task)) continue
+ // 已填写的行需要校验完整性
if (!task.patrolTaskName) {
ElMessage.warning(`第${i + 1}行: 请输入巡查任务名称`)
return
@@ -346,8 +454,9 @@
}
submitting.value = true
try {
- const preID = taskList.value[0].id
- const dataList = taskList.value.map(item => ({
+ const preID = filledTasks[0]?.id
+ // 只提交已填写的任务行
+ const dataList = filledTasks.map(item => ({
...item,
workOrderId: selectedWorkOrderId.value,
id: undefined,
@@ -365,10 +474,11 @@
// 打开弹框
async function open({ mode = 'add', row } = {}) {
dialogMode.value = mode
+ await getWorkOrderList()
if (dialogMode.value === 'add') {
selectedWorkOrderId.value = null
selectedWorkOrder.value = null
- taskList.value = [initTaskRow()]
+ taskList.value = [initTaskRow(), initTaskRow(), initTaskRow(), initTaskRow(), initTaskRow()]
flyerListMap.value = {}
} else {
// 编辑/查看模式 - 加载已有数据
@@ -381,12 +491,9 @@
getFlyerList(0, row.patrolTaskType)
}
}
- getWorkOrderList()
}
-onMounted(() => {
-
-})
+onMounted(() => {})
defineExpose({ open })
</script>
@@ -399,4 +506,26 @@
display: flex;
align-items: center;
}
+.required-star {
+ color: #f56c6c;
+ margin-right: 4px;
+}
+:deep(.el-table__header th) {
+ font-weight: normal !important;
+}
+
+.grayText {
+ color: #9f9f9f !important;
+}
+
+// 禁用区域样式 - 使用 pointer-events: none 禁用所有子元素的点击
+.disabled-section {
+ .task-table-container {
+ * {
+ pointer-events: none;
+ }
+ }
+ opacity: 0.6;
+ cursor: not-allowed;
+}
</style>
--
Gitblit v1.9.3