From b248152cc5d600d41e3b0be287a3c43415e46ed1 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 30 Jan 2026 16:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
index bfaf131..e4b90d0 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -25,7 +25,7 @@
@change="handleSearch"
>
<el-option
- v-for="item in dictObj.patrolTaskType"
+ v-for="item in dictObj.workOrderType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -84,7 +84,7 @@
<el-table-column prop="taskNo" show-overflow-tooltip label="巡查任务编号" />
<el-table-column prop="patrolTaskType" show-overflow-tooltip label="巡查任务类型">
<template v-slot="{ row }">
- {{ getDictLabel(row.patrolTaskType, dictObj.patrolTaskType) }}
+ {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
</template>
</el-table-column>
<el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
@@ -163,7 +163,6 @@
const dialogVisible = ref(false)
const viewDiaLogVisible = ref(false)
const dictObj = ref({
- patrolTaskType: [], // 巡查任务类型
workOrderType: [], // 工单类型
deviceLoadDemand: [], // 设备负载需求
taskStatus: [], // 巡查任务状态
@@ -247,7 +246,7 @@
// 获取字典
function getDictList() {
- getDictionaryByCode('patrolTaskType,workOrderType,deviceLoadDemand,taskStatus').then(res => {
+ getDictionaryByCode('workOrderType,deviceLoadDemand,taskStatus').then(res => {
dictObj.value = res.data.data
})
}
--
Gitblit v1.9.3