From b4f08a561973b998036f6ffa9e843cfd5ee877be Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 03 Jun 2026 14:35:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 14 ++++++++++----
1 files changed, 10 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 9535e60..4f0e1c6 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
@@ -13,8 +13,8 @@
<el-form-item label="任务类型" prop="patrolTaskType">
<el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.patrolTaskType"
placeholder="请选择" clearable @change="handleSearch">
- <el-option v-for="item in dictObj.workOrderType" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey" />
+ <el-option v-for="item in workOrderTypeXT" :key="item.dictValue" :label="item.dictLabel"
+ :value="item.dictValue" />
</el-select>
</el-form-item>
@@ -55,7 +55,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.workOrderType) }}
+ {{ getDictLabelXT(row.patrolTaskType, workOrderTypeXT) }}
</template>
</el-table-column>
<el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
@@ -93,7 +93,8 @@
import { onMounted, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictionaryByCode } from '@/api/system/dictbiz'
-import { dateRangeFormat, getDictLabel } from '@ztzf/utils'
+import { dateRangeFormat, getDictLabel, getDictLabelXT } from '@ztzf/utils'
+import { getDictListApi } from '@/api/zkxt'
import FormDiaLog from './FormDiaLog.vue'
import { gdPatrolTaskPageApi, gdPatrolTaskRemoveApi } from './inspectionRequestApi'
import ViewDiaLog from '@/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue'
@@ -130,8 +131,10 @@
deviceLoadDemand: [], // 设备负载需求
taskStatus: [], // 巡查任务状态
})
+const workOrderTypeXT = ref([])
const activeName = ref('all')
provide('dictObj', dictObj)
+provide('workOrderTypeXT', workOrderTypeXT)
const colors = {
0: '#F6A000',//0待签收
@@ -213,6 +216,9 @@
getDictionaryByCode('workOrderType,deviceLoadDemand,taskStatus').then(res => {
dictObj.value = res.data.data
})
+ getDictListApi('task_inspection_type').then(res => {
+ workOrderTypeXT.value = res.data.data || []
+ })
}
function refusalAccept (row) {
--
Gitblit v1.9.3