From d7c19e87b419e92340f0ab6f9ec03f4d4cf2b2a4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 30 Jan 2026 16:40:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 a3064be..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"
@@ -72,7 +72,7 @@
</el-form>
<div class="gd-table-toolbar">
- <el-button v-if="requester" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增</el-button>
+ <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">拆分工单</el-button>
</div>
<div class="gd-table-container" v-loading="loading">
@@ -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="巡查任务状态">
@@ -98,8 +98,7 @@
<el-table-column prop="taskDesc" show-overflow-tooltip label="巡查任务描述" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
- <el-link @click="viewDiaLogView(row)">查看</el-link>
- <!-- <el-link @click="openForm('edit', row)">编辑</el-link>-->
+ <el-link type="primary" @click="viewDiaLogView(row)">查看</el-link>
</template>
</el-table-column>
</el-table>
@@ -140,7 +139,8 @@
import { airlineListApi } from '@/api/zkxt'
const store = useStore()
-const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
+const permission = computed(() => store.state.user.permission)
+
// 初始化查询参数
const initSearchParams = () => ({
patrolTaskName: '', // 任务名称
@@ -163,14 +163,12 @@
const dialogVisible = ref(false)
const viewDiaLogVisible = ref(false)
const dictObj = ref({
- patrolTaskType: [], // 巡查任务类型
workOrderType: [], // 工单类型
deviceLoadDemand: [], // 设备负载需求
taskStatus: [], // 巡查任务状态
})
const activeName = ref('all')
provide('dictObj', dictObj)
-provide('requester', requester)
// 获取列表
async function getList() {
@@ -223,7 +221,7 @@
function viewDiaLogView(row) {
viewDiaLogVisible.value = true
nextTick(() => {
- let mode = ['1', '4'].includes(row.taskStatus) && requester.value ? 'edit' : 'view'
+ let mode = ['1', '4'].includes(row.taskStatus) && permission.value.flyOrder_add ? 'edit' : 'view'
viewDiaLogRef.value?.open({ mode, row })
})
}
@@ -248,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