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/orderManage/FormDiaLog.vue | 5 +++--
1 files changed, 3 insertions(+), 2 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 a9e3736..d7bc9c3 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
@@ -67,7 +67,7 @@
<el-table-column prop="patrolTaskName" 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="任务状态">
@@ -177,6 +177,7 @@
<div class="rightBox" v-if="!dialogReadonly">
<div class="detail-title">推荐设备</div>
<el-table
+ class="separateTable"
:empty-text="(formData.deviceLoadDemand && pointList.length) ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'"
ref="deviceTableRef"
:data="(formData.deviceLoadDemand && pointList.length) ? deviceList : []"
@@ -635,7 +636,7 @@
</script>
<style lang="scss" scoped>
-.el-table{
+.separateTable{
height: 0;
flex: 1;
:deep(){
--
Gitblit v1.9.3