From 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/jkKeys.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/jkKeys.vue b/admin/src/views/business/jkKeys.vue
index 23f116e..3478e40 100644
--- a/admin/src/views/business/jkKeys.vue
+++ b/admin/src/views/business/jkKeys.vue
@@ -6,7 +6,7 @@
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏ラ挜鍖欑紪鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎵�灞炶溅杈�" prop="carId">
- <el-select v-model="searchForm.carId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.carId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in carAll"
:key="item.id"
@@ -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">
@@ -123,7 +127,7 @@
},
methods: {
getCars() {
- allList({ type: 0 })
+ allList({ })
.then(res => {
this.carAll = res
})
--
Gitblit v1.9.3