From 78287d94c535844c4cbad037b0196a812c00f153 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 26 Jan 2026 14:59:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 68 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 28 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 7148fd1..fc9da8d 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
@@ -18,7 +18,7 @@
:type="index === processList.length - 1 ? 'success' : 'info'"
:color="activity.color"
:hollow="activity.hollow"
- :timestamp="activity.flowDesc.split(' ')[1]"
+ :timestamp="activity.flowDesc.split(' ')[1] + activity.flowDesc.split(' ')[2]"
>
<div class="item-content">
<div>{{ activity.flowDesc.split(' ')[0] }}</div>
@@ -195,34 +195,43 @@
<template #footer>
<template v-if="requester">
+ <template v-if="!suddenlyEdit">
+ <el-button
+ v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)"
+ @click="viewDescription"
+ color="#F2F3F5"
+ >
+ {{ gdStatusObj[gdStatus].reason }}
+ </el-button>
+ <el-button @click="addDescription" v-if="['20', '24', '25', '50'].includes(gdStatus)" color="#F2F3F5">
+ {{ gdStatus === '50' ? '结算' : '申请取消' }}
+ </el-button>
+ <el-button @click="requestModification" v-if="['20', '25'].includes(gdStatus)" color="#4C34FF">
+ 申请修改
+ </el-button>
+ </template>
<el-button
v-if="['11'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
:loading="submitting"
:disabled="submitting"
+ color="#4C34FF"
@click="handleSubmit"
>
{{ 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>
<template v-else>
- <el-button v-if="['21', '23'].includes(gdStatus)" @click="viewDescription">
+ <el-button v-if="['21', '23'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
{{ gdStatusObj[gdStatus].reason }}
</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="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>
- <el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
- <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
+ <el-button v-if="gdStatus === '10'" @click="addDescription" color="#F2F3F5">拒绝接单</el-button>
+ <el-button v-if="gdStatus === '10'" @click="statusChange(1)" color="#4C34FF">接单</el-button>
+ <el-button v-if="gdStatus === '22'" @click="addDescription" color="#F2F3F5">不同意修改</el-button>
+ <el-button v-if="gdStatus === '22'" @click="statusChange(7)" color="#4C34FF">同意修改</el-button>
+ <el-button v-if="gdStatus === '21'" @click="addDescription" color="#F2F3F5">不同意取消</el-button>
+ <el-button v-if="gdStatus === '21'" @click="statusChange(5)" color="#4C34FF">同意取消</el-button>
+ <el-button v-if="gdStatus === '30'" @click="addDescription" color="#4C34FF">协商修改</el-button>
+ <el-button v-if="gdStatus === '31'" @click="statusChange(10)" color="#4C34FF">同意</el-button>
</template>
</template>
@@ -292,13 +301,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 +342,11 @@
})
}
-function requestModification() {
+// 申请修改按钮
+async function requestModification() {
suddenlyEdit.value = true
dialogMode.value = 'edit'
+ await getDeviceList(true)
nextTick(() => {
syncSelection()
viewPlane && viewer.entities.remove(viewPlane)
@@ -342,6 +354,7 @@
})
}
+// 填写说明弹框回调
function rejectSuccess() {
visible.value = false
emit('success')
@@ -373,8 +386,8 @@
}
// 获取推荐设备列表
-async function getDeviceList() {
- const all = ['11'].includes(gdStatus.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}))`
@@ -440,7 +453,7 @@
// 加载时间线list
function loadList() {
- gdWorkOrderFlowListApi({ workOrderId: formData.value.id,type: '0' }).then(res => {
+ gdWorkOrderFlowListApi({ workOrderId: formData.value.id, type: '0' }).then(res => {
processList.value = res.data.data
})
}
@@ -509,7 +522,7 @@
})
}
-// 同步关联场景
+// 回显选中设备
function syncSelection() {
if (!deviceTableRef.value) return
deviceTableRef.value.clearSelection()
@@ -528,16 +541,15 @@
})
}
+// 渲染所有设备
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({
@@ -556,8 +568,8 @@
outlineColor: Cesium.Color.WHITE,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
- pixelOffset: new Cesium.Cartesian2(0, -10)
- }
+ pixelOffset: new Cesium.Cartesian2(0, -10),
+ },
})
})
}
--
Gitblit v1.9.3