From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 admin/src/views/business/vehicleType.vue |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/admin/src/views/business/vehicleType.vue b/admin/src/views/business/vehicleType.vue
index c28dab4..ffbe293 100644
--- a/admin/src/views/business/vehicleType.vue
+++ b/admin/src/views/business/vehicleType.vue
@@ -1,8 +1,14 @@
 <template>
   <TableLayout :permissions="['business:category:query']">
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-      <el-form-item label="鍚嶇О" prop="name">
-        <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="绫诲瀷鍚嶇О" prop="name">
+        <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" @keypress.enter.native="search"></el-input>
+      </el-form-item>
+      <el-form-item label="鐘舵��" prop="status">
+        <el-select v-model="searchForm.status" clearable placeholder="璇烽�夋嫨鐘舵��" @change="search">
+          <el-option label="姝e父" :value="0"></el-option>
+          <el-option label="鍋滅敤" :value="1"></el-option>
+        </el-select>
       </el-form-item>
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
@@ -21,9 +27,14 @@
       >
         <el-table-column prop="id" label="ID" min-width="80px"></el-table-column>
         <el-table-column prop="name" label="绫诲瀷鍚嶇О" min-width="120px"></el-table-column>
-        <el-table-column prop="detail" label="閫氳鏂瑰紡" min-width="200px">
+        <el-table-column prop="detail" label="閫氳鏂瑰紡" min-width="120px">
           <template slot-scope="{row}">
-            {{ row.otherField === 'driving' ? '鏈哄姩杞�' : '闈炴満鍔ㄨ溅' }}
+            {{ row.detail === 'driving' ? '鏈哄姩杞�' : '闈炴満鍔ㄨ溅' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="otherField" label="涓婁紶椹鹃┒璇�" min-width="120px">
+          <template slot-scope="{row}">
+            {{ row.otherField == 1 ? '闇�瑕�' : '涓嶉渶瑕�' }}
           </template>
         </el-table-column>
         <el-table-column prop="sortnum" label="鍒嗙被鎺掑簭" min-width="100px"></el-table-column>
@@ -42,7 +53,7 @@
         <el-table-column label="鎿嶄綔" min-width="150" fixed="right">
           <template slot-scope="{row}">
             <el-button type="text" @click="handleEdit(row)">缂栬緫</el-button>
-            <el-button type="text" @click="deleteById(row.id)">鍒犻櫎</el-button>
+            <el-button style="color: red;"  type="text" @click="deleteById(row)">鍒犻櫎</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -71,6 +82,7 @@
     return {
       searchForm: {
         name: '',
+        status:'',
         type: 1
       }
     }

--
Gitblit v1.9.3