From 65ebb1831a4b40aa88f6c331f12e76b758812cd0 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Wed, 14 Aug 2024 16:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/carmain/index.js          |  10 +
 src/views/base/carmain/CarMainForm.vue |   2 +-
 src/views/base/carmain/inspection.vue  | 239 ++----------------------
 src/views/base/carmain/insurance.vue   | 223 ++---------------------
 src/views/base/carmain/maintenance.vue | 243 +++----------------------
 5 files changed, 63 insertions(+), 654 deletions(-)

diff --git a/src/api/base/carmain/index.js b/src/api/base/carmain/index.js
index 20bd9bd..11ccaab 100644
--- a/src/api/base/carmain/index.js
+++ b/src/api/base/carmain/index.js
@@ -59,6 +59,16 @@ export function getCarMainPage(params) {
     params
   })
 }
+
+// 获得车辆信息分页
+export function remindCarMainPage(params) {
+  return request({
+    url: '/base/carMain/remindCarMainPage',
+    method: 'get',
+    params
+  })
+}
+
 // 获得车辆信息分页
 export function compute(data) {
   return request({
diff --git a/src/views/base/carmain/CarMainForm.vue b/src/views/base/carmain/CarMainForm.vue
index d117049..cfcc50a 100644
--- a/src/views/base/carmain/CarMainForm.vue
+++ b/src/views/base/carmain/CarMainForm.vue
@@ -113,7 +113,7 @@
             </el-row>
           </el-collapse-item>
 
-          <el-collapse-item title="测算信息" name="3">
+          <el-collapse-item title="测算" name="3">
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="保险到期时间" prop="insuranceExpiryDate">
diff --git a/src/views/base/carmain/inspection.vue b/src/views/base/carmain/inspection.vue
index 0e5300a..7ee06fc 100644
--- a/src/views/base/carmain/inspection.vue
+++ b/src/views/base/carmain/inspection.vue
@@ -7,67 +7,9 @@
         <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-
-      <el-form-item label="品牌型号" prop="engineNumber" label-width="90">
-        <CarBrandSelector v-model="queryParams.brandAndModel" ref="brandForm" />
+      <el-form-item label="联系人" prop="cusName" label-width="90">
+        <el-input v-model="queryParams.cusName" 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="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="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" label-width="90">
-        <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
-      <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"
-          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>
@@ -77,25 +19,19 @@
     <!-- 操作工具栏 -->
     <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-button type="primary" plain icon="el-icon-s-comment" size="mini">一键提醒</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="num">
+      <el-table-column label="序号" width="50" 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="licenseNumber" width="100">
         <template v-slot="scope">
           <router-link :to="'./check/' + scope.row.id" class="link-type">
             <span>{{ scope.row.licenseNumber }}</span>
@@ -104,13 +40,6 @@
       </el-table-column>
       <el-table-column label="车辆品牌" align="center" prop="brandStr" />
       <el-table-column label="车辆型号" align="center" prop="modelStr" />
-
-      <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="carCategory">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_CAR_CATEGORY" :value="scope.row.carCategory" />
@@ -121,62 +50,35 @@
           <dict-tag :type="DICT_TYPE.DICT_CAR_NATURE" :value="scope.row.carNature" />
         </template>
       </el-table-column>
-
-      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" width="130">
+      <el-table-column label="上次年检时间" align="center" prop="inspectionDate" width="180">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.recentlyHandledBusiness" />
+          <span>{{ parseTime(scope.row.inspectionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="150">
+      <el-table-column label="下次年检时间" align="center" prop="nextInspectionDate" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.nextInspectionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column label="联系人" align="center" prop="cusName" />
+      <el-table-column label="联系方式" align="center" prop="phoneNumber" />
+      <el-table-column label="临近年检天数" align="center" prop="njCont" />
       <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <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-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)"
-            v-hasPermi="['base:car-main:update']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="bindCustomer" size="mini" type="text" icon="el-icon-truck"
-                v-hasPermi="['base:car-main:bindCustomer']">绑定客户</el-dropdown-item>
-              <el-dropdown-item command="markSign" size="mini" type="text" icon="el-icon-truck"
-                v-hasPermi="['base:car-main:markSign']">打标签</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
-
+          <el-button size="mini" type="text" icon="el-icon-s-comment">推送提醒</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" />
-    <CustomerCarForm ref="bindCustomerFormRef" @success="getList" />
-    <CarLabelForm ref="labelFormRef" @success="getList" />
   </div>
 </template>
-
 <script>
-import CarBrandSelector from '@/layout/components/CarBrandSelector';
-import CustomerCarForm from '@/views/base/carmain/components/CustomerCarForm.vue';
-import CarLabelForm from '@/views/base/carmain/components/CarLabelForm.vue';
 import * as CarMainApi from '@/api/base/carmain';
-import CarMainForm from './CarMainForm.vue';
-import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
 export default {
-  name: "CarMain",
+  name: "inspection",
   components: {
-    CarMainForm,
-    CustomerCarForm,
-    CarLabelForm,
-    CarBrandSelector,
   },
   data() {
     return {
@@ -200,20 +102,9 @@ export default {
       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: [],
+        cumName:null,
+        selectSign:'01'
       },
     };
   },
@@ -221,34 +112,11 @@ export default {
     this.getList();
   },
   methods: {
-
-    /**更多操作*/
-    handleCommand(command, index, row) {
-      switch (command) {
-
-        //打标签
-        case 'markSign': this.bindLabel(row.id); break;
-
-        //绑定客户信息
-        case 'bindCustomer': this.openFormBindCustomer(row.id); break;
-
-        default: break;
-      }
-    },
-    openFormBindCustomer(id) {
-      this.$refs["bindCustomerFormRef"].open(id);
-    },
-    /**打标签*/
-    bindLabel(id) {
-      this.$refs["labelFormRef"].open(id);
-    },
     /** 查询列表 */
     async getList() {
-
       try {
-
         this.loading = true;
-        const res = await CarMainApi.getCarMainPage(this.queryParams);
+        const res = await CarMainApi.remindCarMainPage(this.queryParams);
         this.list = res.data.records;
         this.total = res.data.total;
       } finally {
@@ -257,7 +125,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-
       this.queryParams.pageNo = 1;
       this.getList();
     },
@@ -266,78 +133,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 添加/修改操作 */
-    openForm(id) {
-      this.$refs["formRef"].open(id);
-    },
-    /** 删除按钮操作 */
-    async handleDelete(row) {
-      const id = row.id;
-
-      let optionValue = 0;
-      await this.$confirm('是否确认删除该条车辆信息?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-
-        optionValue = 1;
-      }).catch(() => {
-        // this.$message({
-        //   type: 'info',
-        //   message: '已取消删除'
-        // });
-      });
-      //如果确认删除
-      if (optionValue == 1) {
-        //判断是否发生过业务
-        if (row.recentlyHandledBusiness != null && row.recentlyHandledBusiness != "") {
-          let businessObj = getDictData(DICT_TYPE.DICT_CUS_BUSI_TYPE, row.recentlyHandledBusiness);
-          this.$confirm('该车曾于 "' + this.parseTime(row.recentlyHandleBusinessTime, '{y}-{m}-{d}') + '" 发生过 "' + businessObj.label + '" 业务，是否继续删除？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-
-
-            CarMainApi.deleteCarMain(id).then(() => {
-              this.getList();
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
-              });
-            });
-
-          })
-
-        } else {
-
-
-          CarMainApi.deleteCarMain(id).then(() => {
-            this.getList();
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-          });
-
-        }
-      }
-
-
-    },
-    /** 导出按钮操作 */
-    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
index fabbe68..64e72ca 100644
--- a/src/views/base/carmain/insurance.vue
+++ b/src/views/base/carmain/insurance.vue
@@ -5,69 +5,11 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="车牌号" prop="licenseNumber">
         <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
-          @keyup.enter.native="handleQuery" />
+                  @keyup.enter.native="handleQuery" />
       </el-form-item>
-
-      <el-form-item label="品牌型号" prop="engineNumber" label-width="90">
-        <CarBrandSelector v-model="queryParams.brandAndModel" ref="brandForm" />
+      <el-form-item label="联系人" prop="cusName" label-width="90">
+        <el-input v-model="queryParams.cusName" 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="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="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" label-width="90">
-        <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
-      <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"
-          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>
@@ -104,13 +46,6 @@
       </el-table-column>
       <el-table-column label="车辆品牌" align="center" prop="brandStr" />
       <el-table-column label="车辆型号" align="center" prop="modelStr" />
-
-      <el-table-column label="保险日期" aln="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="carCategory">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_CAR_CATEGORY" :value="scope.row.carCategory" />
@@ -121,62 +56,39 @@
           <dict-tag :type="DICT_TYPE.DICT_CAR_NATURE" :value="scope.row.carNature" />
         </template>
       </el-table-column>
-
-      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" width="130">
+      <el-table-column label="保险日期" aln="center" prop="insuranceDate" width="180">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.recentlyHandledBusiness" />
+          <span>{{ parseTime(scope.row.insuranceDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="150">
+      <el-table-column label="保险到期日期" aln="center" prop="insuranceExpiryDate" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.insuranceExpiryDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="联系人" align="center" prop="cusName" />
+      <el-table-column label="联系方式" align="center" prop="phoneNumber" />
+      <el-table-column label="保险到期天数" align="center" prop="bxCount" />
 
       <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <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-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)"
-            v-hasPermi="['base:car-main:update']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="bindCustomer" size="mini" type="text" icon="el-icon-truck"
-                v-hasPermi="['base:car-main:bindCustomer']">绑定客户</el-dropdown-item>
-              <el-dropdown-item command="markSign" size="mini" type="text" icon="el-icon-truck"
-                v-hasPermi="['base:car-main:markSign']">打标签</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
-
         </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" />
-    <CustomerCarForm ref="bindCustomerFormRef" @success="getList" />
-    <CarLabelForm ref="labelFormRef" @success="getList" />
   </div>
 </template>
 
 <script>
-import CarBrandSelector from '@/layout/components/CarBrandSelector';
-import CustomerCarForm from '@/views/base/carmain/components/CustomerCarForm.vue';
-import CarLabelForm from '@/views/base/carmain/components/CarLabelForm.vue';
 import * as CarMainApi from '@/api/base/carmain';
-import CarMainForm from './CarMainForm.vue';
-import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
 export default {
-  name: "CarMain",
+  name: "inspection",
   components: {
-    CarMainForm,
-    CustomerCarForm,
-    CarLabelForm,
-    CarBrandSelector,
   },
   data() {
     return {
@@ -200,20 +112,9 @@ export default {
       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: [],
+        cumName:null,
+        selectSign:'03'
       },
     };
   },
@@ -221,34 +122,11 @@ export default {
     this.getList();
   },
   methods: {
-
-    /**更多操作*/
-    handleCommand(command, index, row) {
-      switch (command) {
-
-        //打标签
-        case 'markSign': this.bindLabel(row.id); break;
-
-        //绑定客户信息
-        case 'bindCustomer': this.openFormBindCustomer(row.id); break;
-
-        default: break;
-      }
-    },
-    openFormBindCustomer(id) {
-      this.$refs["bindCustomerFormRef"].open(id);
-    },
-    /**打标签*/
-    bindLabel(id) {
-      this.$refs["labelFormRef"].open(id);
-    },
     /** 查询列表 */
     async getList() {
-
       try {
-
         this.loading = true;
-        const res = await CarMainApi.getCarMainPage(this.queryParams);
+        const res = await CarMainApi.remindCarMainPage(this.queryParams);
         this.list = res.data.records;
         this.total = res.data.total;
       } finally {
@@ -257,7 +135,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-
       this.queryParams.pageNo = 1;
       this.getList();
     },
@@ -266,78 +143,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 添加/修改操作 */
-    openForm(id) {
-      this.$refs["formRef"].open(id);
-    },
-    /** 删除按钮操作 */
-    async handleDelete(row) {
-      const id = row.id;
-
-      let optionValue = 0;
-      await this.$confirm('是否确认删除该条车辆信息?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-
-        optionValue = 1;
-      }).catch(() => {
-        // this.$message({
-        //   type: 'info',
-        //   message: '已取消删除'
-        // });
-      });
-      //如果确认删除
-      if (optionValue == 1) {
-        //判断是否发生过业务
-        if (row.recentlyHandledBusiness != null && row.recentlyHandledBusiness != "") {
-          let businessObj = getDictData(DICT_TYPE.DICT_CUS_BUSI_TYPE, row.recentlyHandledBusiness);
-          this.$confirm('该车曾于 "' + this.parseTime(row.recentlyHandleBusinessTime, '{y}-{m}-{d}') + '" 发生过 "' + businessObj.label + '" 业务，是否继续删除？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-
-
-            CarMainApi.deleteCarMain(id).then(() => {
-              this.getList();
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
-              });
-            });
-
-          })
-
-        } else {
-
-
-          CarMainApi.deleteCarMain(id).then(() => {
-            this.getList();
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-          });
-
-        }
-      }
-
-
-    },
-    /** 导出按钮操作 */
-    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
index 0a54c37..36f453c 100644
--- a/src/views/base/carmain/maintenance.vue
+++ b/src/views/base/carmain/maintenance.vue
@@ -5,68 +5,11 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="车牌号" prop="licenseNumber">
         <el-input v-model="queryParams.licenseNumber" placeholder="请输入车牌号" clearable
-          @keyup.enter.native="handleQuery" />
+                  @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="品牌型号" prop="engineNumber" label-width="90">
-        <CarBrandSelector v-model="queryParams.brandAndModel" ref="brandForm" />
+      <el-form-item label="联系人" prop="cusName" label-width="90">
+        <el-input v-model="queryParams.cusName" 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="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="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" label-width="90">
-        <el-input v-model="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
-      <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"
-          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>
@@ -76,25 +19,19 @@
     <!-- 操作工具栏 -->
     <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-button type="primary" plain icon="el-icon-s-comment" size="mini">一键提醒</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="num">
+      <el-table-column label="序号" width="50" 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="licenseNumber" width="100">
         <template v-slot="scope">
           <router-link :to="'./check/' + scope.row.id" class="link-type">
             <span>{{ scope.row.licenseNumber }}</span>
@@ -103,15 +40,6 @@
       </el-table-column>
       <el-table-column label="车辆品牌" align="center" prop="brandStr" />
       <el-table-column label="车辆型号" align="center" prop="modelStr" />
-
-      <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="carCategory">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_CAR_CATEGORY" :value="scope.row.carCategory" />
@@ -123,61 +51,39 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" width="130">
+      <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.recentlyHandledBusiness" />
+          <span>{{ parseTime(scope.row.maintenanceDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="150">
+      <el-table-column label="保养里程" align="center" prop="maintenanceMileage" />
+      <el-table-column label="下次保养日期" align="center" prop="maintenanceDate" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recentlyHandleBusinessTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.nextMaintenanceDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column label="下次保养里程" align="center" prop="nextMaintenanceMileage" />
+      <el-table-column label="联系人" align="center" prop="cusName" />
+      <el-table-column label="联系方式" align="center" prop="phoneNumber" />
+      <el-table-column label="临近保养天数" align="center" prop="byCont" />
       <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <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-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)"
-            v-hasPermi="['base:car-main:update']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="bindCustomer" size="mini" type="text" icon="el-icon-truck"
-                v-hasPermi="['base:car-main:bindCustomer']">绑定客户</el-dropdown-item>
-              <el-dropdown-item command="markSign" size="mini" type="text" icon="el-icon-truck"
-                v-hasPermi="['base:car-main:markSign']">打标签</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
-
+          <el-button size="mini" type="text" icon="el-icon-s-comment">推送提醒</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" />
-    <CustomerCarForm ref="bindCustomerFormRef" @success="getList" />
-    <CarLabelForm ref="labelFormRef" @success="getList" />
+
   </div>
 </template>
 
 <script>
-import CarBrandSelector from '@/layout/components/CarBrandSelector';
-import CustomerCarForm from '@/views/base/carmain/components/CustomerCarForm.vue';
-import CarLabelForm from '@/views/base/carmain/components/CarLabelForm.vue';
 import * as CarMainApi from '@/api/base/carmain';
-import CarMainForm from './CarMainForm.vue';
-import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
 export default {
-  name: "CarMain",
+  name: "inspection",
   components: {
-    CarMainForm,
-    CustomerCarForm,
-    CarLabelForm,
-    CarBrandSelector,
   },
   data() {
     return {
@@ -201,20 +107,9 @@ export default {
       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: [],
+        cumName:null,
+        selectSign:'02'
       },
     };
   },
@@ -222,34 +117,11 @@ export default {
     this.getList();
   },
   methods: {
-
-    /**更多操作*/
-    handleCommand(command, index, row) {
-      switch (command) {
-
-        //打标签
-        case 'markSign': this.bindLabel(row.id); break;
-
-        //绑定客户信息
-        case 'bindCustomer': this.openFormBindCustomer(row.id); break;
-
-        default: break;
-      }
-    },
-    openFormBindCustomer(id) {
-      this.$refs["bindCustomerFormRef"].open(id);
-    },
-    /**打标签*/
-    bindLabel(id) {
-      this.$refs["labelFormRef"].open(id);
-    },
     /** 查询列表 */
     async getList() {
-
       try {
-
         this.loading = true;
-        const res = await CarMainApi.getCarMainPage(this.queryParams);
+        const res = await CarMainApi.remindCarMainPage(this.queryParams);
         this.list = res.data.records;
         this.total = res.data.total;
       } finally {
@@ -258,7 +130,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-
       this.queryParams.pageNo = 1;
       this.getList();
     },
@@ -267,78 +138,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 添加/修改操作 */
-    openForm(id) {
-      this.$refs["formRef"].open(id);
-    },
-    /** 删除按钮操作 */
-    async handleDelete(row) {
-      const id = row.id;
-
-      let optionValue = 0;
-      await this.$confirm('是否确认删除该条车辆信息?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-
-        optionValue = 1;
-      }).catch(() => {
-        // this.$message({
-        //   type: 'info',
-        //   message: '已取消删除'
-        // });
-      });
-      //如果确认删除
-      if (optionValue == 1) {
-        //判断是否发生过业务
-        if (row.recentlyHandledBusiness != null && row.recentlyHandledBusiness != "") {
-          let businessObj = getDictData(DICT_TYPE.DICT_CUS_BUSI_TYPE, row.recentlyHandledBusiness);
-          this.$confirm('该车曾于 "' + this.parseTime(row.recentlyHandleBusinessTime, '{y}-{m}-{d}') + '" 发生过 "' + businessObj.label + '" 业务，是否继续删除？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-
-
-            CarMainApi.deleteCarMain(id).then(() => {
-              this.getList();
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
-              });
-            });
-
-          })
-
-        } else {
-
-
-          CarMainApi.deleteCarMain(id).then(() => {
-            this.getList();
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-          });
-
-        }
-      }
-
-
-    },
-    /** 导出按钮操作 */
-    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>