From e946d0a2f9cf788e8f9ca0f84cf96fced21aaf5e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 23 Jan 2026 11:21:03 +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 | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 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 0cafd2f..ea78133 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
@@ -10,9 +10,22 @@
>
<div class="content" style="display: flex">
<div class="processBox" v-if="dialogMode !== 'add' && processList.length">
- <el-steps direction="vertical" :active="processList.length">
- <el-step v-for="item in processList" :title="item.flowName" :description="item.flowDesc" />
- </el-steps>
+ <el-timeline>
+ <el-timeline-item
+ v-for="(activity, index) in processList"
+ :key="index"
+ :icon="Check"
+ :type="index === processList.length - 1 ? 'success' : 'info'"
+ :color="activity.color"
+ :hollow="activity.hollow"
+ :timestamp="activity.flowDesc.split(' ')[1]"
+ >
+ <div class="item-content">
+ <div>{{ activity.flowDesc.split(' ')[0] }}</div>
+ <div class="flowName">{{ activity.flowName }}</div>
+ </div>
+ </el-timeline-item>
+ </el-timeline>
</div>
<div class="leftBox">
<div v-if="dialogReadonly">
@@ -181,13 +194,12 @@
<template #footer>
<template v-if="requester">
<el-button
- v-if="['11', '31'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
+ v-if="['11'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
:loading="submitting"
:disabled="submitting"
@click="handleSubmit"
>
- {{ gdStatus === '11' ? '发布' : '提交修改' }}
- 发布
+ {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
</el-button>
<el-button v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)" @click="viewDescription">
{{ gdStatusObj[gdStatus].reason }}
@@ -206,8 +218,9 @@
<el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
<el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
<el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
- <el-button v-if="gdStatus === '21'" @click="statusChange(6)">不同意取消</el-button>
+ <el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
<el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
+ <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
</template>
</template>
@@ -239,7 +252,7 @@
import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdPatrolTaskPageApi } from '@/views/orderView/orderManage/inspectionRequest/inspectionRequestApi'
-
+import { Check } from '@element-plus/icons-vue'
// 初始化表单数据
const initForm = () => ({
workOrderName: '',
@@ -279,11 +292,10 @@
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
const gdStatusObj = {
- '0': { reason: '' },
'10': { reason: '拒绝原因', operationType: '2' },
'11': { reason: '拒绝原因' },
'20': { reason: '取消原因', operationType: '3' },
- '21': { reason: '取消原因' },
+ '21': { reason: '原因', operationType: '6' },
'22': { reason: '驳回原因' },
'23': { reason: '取消原因' },
'24': { reason: '驳回原因', operationType: '3' },
@@ -291,7 +303,7 @@
'30': { reason: '修改原因', operationType: '9' },
'31': { reason: '修改原因' },
'40': { reason: '' },
- '50': { reason: '情况说明', operationType: '10' },
+ '50': { reason: '情况说明', operationType: '11' },
'60': { reason: '情况说明' },
}
@@ -306,7 +318,8 @@
deviceLoadDemand: fieldRules(true),
}
-// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改
+// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消
+// 6不同意取消 7.同意修改 8.不同意修改 9.协商修改,10:同意协商修改，11.结算
function statusChange(operationType) {
gdWorkOrderHandleStatusApi({
operationType: operationType,
@@ -345,12 +358,15 @@
})
}
+// 查看说明
function viewDescription() {
rejectVisible.value = true
- refuseOrderDialogRef.value.open({
- mode: 'view',
- row: formData.value,
- formLabel: gdStatusObj[gdStatus.value].reason,
+ nextTick(() => {
+ refuseOrderDialogRef.value.open({
+ mode: 'view',
+ row: formData.value,
+ formLabel: gdStatusObj[gdStatus.value].reason,
+ })
})
}
@@ -360,7 +376,7 @@
const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
let geom = `POLYGON((${str}))`
const res = await gdManageDeviceListApi({
- ids: formData.value.recommendDeviceIds,
+ deviceIds: formData.value.recommendDeviceIds,
devicePayload: dialogMode.value === 'add' ? formData.value.deviceLoadDemand : '',
geom: dialogMode.value === 'add' ? geom : '',
})
@@ -370,6 +386,7 @@
}
}
+// 设备需求变化
function loadDemandChange() {
formData.value.recommendDeviceIds = ''
selectedDevices.value = []
@@ -418,6 +435,7 @@
}
)
+// 加载时间线list
function loadList() {
gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
processList.value = res.data.data
@@ -581,6 +599,7 @@
}
.rightBox {
+ width: 350px;
.title {
font-weight: 500;
font-size: 14px;
@@ -590,6 +609,18 @@
.processBox {
width: 312px;
+ .el-timeline{
+ padding-left: 100px;
+ }
+ .item-content{
+ position: relative;
+ .flowName{
+ position: absolute;
+ left: -100px;
+ top: 0;
+ }
+ }
+
}
}
--
Gitblit v1.9.3