From d7840e75a35e838028ccdd1f8246427babea58a4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 11:42:22 +0800
Subject: [PATCH] feat: 合理流程
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 6c06281..e64cb3c 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -203,13 +203,15 @@
>
{{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
</el-button>
- <el-button v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)" @click="viewDescription">
- {{ gdStatusObj[gdStatus].reason }}
- </el-button>
- <el-button @click="addDescription" v-if="['20', '24', '25', '50'].includes(gdStatus)">
- {{ gdStatus === '50' ? '结算' : '申请取消' }}
- </el-button>
- <el-button @click="requestModification" v-if="['20', '25'].includes(gdStatus)">申请修改</el-button>
+ <template v-if="!suddenlyEdit">
+ <el-button v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)" @click="viewDescription">
+ {{ gdStatusObj[gdStatus].reason }}
+ </el-button>
+ <el-button @click="addDescription" v-if="['20', '24', '25', '50'].includes(gdStatus)">
+ {{ gdStatus === '50' ? '结算' : '申请取消' }}
+ </el-button>
+ <el-button @click="requestModification" v-if="['20', '25'].includes(gdStatus)">申请修改</el-button>
+ </template>
</template>
<template v-else>
<el-button v-if="['21', '23'].includes(gdStatus)" @click="viewDescription">
@@ -217,7 +219,7 @@
</el-button>
<el-button v-if="gdStatus === '10'" @click="addDescription">拒绝接单</el-button>
<el-button v-if="gdStatus === '10'" @click="statusChange(1)">接单</el-button>
- <el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
+ <el-button v-if="gdStatus === '22'" @click="addDescription">不同意修改</el-button>
<el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
<el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
<el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
@@ -292,13 +294,14 @@
const processList = ref([])
let viewPlane
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
+import droneIcon from '@/assets/images/orderView/orderManage/drone.png'
const gdStatusObj = {
'10': { reason: '拒绝原因', operationType: '2' },
'11': { reason: '拒绝原因' },
'20': { reason: '取消原因', operationType: '3' },
'21': { reason: '原因', operationType: '6' },
- '22': { reason: '驳回原因' },
+ '22': { reason: '驳回原因', operationType: '8' },
'23': { reason: '取消原因' },
'24': { reason: '驳回原因', operationType: '3' },
'25': { reason: '驳回原因', operationType: '3' },
@@ -332,9 +335,11 @@
})
}
-function requestModification() {
+// 申请修改按钮
+async function requestModification() {
suddenlyEdit.value = true
dialogMode.value = 'edit'
+ await getDeviceList(true)
nextTick(() => {
syncSelection()
viewPlane && viewer.entities.remove(viewPlane)
@@ -342,6 +347,7 @@
})
}
+// 填写说明弹框回调
function rejectSuccess() {
visible.value = false
emit('success')
@@ -373,8 +379,8 @@
}
// 获取推荐设备列表
-async function getDeviceList() {
- const all = ['11'].includes(gdStatus.value) && requester.value
+async function getDeviceList(allList) {
+ const all = allList || ['11'].includes(gdStatus.value) && requester.value
try {
const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
let geom = `POLYGON((${str}))`
@@ -509,7 +515,7 @@
})
}
-// 同步关联场景
+// 回显选中设备
function syncSelection() {
if (!deviceTableRef.value) return
deviceTableRef.value.clearSelection()
@@ -528,16 +534,16 @@
})
}
+// 渲染所有设备
function setMapDevice() {
gdManageDeviceListApi().then(res => {
renderingDevice(res?.data?.data || [])
})
}
-import droneIcon from '@/assets/images/orderView/orderManage/drone.png'
+// 渲染
function renderingDevice(list) {
- // 渲染红点
list.forEach(item => {
const position = Cesium.Cartesian3.fromDegrees(item.longitude || 115.0, item.latitude || 27.11)
viewer.entities.add({
--
Gitblit v1.9.3