From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue b/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue
index 9063627..acfc428 100644
--- a/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue
+++ b/applications/task-work-order/src/views/orderView/deviceInvocation/equipmentResource/index.vue
@@ -75,6 +75,11 @@
{{ getDictLabel(row.modeCode, dictObj.modeCode) }}
</template>
</el-table-column>
+ <el-table-column prop="maintenanceState" show-overflow-tooltip label="保养状态">
+ <template v-slot="{ row }">
+ {{ row.maintenanceState === 0 ? '无需保养' : row.maintenanceState === 1 ? '待保养' : '正在保养' }}
+ </template>
+ </el-table-column>
<el-table-column prop="deviceSn" show-overflow-tooltip label="设备SN" />
<el-table-column show-overflow-tooltip label="设备位置" >
<template v-slot="{ row }">
@@ -83,7 +88,7 @@
</el-table-column>
<el-table-column prop="firmwareVersion" show-overflow-tooltip label="固件版本" />
<el-table-column prop="deviceDeptName" show-overflow-tooltip label="所属部门" />
- <el-table-column label="操作" class-name="operation-btns" width="180">
+ <el-table-column label="操作" class-name="operation-btns" width="180" fixed="right">
<template v-slot="{ row }">
<el-link @click="viewEquipment(row)">查看</el-link>
<!-- <el-link type="primary" @click="editEquipment(row)">编辑</el-link>
--
Gitblit v1.9.3