From 0be723f121c68eefafb93aba726edb7866edd0d1 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 23 Jan 2026 09:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index 50f0e85..524292f 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -107,8 +107,8 @@
{{ dayjs(row.executeEndTime).format('YYYY-MM-DD') }}
</template>
</el-table-column>
- <el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
<el-table-column prop="createUserName" show-overflow-tooltip label="需求方名称" />
+ <el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
<el-table-column prop="createTime" show-overflow-tooltip label="工单创建时间" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
@@ -229,8 +229,6 @@
dialogRef.value?.open({ mode, row })
})
}
-const editStatus = ['0','11','24','25']
-provide('editStatus', editStatus)
// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、
// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、24响应中_拒绝取消、
// 25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
@@ -238,7 +236,7 @@
function openFormChange(row) {
dialogVisible.value = true
nextTick(() => {
- const mode = editStatus.includes(row.workOrderStatus) && requester.value ? 'edit' : 'view'
+ const mode = ['11','25'].includes(row.workOrderStatus) && requester.value ? 'edit' : 'view'
dialogRef.value?.open({ mode, row })
})
}
--
Gitblit v1.9.3