From 0cc81c61f36d0072b6252737e3d106ba0d4518a3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 10:10:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/jkKeys.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/business/jkKeys.vue b/admin/src/views/business/jkKeys.vue
index 6e83a1f..3478e40 100644
--- a/admin/src/views/business/jkKeys.vue
+++ b/admin/src/views/business/jkKeys.vue
@@ -45,7 +45,11 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="code" label="閽ュ寵缂栧彿" min-width="100px"></el-table-column>
<el-table-column prop="carCode" label="鎵�灞炶溅杈�" min-width="100px"></el-table-column>
- <el-table-column prop="rfidLable" label="RFID鏍囩" min-width="100px"></el-table-column>
+ <el-table-column prop="rfidLable" label="RFID鏍囩" min-width="150px">
+ <template slot-scope="{row}">
+ <span v-if="row.rfidCode">{{row.rfidCode}} ({{row.rfidLable}})</span>
+ </template>
+ </el-table-column>
<el-table-column prop="cabinetName" label="缁戝畾閽ュ寵鏌�" min-width="100px"></el-table-column>
<el-table-column prop="gridCode" label="瀛樻斁浣嶇疆" min-width="100px"></el-table-column>
<el-table-column label="缁戝畾鐘舵��" min-width="100px">
--
Gitblit v1.9.3