From eb82684152ffb0acddf67da92e4533a0190eb258 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 10 十月 2025 18:27:31 +0800
Subject: [PATCH] 对接口

---
 admin/src/views/business/jkKeys.vue |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/business/jkKeys.vue b/admin/src/views/business/jkKeys.vue
index 6762ccc..23f116e 100644
--- a/admin/src/views/business/jkKeys.vue
+++ b/admin/src/views/business/jkKeys.vue
@@ -5,8 +5,15 @@
       <el-form-item label="閽ュ寵缂栧彿" prop="code">
         <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ラ挜鍖欑紪鍙�" @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="鎵�灞炶溅杈�" prop="carCode">
-        <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ユ墍灞炶溅杈�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="鎵�灞炶溅杈�" prop="carId">
+        <el-select v-model="searchForm.carId" placeholder="璇烽�夋嫨" @change="search">
+          <el-option
+            v-for="item in carAll"
+            :key="item.id"
+            :label="item.code"
+            :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="鐘舵��" prop="status">
         <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
@@ -37,10 +44,10 @@
       >
         <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="carName" 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="缁戝畾閽ュ寵鏌�" min-width="100px"></el-table-column>
-        <el-table-column prop="rfidLable" label="瀛樻斁浣嶇疆" min-width="100px"></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">
           <template slot-scope="{row}">
             <span v-if="row.isBinding === 0">鏈粦瀹�</span>
@@ -58,12 +65,12 @@
         <el-table-column
           v-if="containPermissions(['business:jkkeys:update', 'business:jkkeys:delete'])"
           label="鎿嶄綔"
-          min-width="120"
+          min-width="150"
           fixed="right"
         >
           <template slot-scope="{row}">
             <el-button type="text" @click="$refs.borrowingAndReturningRecords.open('鍊熻繕璁板綍', row)">棰嗗彇璁板綍</el-button>
-            <el-button type="text" @click="$refs.operaJkKeysWindow.open('缂栬緫閽ュ寵鍩烘湰淇℃伅琛�', row)" v-permissions="['business:jkkeys:update']">缂栬緫</el-button>
+            <el-button type="text" @click="$refs.operaJkKeysWindow.open('缂栬緫閽ュ寵淇℃伅', row)" v-permissions="['business:jkkeys:update']">缂栬緫</el-button>
             <el-button type="text" @click="deleteById(row)" v-permissions="['business:jkkeys:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>
@@ -88,6 +95,7 @@
 import Pagination from '@/components/common/Pagination'
 import OperaJkKeysWindow from '@/components/business/OperaJkKeysWindow'
 import BorrowingAndReturningRecords from '@/components/business/BorrowingAndReturningRecords'
+import { allList } from '@/api/business/cars'
 export default {
   name: 'JkKeys',
   extends: BaseTable,
@@ -97,9 +105,10 @@
       // 鎼滅储
       searchForm: {
         code: '',
-        carCode: '',
+        carId: '',
         status: ''
-      }
+      },
+      carAll: []
     }
   },
   created () {
@@ -110,6 +119,15 @@
       'field.main': 'id'
     })
     this.search()
+    this.getCars()
+  },
+  methods: {
+    getCars() {
+      allList({ type: 0 })
+        .then(res => {
+          this.carAll = res
+        })
+    }
   }
 }
 </script>

--
Gitblit v1.9.3