diff --git a/src/utils/dict.js b/src/utils/dict.js
index e83f183..ba9c21a 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -94,6 +94,12 @@ export const DICT_TYPE = {
   DICT_SYS_USER_SEX : 'system_user_sex',
   //客户状态
   DICT_CUS_INFO_STATUS : 'cus_info_status',
+
+  // ------- carMain模块 -------
+  //车辆性质
+  DICT_CAR_NATURE : 'car_nature',
+  //车辆类别
+  DICT_CAR_CATEGORY : 'car_category',
 }
 
 /**
diff --git a/src/views/base/carmain/CarMainForm.vue b/src/views/base/carmain/CarMainForm.vue
index 47e5130..d262f9b 100644
--- a/src/views/base/carmain/CarMainForm.vue
+++ b/src/views/base/carmain/CarMainForm.vue
@@ -37,22 +37,34 @@
         <el-form-item label="车辆品牌" prop="carBrand">
           <el-input v-model="formData.carBrand" placeholder="请输入车辆品牌" />
         </el-form-item>
+        <el-form-item label="车辆类别" prop="carCategory">
+          <el-select v-model="formData.carCategory" placeholder="请选择车辆类别">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_CAR_CATEGORY)"
+                        :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="车辆性质" prop="carNature">
-          <el-input v-model="formData.carNature" placeholder="请输入车辆性质" />
+          <el-select v-model="formData.carNature" placeholder="请选择车辆性质">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_CAR_NATURE)"
+                        :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="车辆注册日期" prop="carRegisterDate">
           <el-date-picker clearable v-model="formData.carRegisterDate" type="date" value-format="timestamp"
             placeholder="选择车辆注册日期" />
         </el-form-item>
         <el-form-item label="最近办理业务" prop="recentlyHandledBusiness">
-          <el-input v-model="formData.recentlyHandledBusiness" placeholder="请输入车辆性质" />
+          <el-select v-model="formData.recentlyHandledBusiness" placeholder="请选择业务类别">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_CUS_BUSI_TYPE)"
+                        :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="最近办理业务的时间" prop="recentlyHandleBusinessTime">
           <el-date-picker clearable v-model="formData.recentlyHandleBusinessTime" type="date" value-format="timestamp"
             placeholder="选择最近办理业务的时间" />
         </el-form-item>
-        <el-form-item label="行驶证图片" prop="carLicenseImg">
-          <el-input v-model="formData.carLicenseImg" placeholder="请输入行驶证图片" />
+        <el-form-item label="行驶证图片">
+          <ImageUpload v-model="formData.carLicenseImg"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -65,9 +77,13 @@
 
 <script>
 import * as CarMainApi from '@/api/base/carmain';
+import ImageUpload from '@/components/ImageUpload';
+import {getDictDatas, DICT_TYPE} from '@/utils/dict'
 export default {
   name: "CarMainForm",
   components: {
+    ImageUpload,
+
   },
   data() {
     return {
diff --git a/src/views/base/carmain/check.vue b/src/views/base/carmain/check.vue
new file mode 100644
index 0000000..1390a25
--- /dev/null
+++ b/src/views/base/carmain/check.vue
@@ -0,0 +1,267 @@
+  <!-- 二级维护 -->
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="发动机号码" prop="engineNumber">
+        <el-input v-model="queryParams.engineNumber" placeholder="请输入发动机号码" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车架号" prop="vin">
+        <el-input v-model="queryParams.vin" placeholder="请输入车架号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="licenseNumber">
+        <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="carModel">
+        <el-input v-model="queryParams.carModel" placeholder="请输入车辆型号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="保养日期" prop="maintenanceDate">
+        <el-date-picker v-model="queryParams.maintenanceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保养里程" prop="maintenanceMileage">
+        <el-input v-model="queryParams.maintenanceMileage" placeholder="请输入保养里程" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <!-- <el-form-item label="年检日期" prop="inspectionDate">
+        <el-date-picker v-model="queryParams.inspectionDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保险日期" prop="insuranceDate">
+        <el-date-picker v-model="queryParams.insuranceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="二级维护时间" prop="checkDate">
+        <el-date-picker v-model="queryParams.checkDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <el-form-item label="车辆品牌" prop="carBrand">
+        <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆性质" prop="carNature">
+        <el-input v-model="queryParams.carNature" placeholder="请输入车辆性质" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆注册日期" prop="carRegisterDate">
+        <el-date-picker v-model="queryParams.carRegisterDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="最近办理业务" prop="recentlyHandledBusiness">
+        <el-input v-model="queryParams.recentlyHandledBusiness" placeholder="请输入最近办理业务" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="最近办理业务的时间" prop="recentlyHandleBusinessTime">
+        <el-date-picker v-model="queryParams.recentlyHandleBusinessTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="登记时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+          v-hasPermi="['base:car-main:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          :loading="exportLoading" v-hasPermi="['base:car-main:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" >
+      <!-- <el-table-column label="主键标识" align="center" prop="id" /> -->
+
+      <el-table-column label="序号" align="center" prop="num" >
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发动机号码" align="center" prop="engineNumber" />
+      <el-table-column label="车架号" align="center" prop="vin" />
+      <el-table-column label="车牌号" align="center" prop="licenseNumber" />
+      <el-table-column label="车辆型号" align="center" prop="carModel" />
+      <!-- <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.maintenanceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保养里程" align="center" prop="maintenanceMileage" /> -->
+      <!-- <el-table-column label="年检日期" align="center" prop="inspectionDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.inspectionDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保险日期" align="center" prop="insuranceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.insuranceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="二级维护时间" align="center" prop="checkDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.checkDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="车辆品牌" align="center" prop="carBrand" />
+      <el-table-column label="车辆性质" align="center" prop="carNature" />
+      <el-table-column label="车辆注册日期" align="center" prop="carRegisterDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.carRegisterDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" />
+      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="行驶证图片" align="center" prop="carLicenseImg" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">打标签</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">查看详情</el-button>
+            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">推送提醒</el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['base:car-main:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <!-- 对话框(添加 / 修改) -->
+    <CarMainForm ref="formRef" @success="getList" />
+  </div>
+</template>
+
+<script>
+import * as CarMainApi from '@/api/base/carmain';
+import CarMainForm from './CarMainForm.vue';
+export default {
+  name: "CarMain",
+  components: {
+    CarMainForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 车辆信息列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        engineNumber: null,
+        vin: null,
+        licenseNumber: null,
+        carModel: null,
+        maintenanceDate: [],
+        maintenanceMileage: null,
+        inspectionDate: [],
+        insuranceDate: [],
+        checkDate: [],
+        carBrand: null,
+        carNature: null,
+        carRegisterDate: [],
+        carLicenseImg: null,
+        createTime: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      debugger;
+      try {
+        debugger;
+        this.loading = true;
+        const res = await CarMainApi.getCarMainPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      debugger;
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除车辆信息编号为"' + id + '"的数据项?')
+      try {
+        await CarMainApi.deleteCarMain(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch { }
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有车辆信息数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await CarMainApi.exportCarMainExcel(this.queryParams);
+        this.$download.excel(data, '车辆信息.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/base/carmain/index.vue b/src/views/base/carmain/index.vue
index 9b6eaea..2b4495a 100644
--- a/src/views/base/carmain/index.vue
+++ b/src/views/base/carmain/index.vue
@@ -1,75 +1,73 @@
+<!-- 车辆基础信息 -->
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="发动机号码" prop="engineNumber">
-        <el-input v-model="queryParams.engineNumber" placeholder="请输入发动机号码" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="车架号" prop="vin">
-        <el-input v-model="queryParams.vin" placeholder="请输入车架号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="车牌号" prop="licenseNumber">
         <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="车辆型号" prop="carModel">
-        <el-input v-model="queryParams.carModel" placeholder="请输入车辆型号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="保养日期" prop="maintenanceDate">
-        <el-date-picker v-model="queryParams.maintenanceDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="保养里程" prop="maintenanceMileage">
-        <el-input v-model="queryParams.maintenanceMileage" placeholder="请输入保养里程" clearable
+      <el-form-item label="发动机号码" prop="engineNumber" label-width="90">
+        <el-input v-model="queryParams.engineNumber" placeholder="请输入发动机号" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="年检日期" prop="inspectionDate">
-        <el-date-picker v-model="queryParams.inspectionDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+      <!-- <el-form-item label="车架号" prop="vin">
+        <el-input v-model="queryParams.vin" placeholder="请输入车架号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+
+      <el-form-item label="车辆型号" prop="carModel" label-width="90">
+        <el-input v-model="queryParams.carModel" placeholder="请输入车辆型号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="保养日期" prop="maintenanceDate">
+        <el-date-picker v-model="queryParams.maintenanceDate" style="width: 240px" value-format="yyyy-MM-dd"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="保险日期" prop="insuranceDate">
-        <el-date-picker v-model="queryParams.insuranceDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+      </el-form-item> -->
+      <!-- <el-form-item label="保养里程" prop="maintenanceMileage">
+        <el-input v-model="queryParams.maintenanceMileage" placeholder="请输入保养里程" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <!-- <el-form-item label="年检日期" prop="inspectionDate">
+        <el-date-picker v-model="queryParams.inspectionDate" style="width: 240px" value-format="yyyy-MM-dd"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="二级维护时间" prop="checkDate">
-        <el-date-picker v-model="queryParams.checkDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+      </el-form-item> -->
+      <!-- <el-form-item label="保险日期" prop="insuranceDate">
+        <el-date-picker v-model="queryParams.insuranceDate" style="width: 240px" value-format="yyyy-MM-dd"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="车辆品牌" prop="carBrand">
+      </el-form-item> -->
+      <!-- <el-form-item label="二级维护时间" prop="checkDate">
+        <el-date-picker v-model="queryParams.checkDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <el-form-item label="车辆品牌" prop="carBrand" label-width="90">
         <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="车辆性质" prop="carNature">
+      <el-form-item label="车辆性质" prop="carNature" label-width="90">
         <el-input v-model="queryParams.carNature" placeholder="请输入车辆性质" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="车辆注册日期" prop="carRegisterDate">
-        <el-date-picker v-model="queryParams.carRegisterDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+      <!-- <el-form-item label="注册日期" prop="carRegisterDate">
+        <el-date-picker v-model="queryParams.carRegisterDate" style="width: 240px" value-format="yyyy-MM-dd"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="最近办理业务" prop="recentlyHandledBusiness">
-        <el-input v-model="queryParams.recentlyHandledBusiness" placeholder="请输入最近办理业务" clearable
+      </el-form-item> -->
+      <!-- <el-form-item label="最近业务" prop="recentlyHandledBusiness">
+        <el-input v-model="queryParams.recentlyHandledBusiness" placeholder="请输入最近业务" clearable
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="最近办理业务的时间" prop="recentlyHandleBusinessTime">
-        <el-date-picker v-model="queryParams.recentlyHandleBusinessTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+      </el-form-item> -->
+      <!-- <el-form-item label="最近业务时间" prop="recentlyHandleBusinessTime">
+        <el-date-picker v-model="queryParams.recentlyHandleBusinessTime" style="width: 240px" value-format="yyyy-MM-dd"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="行驶证图片" prop="carLicenseImg">
-        <el-input v-model="queryParams.carLicenseImg" placeholder="请输入行驶证图片" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+      </el-form-item> -->
+      <!-- <el-form-item label="登记时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -89,60 +87,82 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键标识" align="center" prop="id" />
-      <el-table-column label="发动机号码" align="center" prop="engineNumber" />
-      <el-table-column label="车架号" align="center" prop="vin" />
-      <el-table-column label="车牌号" align="center" prop="licenseNumber" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" >
+      <!-- <el-table-column label="主键标识" align="center" prop="id" /> -->
+
+      <el-table-column label="序号" align="center" prop="num" >
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车牌号" align="center" prop="licenseNumber" width="150"/>
+      <el-table-column label="发动机号码" align="center" prop="engineNumber" width="180" />
+      <el-table-column label="车架号" align="center" prop="vin" width="150"/>
+
       <el-table-column label="车辆型号" align="center" prop="carModel" />
-      <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
+      <!-- <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.maintenanceDate) }}</span>
+          <span>{{ parseTime(scope.row.maintenanceDate,'{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="保养里程" align="center" prop="maintenanceMileage" />
-      <el-table-column label="年检日期" align="center" prop="inspectionDate" width="180">
+      </el-table-column> -->
+      <!-- <el-table-column label="保养里程" align="center" prop="maintenanceMileage" /> -->
+      <!-- <el-table-column label="年检日期" align="center" prop="inspectionDate" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.inspectionDate) }}</span>
+          <span>{{ parseTime(scope.row.inspectionDate,'{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="保险日期" align="center" prop="insuranceDate" width="180">
+      </el-table-column> -->
+      <!-- <el-table-column label="保险日期" align="center" prop="insuranceDate" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.insuranceDate) }}</span>
+          <span>{{ parseTime(scope.row.insuranceDate,'{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="二级维护时间" align="center" prop="checkDate" width="180">
+      </el-table-column> -->
+      <!-- <el-table-column label="二级维护时间" align="center" prop="checkDate" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.checkDate) }}</span>
+          <span>{{ parseTime(scope.row.checkDate,'{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="车辆品牌" align="center" prop="carBrand" />
-      <el-table-column label="车辆性质" align="center" prop="carNature" />
-      <el-table-column label="车辆注册日期" align="center" prop="carRegisterDate" width="180">
+      <el-table-column label="车辆类别" align="center" prop="carCategory" >
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.carRegisterDate) }}</span>
+          <dict-tag :type="DICT_TYPE.DICT_CAR_CATEGORY" :value="scope.row.carCategory" />
         </template>
       </el-table-column>
-      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" />
-      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="180">
+      <el-table-column label="车辆性质" align="center" prop="carNature" >
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime) }}</span>
+          <dict-tag :type="DICT_TYPE.DICT_CAR_NATURE" :value="scope.row.carNature" />
         </template>
       </el-table-column>
-      <el-table-column label="行驶证图片" align="center" prop="carLicenseImg" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="车辆注册日期" align="center" prop="carRegisterDate" width="130">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.carRegisterDate,'{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" width="130">
         <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.recentlyHandledBusiness" />
+        </template>
+      </el-table-column>
+      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="150">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="行驶证图片" align="center" prop="carLicenseImg" /> -->
+      <el-table-column label="登记时间" align="center" prop="createTime" width="120">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+          v-hasPermi="['base:car-main:update']">查看详情</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
             v-hasPermi="['base:car-main:update']">修改</el-button>
             <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
             v-hasPermi="['base:car-main:update']">打标签</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
-            v-hasPermi="['base:car-main:update']">推送提醒</el-button>
+            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">推送提醒</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['base:car-main:delete']">删除</el-button>
         </template>
@@ -159,6 +179,7 @@
 <script>
 import * as CarMainApi from '@/api/base/carmain';
 import CarMainForm from './CarMainForm.vue';
+import {getDictDatas, DICT_TYPE, getDictData} from '@/utils/dict';
 export default {
   name: "CarMain",
   components: {
@@ -238,7 +259,10 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除车辆信息编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除该条车辆信息?')
+      if(row.recentlyHandleBusiness){
+        await this.$modal.confirm('该车曾于 "' + parseTime(row.recentlyHandleBusinessTime,'{y}-{m}-{d}') + '" 发生过 "' + this.getDictData(DICT_CUS_BUSI_TYPE,row.recentlyHandleBusiness) + '" 业务，是否继续删除？')
+      }
       try {
         await CarMainApi.deleteCarMain(id);
         await this.getList();
diff --git a/src/views/base/carmain/inspection.vue b/src/views/base/carmain/inspection.vue
new file mode 100644
index 0000000..6cdb9f0
--- /dev/null
+++ b/src/views/base/carmain/inspection.vue
@@ -0,0 +1,267 @@
+  <!-- 年检 -->
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="发动机号码" prop="engineNumber">
+        <el-input v-model="queryParams.engineNumber" placeholder="请输入发动机号码" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车架号" prop="vin">
+        <el-input v-model="queryParams.vin" placeholder="请输入车架号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="licenseNumber">
+        <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="carModel">
+        <el-input v-model="queryParams.carModel" placeholder="请输入车辆型号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="保养日期" prop="maintenanceDate">
+        <el-date-picker v-model="queryParams.maintenanceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保养里程" prop="maintenanceMileage">
+        <el-input v-model="queryParams.maintenanceMileage" placeholder="请输入保养里程" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <!-- <el-form-item label="年检日期" prop="inspectionDate">
+        <el-date-picker v-model="queryParams.inspectionDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保险日期" prop="insuranceDate">
+        <el-date-picker v-model="queryParams.insuranceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="二级维护时间" prop="checkDate">
+        <el-date-picker v-model="queryParams.checkDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <el-form-item label="车辆品牌" prop="carBrand">
+        <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆性质" prop="carNature">
+        <el-input v-model="queryParams.carNature" placeholder="请输入车辆性质" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆注册日期" prop="carRegisterDate">
+        <el-date-picker v-model="queryParams.carRegisterDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="最近办理业务" prop="recentlyHandledBusiness">
+        <el-input v-model="queryParams.recentlyHandledBusiness" placeholder="请输入最近办理业务" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="最近办理业务的时间" prop="recentlyHandleBusinessTime">
+        <el-date-picker v-model="queryParams.recentlyHandleBusinessTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="登记时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+          v-hasPermi="['base:car-main:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          :loading="exportLoading" v-hasPermi="['base:car-main:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" >
+      <!-- <el-table-column label="主键标识" align="center" prop="id" /> -->
+
+      <el-table-column label="序号" align="center" prop="num" >
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发动机号码" align="center" prop="engineNumber" />
+      <el-table-column label="车架号" align="center" prop="vin" />
+      <el-table-column label="车牌号" align="center" prop="licenseNumber" />
+      <el-table-column label="车辆型号" align="center" prop="carModel" />
+      <!-- <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.maintenanceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保养里程" align="center" prop="maintenanceMileage" /> -->
+      <!-- <el-table-column label="年检日期" align="center" prop="inspectionDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.inspectionDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保险日期" align="center" prop="insuranceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.insuranceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="二级维护时间" align="center" prop="checkDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.checkDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="车辆品牌" align="center" prop="carBrand" />
+      <el-table-column label="车辆性质" align="center" prop="carNature" />
+      <el-table-column label="车辆注册日期" align="center" prop="carRegisterDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.carRegisterDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" />
+      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="行驶证图片" align="center" prop="carLicenseImg" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">打标签</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">查看详情</el-button>
+            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">推送提醒</el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['base:car-main:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <!-- 对话框(添加 / 修改) -->
+    <CarMainForm ref="formRef" @success="getList" />
+  </div>
+</template>
+
+<script>
+import * as CarMainApi from '@/api/base/carmain';
+import CarMainForm from './CarMainForm.vue';
+export default {
+  name: "CarMain",
+  components: {
+    CarMainForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 车辆信息列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        engineNumber: null,
+        vin: null,
+        licenseNumber: null,
+        carModel: null,
+        maintenanceDate: [],
+        maintenanceMileage: null,
+        inspectionDate: [],
+        insuranceDate: [],
+        checkDate: [],
+        carBrand: null,
+        carNature: null,
+        carRegisterDate: [],
+        carLicenseImg: null,
+        createTime: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      debugger;
+      try {
+        debugger;
+        this.loading = true;
+        const res = await CarMainApi.getCarMainPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      debugger;
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除车辆信息编号为"' + id + '"的数据项?')
+      try {
+        await CarMainApi.deleteCarMain(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch { }
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有车辆信息数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await CarMainApi.exportCarMainExcel(this.queryParams);
+        this.$download.excel(data, '车辆信息.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/base/carmain/insurance.vue b/src/views/base/carmain/insurance.vue
new file mode 100644
index 0000000..aa7f272
--- /dev/null
+++ b/src/views/base/carmain/insurance.vue
@@ -0,0 +1,267 @@
+<!-- 保险 -->
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="发动机号码" prop="engineNumber">
+        <el-input v-model="queryParams.engineNumber" placeholder="请输入发动机号码" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车架号" prop="vin">
+        <el-input v-model="queryParams.vin" placeholder="请输入车架号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="licenseNumber">
+        <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="carModel">
+        <el-input v-model="queryParams.carModel" placeholder="请输入车辆型号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="保养日期" prop="maintenanceDate">
+        <el-date-picker v-model="queryParams.maintenanceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保养里程" prop="maintenanceMileage">
+        <el-input v-model="queryParams.maintenanceMileage" placeholder="请输入保养里程" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <!-- <el-form-item label="年检日期" prop="inspectionDate">
+        <el-date-picker v-model="queryParams.inspectionDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保险日期" prop="insuranceDate">
+        <el-date-picker v-model="queryParams.insuranceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="二级维护时间" prop="checkDate">
+        <el-date-picker v-model="queryParams.checkDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <el-form-item label="车辆品牌" prop="carBrand">
+        <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆性质" prop="carNature">
+        <el-input v-model="queryParams.carNature" placeholder="请输入车辆性质" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆注册日期" prop="carRegisterDate">
+        <el-date-picker v-model="queryParams.carRegisterDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="最近办理业务" prop="recentlyHandledBusiness">
+        <el-input v-model="queryParams.recentlyHandledBusiness" placeholder="请输入最近办理业务" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="最近办理业务的时间" prop="recentlyHandleBusinessTime">
+        <el-date-picker v-model="queryParams.recentlyHandleBusinessTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="登记时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+          v-hasPermi="['base:car-main:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          :loading="exportLoading" v-hasPermi="['base:car-main:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" >
+      <!-- <el-table-column label="主键标识" align="center" prop="id" /> -->
+
+      <el-table-column label="序号" align="center" prop="num" >
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发动机号码" align="center" prop="engineNumber" />
+      <el-table-column label="车架号" align="center" prop="vin" />
+      <el-table-column label="车牌号" align="center" prop="licenseNumber" />
+      <el-table-column label="车辆型号" align="center" prop="carModel" />
+      <!-- <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.maintenanceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保养里程" align="center" prop="maintenanceMileage" /> -->
+      <!-- <el-table-column label="年检日期" align="center" prop="inspectionDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.inspectionDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保险日期" align="center" prop="insuranceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.insuranceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="二级维护时间" align="center" prop="checkDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.checkDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="车辆品牌" align="center" prop="carBrand" />
+      <el-table-column label="车辆性质" align="center" prop="carNature" />
+      <el-table-column label="车辆注册日期" align="center" prop="carRegisterDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.carRegisterDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" />
+      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="行驶证图片" align="center" prop="carLicenseImg" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">打标签</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">查看详情</el-button>
+            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">推送提醒</el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['base:car-main:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <!-- 对话框(添加 / 修改) -->
+    <CarMainForm ref="formRef" @success="getList" />
+  </div>
+</template>
+
+<script>
+import * as CarMainApi from '@/api/base/carmain';
+import CarMainForm from './CarMainForm.vue';
+export default {
+  name: "CarMain",
+  components: {
+    CarMainForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 车辆信息列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        engineNumber: null,
+        vin: null,
+        licenseNumber: null,
+        carModel: null,
+        maintenanceDate: [],
+        maintenanceMileage: null,
+        inspectionDate: [],
+        insuranceDate: [],
+        checkDate: [],
+        carBrand: null,
+        carNature: null,
+        carRegisterDate: [],
+        carLicenseImg: null,
+        createTime: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      debugger;
+      try {
+        debugger;
+        this.loading = true;
+        const res = await CarMainApi.getCarMainPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      debugger;
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除车辆信息编号为"' + id + '"的数据项?')
+      try {
+        await CarMainApi.deleteCarMain(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch { }
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有车辆信息数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await CarMainApi.exportCarMainExcel(this.queryParams);
+        this.$download.excel(data, '车辆信息.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+  }
+};
+</script>
diff --git a/src/views/base/carmain/maintenance.vue b/src/views/base/carmain/maintenance.vue
new file mode 100644
index 0000000..bc18ab5
--- /dev/null
+++ b/src/views/base/carmain/maintenance.vue
@@ -0,0 +1,267 @@
+  <!-- 保养 -->
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="发动机号码" prop="engineNumber">
+        <el-input v-model="queryParams.engineNumber" placeholder="请输入发动机号码" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车架号" prop="vin">
+        <el-input v-model="queryParams.vin" placeholder="请输入车架号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="licenseNumber">
+        <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="carModel">
+        <el-input v-model="queryParams.carModel" placeholder="请输入车辆型号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="保养日期" prop="maintenanceDate">
+        <el-date-picker v-model="queryParams.maintenanceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保养里程" prop="maintenanceMileage">
+        <el-input v-model="queryParams.maintenanceMileage" placeholder="请输入保养里程" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <!-- <el-form-item label="年检日期" prop="inspectionDate">
+        <el-date-picker v-model="queryParams.inspectionDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="保险日期" prop="insuranceDate">
+        <el-date-picker v-model="queryParams.insuranceDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <!-- <el-form-item label="二级维护时间" prop="checkDate">
+        <el-date-picker v-model="queryParams.checkDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item> -->
+      <el-form-item label="车辆品牌" prop="carBrand">
+        <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆性质" prop="carNature">
+        <el-input v-model="queryParams.carNature" placeholder="请输入车辆性质" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="车辆注册日期" prop="carRegisterDate">
+        <el-date-picker v-model="queryParams.carRegisterDate" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="最近办理业务" prop="recentlyHandledBusiness">
+        <el-input v-model="queryParams.recentlyHandledBusiness" placeholder="请输入最近办理业务" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="最近办理业务的时间" prop="recentlyHandleBusinessTime">
+        <el-date-picker v-model="queryParams.recentlyHandleBusinessTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="登记时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+          v-hasPermi="['base:car-main:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          :loading="exportLoading" v-hasPermi="['base:car-main:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" >
+      <!-- <el-table-column label="主键标识" align="center" prop="id" /> -->
+
+      <el-table-column label="序号" align="center" prop="num" >
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ queryParams.pageSize * (queryParams.pageNo - 1) + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发动机号码" align="center" prop="engineNumber" />
+      <el-table-column label="车架号" align="center" prop="vin" />
+      <el-table-column label="车牌号" align="center" prop="licenseNumber" />
+      <el-table-column label="车辆型号" align="center" prop="carModel" />
+      <!-- <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.maintenanceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保养里程" align="center" prop="maintenanceMileage" /> -->
+      <!-- <el-table-column label="年检日期" align="center" prop="inspectionDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.inspectionDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="保险日期" align="center" prop="insuranceDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.insuranceDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="二级维护时间" align="center" prop="checkDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.checkDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="车辆品牌" align="center" prop="carBrand" />
+      <el-table-column label="车辆性质" align="center" prop="carNature" />
+      <el-table-column label="车辆注册日期" align="center" prop="carRegisterDate" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.carRegisterDate,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" />
+      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="行驶证图片" align="center" prop="carLicenseImg" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">打标签</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">查看详情</el-button>
+            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+            v-hasPermi="['base:car-main:update']">推送提醒</el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['base:car-main:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <!-- 对话框(添加 / 修改) -->
+    <CarMainForm ref="formRef" @success="getList" />
+  </div>
+</template>
+
+<script>
+import * as CarMainApi from '@/api/base/carmain';
+import CarMainForm from './CarMainForm.vue';
+export default {
+  name: "CarMain",
+  components: {
+    CarMainForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 车辆信息列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        engineNumber: null,
+        vin: null,
+        licenseNumber: null,
+        carModel: null,
+        maintenanceDate: [],
+        maintenanceMileage: null,
+        inspectionDate: [],
+        insuranceDate: [],
+        checkDate: [],
+        carBrand: null,
+        carNature: null,
+        carRegisterDate: [],
+        carLicenseImg: null,
+        createTime: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      debugger;
+      try {
+        debugger;
+        this.loading = true;
+        const res = await CarMainApi.getCarMainPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      debugger;
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除车辆信息编号为"' + id + '"的数据项?')
+      try {
+        await CarMainApi.deleteCarMain(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch { }
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有车辆信息数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await CarMainApi.exportCarMainExcel(this.queryParams);
+        this.$download.excel(data, '车辆信息.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+  }
+};
+</script>