From 721bb263e9d7955c6f9367963bfbec8a6edfa6f0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 11:56:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/equipmentManagement/inspectionManagement/index.vue | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index 44103ac..809fd4f 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -71,7 +71,8 @@
</div>
</template>
<template #isEnabled="{ row }">
- <el-tag :type="row.isEnabled === 1 ? 'success' : 'danger'" size="small">
+ <el-tag :type="row.isEnabled === 1 ? 'success' : 'danger'"
+ size="small">
{{ row.isEnabled == 1 ? '鏄�' : '鍚�' }}
</el-tag>
</template>
@@ -139,7 +140,7 @@
label: "鏄惁鍚敤",
minWidth: 100,
dataType: "slot",
- slot: "isEnabled"
+ slot: "isEnabled",
},
{
prop: "frequencyType",
@@ -189,6 +190,19 @@
},
{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
{ prop: "createTime", label: "鐧昏鏃ユ湡", minWidth: 100 },
+ {
+ prop: "inspectionResult",
+ label: "宸℃缁撴灉",
+ minWidth: 100,
+ dataType: "tag",
+ formatData: val => {
+ return val == 1 ? "姝ｅ父" : "寮傚父";
+ },
+ formatType: val => {
+ return val == 1 ? "success" : "danger";
+ },
+ },
+ { prop: "abnormalDescription", label: "寮傚父鎻忚堪", minWidth: 100 },
]);
// 鎿嶄綔鍒楅厤缃�
--
Gitblit v1.9.3