diff --git a/dict.js b/dict.js
index 3ad2cde..1d253f3 100644
--- a/dict.js
+++ b/dict.js
@@ -1,7 +1,7 @@
 (function () {
     const result = []
-    const dictId = "1945772868914941953"
-    const dictType = "dh_paper_type"
+    const dictId = "1946043541675638786"
+    const dictType = "dh_car_status"
     let children = document.querySelector("#doc").children;
     if (children) {
         children = Array.from(children)
diff --git a/src/views/car/carManage/index.vue b/src/views/car/carManage/index.vue
index a286a76..8733eb2 100644
--- a/src/views/car/carManage/index.vue
+++ b/src/views/car/carManage/index.vue
@@ -1,45 +1,90 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
+      <el-row shadow="hover" v-show="showSearch" class="ml10">
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+          <el-form-item style="width: 250px;" label="车牌号" prop="carNum">
+            <el-input v-model="state.queryForm.carNum" placeholder="请输入车牌号" />
+          </el-form-item>
+          <el-form-item style="width: 250px;" label="车主姓名" prop="personName">
+            <el-input v-model="state.queryForm.personName" placeholder="请输入车主姓名" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="search" type="primary" @click="getDataList">
+              {{ $t('common.queryBtn') }}
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
       <el-row>
         <div class="mb8" style="width: 100%">
           <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
             v-auth="'car_carManage_add'">
             新 增
           </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'car_carManage_del'" @click="handleDelete(selectObjs)">
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'car_carManage_del'"
+            @click="handleDelete(selectObjs)">
             删除
           </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'car_carManage_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" :export="'car_carManage_export'" @exportExcel="exportExcel"
+            class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
         </div>
       </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border 
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-				@selection-change="selectionChangHandle"
+      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="carBrand" label="车辆品牌编号(字典)"  show-overflow-tooltip/>
-          <el-table-column prop="carCode" label="车辆编号"  show-overflow-tooltip/>
-          <el-table-column prop="carColor" label="车辆颜色编号(字典)"  show-overflow-tooltip/>
-          <el-table-column prop="carNum" label="车牌号码"  show-overflow-tooltip/>
-          <el-table-column prop="carNumColor" label="车牌颜色编号(字典)"  show-overflow-tooltip/>
-          <el-table-column prop="carStatus" label="车辆状态(0-未使用,1-使用)"  show-overflow-tooltip/>
-          <el-table-column prop="carType" label="车辆类型(字典)"  show-overflow-tooltip/>
-          <el-table-column prop="listType" label="黑白名单编号(0正常,1白名单,2黑名单)"  show-overflow-tooltip/>
-          <el-table-column prop="ownerId" label="车主id"  show-overflow-tooltip/>
-          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>
-          <el-table-column prop="parkType" label="停车类型编号"  show-overflow-tooltip/>
-          <el-table-column prop="parkingLotCode" label="所属车场编号"  show-overflow-tooltip/>
-          <el-table-column prop="memo" label="备注信息"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
+        <el-table-column type="index" label="#" width="80" />
+
+        <el-table-column label="人员">
+          <el-table-column prop="personName" label="姓名" min-width="100" show-overflow-tooltip />
+          <el-table-column prop="personPhone" label="手机号" min-width="120" />
+          <el-table-column prop="deptName" label="部门" min-width="100" />
+        </el-table-column>
+
+        <el-table-column label="车辆">
+          <el-table-column prop="carCode" label="车辆编号" min-width="200" show-overflow-tooltip />
+          <el-table-column prop="carType" label="车辆类型" min-width="100">
+            <template #default="{ row }">
+              <dict-tag :options="dh_car_type" :value="row.carType" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="carStatus" label="车辆状态" min-width="100">
+            <template #default="{ row }">
+              <dict-tag :options="dh_car_status" :value="row.carStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="carBrand" label="车辆品牌" min-width="100">
+            <template #default="{ row }">
+              <dict-tag :options="dh_car_brand" :value="row.carBrand" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="carColor" label="车辆颜色" min-width="100">
+            <template #default="{ row }">
+              <dict-tag :options="dh_car_color" :value="row.carColor" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="carNum" label="车牌号" min-width="120" />
+          <el-table-column prop="carNumColor" label="车牌颜色" min-width="100">
+            <template #default="{ row }">
+              <dict-tag :options="dh_car_num_color" :value="row.carNumColor" />
+            </template>
+          </el-table-column>
+        </el-table-column>
+
+        <el-table-column prop="listType" label="黑白名单状态" min-width="120">
+          <template #default="{ row }">
+            <dict-tag :options="dh_car_list_type" :value="row.listType" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="memo" label="备注信息" min-width="200" show-overflow-tooltip />
+        <el-table-column label="操作" width="150" fixed="right">
           <template #default="scope">
             <el-button icon="edit-pen" text type="primary" v-auth="'car_carManage_edit'"
               @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'car_carManage_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'car_carManage_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -61,6 +106,7 @@ import { useDict } from '/@/hooks/dict';
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
+const { dh_car_color, dh_car_num_color, dh_car_brand, dh_car_type, dh_car_status, dh_car_list_type } = useDict("dh_car_color", "dh_car_num_color", "dh_car_brand", "dh_car_type", "dh_car_status", "dh_car_list_type")
 
 // 定义变量内容
 const formDialogRef = ref()
@@ -83,7 +129,7 @@ const {
   sizeChangeHandle,
   sortChangeHandle,
   downBlobFile,
-	tableStyle
+  tableStyle
 } = useTable(state)
 
 // 清空搜索条件