From 69c9a06975576b7289a16d0f1aafd90e8858a478 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Tue, 20 Aug 2024 18:57:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=91=E6=8F=B4=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A62/5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rescue/api/rescueCustomer.js   |    7 +
 src/views/rescue/customerDriverIndex.vue |   82 +-
 src/views/rescue/customerIndex.vue       |  485 ++++++-----
 src/views/rescue/driverIndex.vue         | 1013 +++++++++++-----------
 src/views/rescue/index.vue               |    4 +-
 5 files changed, 832 insertions(+), 759 deletions(-)

diff --git a/src/views/rescue/api/rescueCustomer.js b/src/views/rescue/api/rescueCustomer.js
index de011ed..e8426a4 100644
--- a/src/views/rescue/api/rescueCustomer.js
+++ b/src/views/rescue/api/rescueCustomer.js
@@ -79,3 +79,10 @@ export function edept_driver(data) {
     data: data
   })
 }
+
+export function delete_dept_driver(ids) {
+  return request({
+    url: '/dept_driver/dept_driver/' + ids ,
+    method: 'delete',
+  })
+}
diff --git a/src/views/rescue/customerDriverIndex.vue b/src/views/rescue/customerDriverIndex.vue
index 02046f8..c20bec6 100644
--- a/src/views/rescue/customerDriverIndex.vue
+++ b/src/views/rescue/customerDriverIndex.vue
@@ -14,8 +14,10 @@
         <el-tree :data="Thetree"
                  :props="defaultProps"
                  node-key="id"
+                 ref="tree"
                  :default-expanded-keys="[200, 201]"
                  :default-checked-keys="[206]"
+                 :filter-node-method="filterNode"
                  @node-click="handleNodeClick"></el-tree>
       </div>
     </el-col>
@@ -50,7 +52,12 @@
         </el-row>
 
         <el-table v-loading="loading" :data="rescueCustomerList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center">
+            <template scope="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+<!--          <el-table-column type="selection" width="55" align="center" />-->
           <!--      <el-table-column label="主键" align="center" prop="id" />-->
           <el-table-column label="机构" align="center" prop="deptName" />
           <el-table-column label="第一梯队" align="center" prop="firstDriverName" />
@@ -101,9 +108,9 @@
               <el-select v-model="form.firstDriverIds" filterable multiple placeholder="请选择">
                 <el-option
                   v-for="item in options"
-                  :key="item.id.toString()"
-                  :label="item.realName"
-                  :value="item.id.toString()">
+                  :key="item.id"
+                  :label="item.nickName"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -111,9 +118,9 @@
               <el-select v-model="form.secondDriverIds" filterable multiple placeholder="请选择">
                 <el-option
                   v-for="item in options"
-                  :key="item.id.toString()"
-                  :label="item.realName"
-                  :value="item.id.toString()">
+                  :key="item.id"
+                  :label="item.nickName"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -121,9 +128,9 @@
               <el-select v-model="form.thirdDriverIds" filterable multiple placeholder="请选择">
                 <el-option
                   v-for="item in options"
-                  :key="item.id.toString()"
-                  :label="item.realName"
-                  :value="item.id.toString()">
+                  :key="item.id"
+                  :label="item.nickName"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -142,7 +149,19 @@
 </template>
 
 <script>
-  import { driverlist, edept_driver, dept_driver, listRescueCustomer, getRescueCustomer, delRescueCustomer, addRescueCustomer, updateRescueCustomer,getdeptTree,driverList } from "./api/rescueCustomer";
+import {
+  driverlist,
+  edept_driver,
+  dept_driver,
+  listRescueCustomer,
+  getRescueCustomer,
+  delRescueCustomer,
+  addRescueCustomer,
+  updateRescueCustomer,
+  getdeptTree,
+  driverList,
+  delete_dept_driver
+} from './api/rescueCustomer'
 
   export default {
     name: "RescueCustomer",
@@ -152,7 +171,7 @@
         filterText:'',
         defaultProps: {
           children: 'children',
-          label: 'label'
+          label: 'name'
         },
         value1:[],
         value2:[],
@@ -236,35 +255,38 @@
       }
     },
     methods: {
+      filterNode(value, data) {
+        if (!value) return true
+        return data.name.indexOf(value) !== -1
+      },
       handleCheckChange(data, checked, indeterminate) {
-        console.log(data, checked, indeterminate);
+        // console.log(data, checked, indeterminate);
       },
       handleNodeClick(data) {
         this.xid  = data.id
         // this.form.customerDeptId
-        this.xtitle = data.label
-        console.log('x',data);
-        console.log(this.form.customerDeptId)
+        this.xtitle = data.name
+        // console.log('x',data);
+        // console.log(this.form.customerDeptId)
       },
       /** 查询救援的客户信息列表 */
       getList() {
         this.loading = true;
         driverlist(this.queryParams).then(response => {
-          this.rescueCustomerList = response.rows;
-          this.total = response.total;
+          this.rescueCustomerList = response.data.records;
+          this.total = response.data.total;
           this.loading = false;
         });
         getdeptTree().then(res=>{
-          console.log(res)
-          this.Thetree = res.data
+          this.Thetree = this.handleTree(res.data, 'id')
         })
         let data = {
           pageNo: 1,
           pageSize: 999,
         }
         driverList(data).then(res=>{
-          console.log(res)
-          this.options = res.rows
+          // console.log(res)
+          this.options = res.data.records
         })
       },
       // 取消按钮
@@ -309,15 +331,17 @@
         this.open = true;
         this.title = "添加司机信息";
         this.form.deptId = this.xid
-
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
-        row.firstDriverIds = row.firstDriverIds.split(",");
-        row.secondDriverIds = row.secondDriverIds.split(",");
-        row.thirdDriverIds = row.thirdDriverIds.split(",");
-        this.form = row
-        console.log(this.form)
+        const data = {
+          ...row,
+          firstDriverIds: row.firstDriverIds.split(",").map(id => parseInt(id)),
+          secondDriverIds: row.secondDriverIds.split(",").map(id => parseInt(id)),
+          thirdDriverIds: row.thirdDriverIds.split(",").map(id => parseInt(id))
+        }
+        this.form = data
+        // console.log(this.form)
         this.open = true;
         this.title = "修改救援的客户信息";
       },
@@ -352,7 +376,7 @@
       handleDelete(row) {
         const ids = row.id || this.ids;
         this.$modal.confirm('是否确认删除救援的客户信息编号为"' + ids + '"的数据项？').then(function() {
-          return delRescueCustomer(ids);
+          return delete_dept_driver(ids);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
diff --git a/src/views/rescue/customerIndex.vue b/src/views/rescue/customerIndex.vue
index 46645e6..e1aa92b 100644
--- a/src/views/rescue/customerIndex.vue
+++ b/src/views/rescue/customerIndex.vue
@@ -4,11 +4,12 @@
       <div class="left-box">
         <div class="title-h">公司机构</div>
         <div class="xzbox">
-          <span>当前选择：{{xtitle}}</span>
+          <span>当前选择：{{ xtitle }}</span>
         </div>
         <el-input
           placeholder="请输入机构名称查询"
-          v-model="filterText">
+          v-model="filterText"
+        >
         </el-input>
 
         <el-tree :data="Thetree"
@@ -17,176 +18,194 @@
                  ref="tree"
                  :default-expanded-keys="[200, 201]"
                  :default-checked-keys="[206]"
-                 @node-click="handleNodeClick"></el-tree>
+                 @node-click="handleNodeClick"
+                 :filter-node-method="filterNode"
+        ></el-tree>
       </div>
     </el-col>
- <el-col :span="20">
-  <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="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter.native="handleQuery"
+    <el-col :span="20">
+      <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="customerName">
+            <el-input
+              v-model="queryParams.customerName"
+              placeholder="请输入客户名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号" prop="customerPhone">
+            <el-input
+              v-model="queryParams.customerPhone"
+              placeholder="请输入手机号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="开始日期" prop="signStartDate">
+            <el-date-picker clearable
+                            v-model="queryParams.signStartDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择签约开始日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束日期" prop="signEndDate">
+            <el-date-picker clearable
+                            v-model="queryParams.signEndDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择签约结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @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="handleAdd"
+            >新增
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="rescueCustomerList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <!--      <el-table-column label="主键" align="center" prop="id" />-->
+          <el-table-column label="客户名称" align="center" prop="customerName"/>
+          <el-table-column label="客户手机号" align="center" prop="customerPhone"/>
+          <el-table-column label="客户公司" align="center" prop="deptName"/>
+          <el-table-column label="签约开始日期" align="center" prop="signStartDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.signStartDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="签约结束日期" align="center" prop="signEndDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.signEndDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <!--      <el-table-column label="默认救援类型" align="center" prop="defaultRescueType">-->
+          <!--        <template slot-scope="scope">-->
+          <!--          <dict-tag :options="dict.type.dljy_type" :value="scope.row.defaultRescueType"/>-->
+          <!--        </template>-->
+          <!--      </el-table-column>-->
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+              >删除
+              </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"
         />
-      </el-form-item>
-      <el-form-item label="手机号" prop="customerPhone">
-        <el-input
-          v-model="queryParams.customerPhone"
-          placeholder="请输入手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
-      <el-form-item label="开始日期" prop="signStartDate">
-        <el-date-picker clearable
-          v-model="queryParams.signStartDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择签约开始日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束日期" prop="signEndDate">
-        <el-date-picker clearable
-          v-model="queryParams.signEndDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择签约结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+        <!-- 添加或修改救援的客户信息对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-form-item label="客户公司" prop="customerDeptId">
 
-    <el-table v-loading="loading" :data="rescueCustomerList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="主键" align="center" prop="id" />-->
-      <el-table-column label="客户名称" align="center" prop="customerName" />
-      <el-table-column label="客户手机号" align="center" prop="customerPhone" />
-      <el-table-column label="客户公司" align="center" prop="deptName" />
-      <el-table-column label="签约开始日期" align="center" prop="signStartDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.signStartDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="签约结束日期" align="center" prop="signEndDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.signEndDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="默认救援类型" align="center" prop="defaultRescueType">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.dljy_type" :value="scope.row.defaultRescueType"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+              <span style="font-weight: bold; font-size: 16px">{{ form.deptName || xtitle }}</span>
+            </el-form-item>
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>
+            </el-form-item>
+            <el-form-item label="客户手机号" prop="customerPhone">
+              <el-input v-model="form.customerPhone" placeholder="请输入客户手机号"/>
+            </el-form-item>
+            <el-form-item label="单号前缀" prop="orderPrefix">
+              <el-input v-model="form.orderPrefix" placeholder="请输入单号前缀"/>
+            </el-form-item>
+            <el-form-item label="签约开始日期" prop="signStartDate">
+              <el-date-picker clearable
+                              v-model="form.signStartDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择签约开始日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="签约结束日期" prop="signEndDate">
+              <el-date-picker clearable
+                              v-model="form.signEndDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择签约结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改救援的客户信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="客户公司" prop="customerDeptId">
-
-          <span style="font-weight: bold; font-size: 16px">{{ form.deptName ||xtitle}}</span>
-        </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-        </el-form-item>
-        <el-form-item label="客户手机号" prop="customerPhone">
-          <el-input v-model="form.customerPhone" placeholder="请输入客户手机号" />
-        </el-form-item>
-        <el-form-item label="单号前缀" prop="orderPrefix">
-          <el-input v-model="form.orderPrefix" placeholder="请输入单号前缀" />
-        </el-form-item>
-        <el-form-item label="签约开始日期" prop="signStartDate">
-          <el-date-picker clearable
-            v-model="form.signStartDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择签约开始日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="签约结束日期" prop="signEndDate">
-          <el-date-picker clearable
-            v-model="form.signEndDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择签约结束日期">
-          </el-date-picker>
-        </el-form-item>
-
-<!--        <el-form-item label="默认救援类型" prop="defaultRescueType">-->
-<!--          <el-select v-model="form.defaultRescueType" placeholder="请选择默认救援类型">-->
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.dljy_type"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            ></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+            <!--        <el-form-item label="默认救援类型" prop="defaultRescueType">-->
+            <!--          <el-select v-model="form.defaultRescueType" placeholder="请选择默认救援类型">-->
+            <!--            <el-option-->
+            <!--              v-for="dict in dict.type.dljy_type"-->
+            <!--              :key="dict.value"-->
+            <!--              :label="dict.label"-->
+            <!--              :value="dict.value"-->
+            <!--            ></el-option>-->
+            <!--          </el-select>-->
+            <!--        </el-form-item>-->
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
-  </div>
     </el-col>
 
   </el-row>
 </template>
 
 <script>
-import { listRescueCustomer, getRescueCustomer, delRescueCustomer, addRescueCustomer, updateRescueCustomer,getdeptTree } from "./api/rescueCustomer";
+import {
+  listRescueCustomer,
+  getRescueCustomer,
+  delRescueCustomer,
+  addRescueCustomer,
+  updateRescueCustomer,
+  getdeptTree
+} from './api/rescueCustomer'
 
 export default {
-  name: "RescueCustomer",
+  name: 'RescueCustomer',
   dicts: ['dljy_type'],
   data() {
     return {
-      filterText:'',
+      filterText: '',
       defaultProps: {
         children: 'children',
         label: 'name'
@@ -206,9 +225,9 @@ export default {
       // 救援的客户信息表格数据
       rescueCustomerList: [],
       // 弹出层标题
-      title: "",
-      xtitle:'',
-      xid:'',
+      title: '',
+      xtitle: '',
+      xid: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -220,57 +239,58 @@ export default {
         customerDeptId: null,
         signStartDate: null,
         signEndDate: null,
-        defaultRescueType: null,
+        defaultRescueType: null
       },
-      Thetree:[],
+      Thetree: [],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         customerName: [
-          { required: true, message: '不能为空', trigger: 'blur' },
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         customerPhone: [
-          { required: true, message: '不能为空', trigger: 'blur' },
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         orderPrefix: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-        ],
-      },
-    };
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
+      }
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   watch: {
     filterText(val) {
-      // TODO 待完成
+      this.$refs.tree.filter(val)
     }
   },
   methods: {
-    handleCheckChange(data, checked, indeterminate) {
-      // console.log(data, checked, indeterminate);
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     },
     handleNodeClick(data) {
-      this.xid  = data.id
+      this.xid = data.id
       this.xtitle = data.name
     },
     /** 查询救援的客户信息列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listRescueCustomer(this.queryParams).then(response => {
-        this.rescueCustomerList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-      getdeptTree().then(res=>{
+        this.rescueCustomerList = response.data.records
+        this.total = response.data.total
+        this.loading = false
+      })
+      getdeptTree().then(res => {
         this.Thetree = this.handleTree(res.data, 'id')
       })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -288,76 +308,77 @@ export default {
         createBy: null,
         updateTime: null,
         updateBy: null
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
+      this.queryParams.pageNo = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      if(this.xtitle == ''){
-        this.$modal.msgSuccess("请先选择部门");
+      if (this.xtitle == '') {
+        this.$modal.msgSuccess('请先选择部门')
         return
       }
-      this.reset();
-      this.open = true;
-      this.title = "添加客户信息";
+      this.reset()
+      this.open = true
+      this.title = '添加客户信息'
       this.form.customerDeptId = this.xid
 
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
       getRescueCustomer(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改救援的客户信息";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改救援的客户信息'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateRescueCustomer(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addRescueCustomer(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id || this.ids
       this.$modal.confirm('是否确认删除救援的客户信息编号为"' + ids + '"的数据项？').then(function() {
-        return delRescueCustomer(ids);
+        return delRescueCustomer(ids)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -366,29 +387,31 @@ export default {
       }, `rescueCustomer_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
 <style>
-  .left-box{
-    box-sizing: border-box;
-    padding: 15px;
-  }
-  .title-h{
-    font-size: 18px;
-    font-weight: 600;
-    margin-bottom: 20px;
-  }
-  .xzbox{
-    width: 100%;
-    margin: 5px auto;
-    border-radius: 8px;
-    height: 40px;
-    box-sizing: border-box;
-    padding: 0px 10px;
-    display: flex;
-    align-items: center;
-    color: #409EFF;
+.left-box {
+  box-sizing: border-box;
+  padding: 15px;
+}
 
-    /*background: #99a9bf;*/
-  }
+.title-h {
+  font-size: 18px;
+  font-weight: 600;
+  margin-bottom: 20px;
+}
+
+.xzbox {
+  width: 100%;
+  margin: 5px auto;
+  border-radius: 8px;
+  height: 40px;
+  box-sizing: border-box;
+  padding: 0px 10px;
+  display: flex;
+  align-items: center;
+  color: #409EFF;
+
+  /*background: #99a9bf;*/
+}
 </style>
diff --git a/src/views/rescue/driverIndex.vue b/src/views/rescue/driverIndex.vue
index 0ede344..6ca3563 100644
--- a/src/views/rescue/driverIndex.vue
+++ b/src/views/rescue/driverIndex.vue
@@ -1,9 +1,9 @@
 <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="realName">
+      <el-form-item label="司机" prop="nickName">
         <el-input
-          v-model="queryParams.realName"
+          v-model="queryParams.nickName"
           placeholder="请输入司机名称"
           style="width: 140px"
           clearable
@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作状态" prop="carLicenseNum">
+      <el-form-item label="工作状态" prop="driveStatus">
         <el-select
           v-model="queryParams.driveStatus"
           placeholder="工作状态"
@@ -63,24 +63,33 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="姓名" align="center" prop="realName" width="100">
+      <el-table-column label="序号" align="center">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="姓名" align="center" prop="nickName" width="100">
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="sex" width="100">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex"/>
+        </template>
       </el-table-column>
-      <el-table-column label="性别" align="center" prop="sex" width="100"/>
       <el-table-column label="手机号" align="center" prop="phonenumber" width="130"/>
-      <el-table-column label="年龄" align="center" prop="userAge" width="100"/>
+      <el-table-column label="年龄" align="center" prop="age" width="100"/>
       <el-table-column label="图片" align="center" prop="avatar" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.avatar" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="认证状态" align="center" prop="authStatus" >
+      <el-table-column label="认证状态" align="center" prop="authStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.authStatus =='0'" style="color: #1c84c6">待认证</span>
           <span v-if="scope.row.authStatus =='1'" style="color: #1c84c6">待审核</span>
@@ -88,7 +97,7 @@
           <span v-if="scope.row.authStatus =='3'" style="color: red">驳回</span>
         </template>
       </el-table-column>
-      <el-table-column label="接单状态" align="center" prop="driverStatus" >
+      <el-table-column label="接单状态" align="center" prop="driverStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.driverStatus =='1'">空闲</span>
           <span v-if="scope.row.driverStatus =='2'">暂停</span>
@@ -96,7 +105,7 @@
           <span v-if="scope.row.driverStatus =='4'">离线</span>
         </template>
       </el-table-column>
-      <el-table-column label="当前所在位置" align="center" prop="driverPositionInfo" />
+      <el-table-column label="当前所在位置" align="center" prop="driverPositionInfo" width="180"/>
       <el-table-column label="司机离线时间" align="center" prop="driverOfflineTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.driverOfflineTime, '{y}-{m}-{d}') }}</span>
@@ -110,19 +119,22 @@
             v-if="scope.row.authStatus =='1'"
             icon="el-icon-s-check"
             @click="handleAuth(scope.row)"
-          >审核</el-button>
+          >审核
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -138,16 +150,16 @@
     <el-dialog title="认证审核" :visible.sync="authFlag" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
-            <el-form-item label="审核结果" prop="authStatus">
-              <el-radio-group v-model="form.authStatus">
-                <el-radio label="2">通过</el-radio>
-                <el-radio label="3">拒绝</el-radio>
-              </el-radio-group>
-            </el-form-item>
+        <el-form-item label="审核结果" prop="authStatus">
+          <el-radio-group v-model="form.authStatus">
+            <el-radio label="2">通过</el-radio>
+            <el-radio label="3">拒绝</el-radio>
+          </el-radio-group>
+        </el-form-item>
 
-            <el-form-item label="拒绝原因" prop="rejectInfo">
-            <el-input   type="textarea" v-model="form.rejectInfo"  placeholder="请输入拒绝原因"> </el-input>
-            </el-form-item>
+        <el-form-item label="拒绝原因" prop="rejectInfo">
+          <el-input type="textarea" v-model="form.rejectInfo" placeholder="请输入拒绝原因"></el-input>
+        </el-form-item>
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -159,19 +171,19 @@
     <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
       <el-tabs :value="'first'" @tab-click="handleClick">
         <el-tab-pane label="司机信息" name="first">
-          <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
+          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-form-item v-show="false" label="用户主键" prop="userId">
-              <el-input v-model="form.userId" placeholder="请输入用户主键" />
+              <el-input v-model="form.userId" placeholder="请输入用户主键"/>
             </el-form-item>
             <el-row>
               <el-col :span="12">
-                <el-form-item  label="真实姓名" prop="realName">
-                  <el-input v-model="form.realName" placeholder="真实姓名" />
+                <el-form-item label="真实姓名" prop="realName">
+                  <el-input v-model="form.realName" placeholder="真实姓名"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item  label="手机号" prop="phonenumber">
-                  <el-input v-model="form.phonenumber" placeholder="手机号" />
+                <el-form-item label="手机号" prop="phonenumber">
+                  <el-input v-model="form.phonenumber" placeholder="手机号"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -190,8 +202,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item  label="年龄" prop="userAge">
-                  <el-input-number v-model="form.userAge" placeholder="年龄" />
+                <el-form-item label="年龄" prop="age">
+                  <el-input-number v-model="form.age" placeholder="年龄"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -225,143 +237,147 @@
           </el-form>
 
         </el-tab-pane>
-        <el-tab-pane  label="车辆信息" name="second">
-          <el-form ref="carfrom" :model="carfrom"  :rules="carRules" label-width="120px" >
-          <div  v-for="(item,index) in carfrom.carInfoList" :key="index" style="width: 100%; ">
-            <el-collapse  v-model="activeNames" accordion>
-              <el-collapse-item :title=" '车辆'+ (index+1)" :name="index" accordion>
+        <el-tab-pane label="车辆信息" name="second">
+          <el-form ref="carfrom" :model="carfrom" :rules="carRules" label-width="120px">
+            <div v-for="(item,index) in carfrom.carInfoList" :key="index" style="width: 100%; ">
+              <el-collapse v-model="activeNames" accordion>
+                <el-collapse-item :title=" '车辆'+ (index+1)" :name="index" accordion>
+                  <el-row>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label=" 车辆类型" prop="rescueCarType">
+                          <el-select v-model="item.rescueCarType" placeholder="请选择车辆类型">
+                            <el-option
+                              v-for="dict in getDictDatasNew(DICT_TYPE.JYC_TYPE)"
+                              :key="dict.value"
+                              :label="dict.label"
+                              :value="dict.value"
+                            ></el-option>
+                          </el-select>
+                        </el-form-item>
+                      </div>
 
-              <el-row>
-                <el-col :span="12">
-                  <div style="position: relative">
-                    <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                    <el-form-item label=" 车辆类型" prop="rescueCarType">
-<!--                      <el-select v-model="item.rescueCarType"  placeholder="请选择车辆类型">-->
-<!--                        <el-option-->
-<!--                          v-for="dict in dict.type.jyc_type"-->
-<!--                          :key="dict.value"-->
-<!--                          :label="dict.label"-->
-<!--                          :value="dict.value"-->
-<!--                        ></el-option>-->
-<!--                      </el-select>-->
-                    </el-form-item>
 
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <!--                    <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>-->
+                        <el-form-item label=" 车牌号" :prop="'rescueCarNum'+index">
+                          <el-input v-model="item.rescueCarNum" @input="valid(item.rescueCarNum,index,'rescueCarNum')"
+                                    placeholder="请输入车牌号"
+                          />
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label=" 品牌型号" prop="rescueCarBrand">
+                          <el-input v-model="item.rescueCarBrand" placeholder="请输入品牌型号"/>
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                    <el-col :span="12">
+
+                    </el-col>
+                  </el-row>
+
+
+                  <el-row>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label=" 购买时间" prop="carBuyTime">
+                          <el-date-picker clearable
+                                          v-model="item.carBuyTime"
+                                          type="date"
+                                          value-format="yyyy-MM-dd"
+                                          placeholder="请选择购买时间"
+                          >
+                          </el-date-picker>
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label=" 车架号" prop="frameNumber">
+                          <el-input v-model="item.frameNumber" placeholder="请输入车架号"/>
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                  </el-row>
+
+
+                  <el-row>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label="车辆性质" prop="carUseNature">
+                          <el-radio-group v-model="item.carUseNature">
+                            <el-radio
+                              v-for="dict in getDictDatasNew(DICT_TYPE.CAR_USE_NATURE)"
+                              :key="dict.value"
+                              :label="dict.value"
+                            >{{ dict.label }}
+                            </el-radio>
+                          </el-radio-group>
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label=" 车牌颜色" prop="carLicenseColor">
+                          <el-radio-group v-model="item.carLicenseColor">
+                            <el-radio
+                              v-for="dict in getDictDatasNew(DICT_TYPE.CAR_LICENSE_COLOR)"
+                              :key="dict.value"
+                              :label="dict.value"
+                            >{{ dict.label }}
+                            </el-radio>
+                          </el-radio-group>
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label="行驶证" prop="driveLicenseImage">
+                          <image-upload v-model="item.driveLicenseImage"/>
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                    <el-col :span="12">
+                      <div style="position: relative">
+                        <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
+                        <el-form-item label="图片" prop="carImage">
+                          <image-upload v-model="item.carImage"/>
+                        </el-form-item>
+                      </div>
+                    </el-col>
+                  </el-row>
+
+                  <div style="width: 100%; display: flex; align-items: center;justify-content: flex-end ">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="deletecomm(index)"
+                    >删除
+                    </el-button>
                   </div>
-
-
-                </el-col>
-                <el-col :span="12">
-                  <div style="position: relative">
-<!--                    <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>-->
-                  <el-form-item label=" 车牌号" :prop="'rescueCarNum'+index" >
-                    <el-input v-model="item.rescueCarNum" @input="valid(item.rescueCarNum,index,'rescueCarNum')"  placeholder="请输入车牌号" />
-                  </el-form-item>
-                  </div>
-                </el-col>
-              </el-row>
-            <el-row>
-              <el-col :span="12">
-                <div style="position: relative">
-                  <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                <el-form-item label=" 品牌型号" prop="rescueCarBrand">
-                  <el-input v-model="item.rescueCarBrand" placeholder="请输入品牌型号" />
-                </el-form-item>
-                </div>
-              </el-col>
-              <el-col :span="12">
-
-              </el-col>
-            </el-row>
-
-
-            <el-row>
-              <el-col :span="12">
-                <div style="position: relative">
-                  <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                <el-form-item label=" 购买时间" prop="carBuyTime">
-                  <el-date-picker clearable
-                                  v-model="item.carBuyTime"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择购买时间">
-                  </el-date-picker>
-                </el-form-item>
-                </div>
-              </el-col>
-              <el-col :span="12">
-                <div style="position: relative">
-                  <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                <el-form-item label=" 车架号" prop="frameNumber">
-                  <el-input v-model="item.frameNumber" placeholder="请输入车架号" />
-                </el-form-item>
-                </div>
-              </el-col>
-            </el-row>
-
-
-            <el-row>
-              <el-col :span="12">
-                <div style="position: relative">
-                  <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                <el-form-item label="车辆性质" prop="carUseNature">
-<!--                  <el-radio-group v-model="item.carUseNature">-->
-<!--                    <el-radio-->
-<!--                      v-for="dict in dict.type.car_use_nature"-->
-<!--                      :key="dict.value"-->
-<!--                      :label="dict.value"-->
-<!--                    >{{dict.label}}</el-radio>-->
-<!--                  </el-radio-group>-->
-                </el-form-item>
-                </div>
-              </el-col>
-              <el-col :span="12">
-                <div style="position: relative">
-                  <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                <el-form-item label=" 车牌颜色" prop="carLicenseColor">
-<!--                  <el-radio-group v-model="item.carLicenseColor">-->
-<!--                    <el-radio-->
-<!--                      v-for="dict in dict.type.car_license_color"-->
-<!--                      :key="dict.value"-->
-<!--                      :label="dict.value"-->
-<!--                    >{{dict.label}}</el-radio>-->
-<!--                  </el-radio-group>-->
-                </el-form-item>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <div style="position: relative">
-                  <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                <el-form-item label="行驶证" prop="driveLicenseImage">
-                  <image-upload v-model="item.driveLicenseImage"/>
-                </el-form-item>
-                </div>
-              </el-col>
-              <el-col :span="12">
-                <div style="position: relative">
-                  <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
-                <el-form-item label="图片" prop="carImage">
-                  <image-upload v-model="item.carImage"/>
-                </el-form-item>
-                </div>
-              </el-col>
-            </el-row>
-
-            <div style="width: 100%; display: flex; align-items: center;justify-content: flex-end ">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="deletecomm(index)"
-              >删除</el-button>
+                </el-collapse-item>
+              </el-collapse>
+            </div>
+            <div style="width: 100%; margin: 20px auto; display: flex;align-items: center; justify-content: flex-end ">
+              <!--            <el-button type="primary" icon="el-icon-plus" @click="addCommodity()" >新增车辆信息</el-button>-->
             </div>
-              </el-collapse-item>
-            </el-collapse>
-          </div>
-          <div style="width: 100%; margin: 20px auto; display: flex;align-items: center; justify-content: flex-end ">
-<!--            <el-button type="primary" icon="el-icon-plus" @click="addCommodity()" >新增车辆信息</el-button>-->
-          </div>
           </el-form>
         </el-tab-pane>
       </el-tabs>
@@ -369,263 +385,115 @@
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="authCancel">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-  import { driverList, delDriver, addDriver, updateDriver } from "@/api/rescue/driver";
+import { driverList, delDriver, addDriver, updateDriver } from '@/api/rescue/driver'
 
-  export default {
-    name: "Info",
-    dicts: ['jyc_type','sys_user_sex','car_license_color','car_own', 'car_use_nature'],
-    data() {
-      var verify = (rule, value, callback) => {
-        if (value == '') {
-          callback(new Error('不能为空'));
-          this.pd = false
-        }else{
-          callback();
+export default {
+  name: 'Info',
+  data() {
+    var verify = (rule, value, callback) => {
+      if (value == '') {
+        callback(new Error('不能为空'))
+        this.pd = false
+      } else {
+        callback()
+      }
+
+    }
+    return {
+      pd: true,
+      switchover: 0,
+      activeNames: 0,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 【请填写功能名称】表格数据
+      infoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      workDicts: [
+        {
+          label: '空闲',
+          value: '1'
+        },
+        {
+          label: '暂停',
+          value: '2'
+        },
+        {
+          label: '忙碌',
+          value: '3'
+        },
+        {
+          label: '离线',
+          value: '4'
         }
-
-
-      };
-      return {
-        pd:true,
-        switchover:0,
-        activeNames:0,
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 【请填写功能名称】表格数据
-        infoList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        workDicts:[
-          {
-            label:"空闲",
-            value:"1"
-          },
-          {
-            label:"暂停",
-            value:"2"
-          },
-          {
-            label:"忙碌",
-            value:"3"
-          },
-          {
-            label:"离线",
-            value:"4"
-          }
-        ],
-        authDicts:[
-          {
-            label:"待认证",
-            value:"0"
-          },
-          {
-            label:"待审核",
-            value:"1"
-          },
-          {
-            label:"认证成功",
-            value:"2"
-          },
-          {
-            label:"认证失败",
-            value:"3"
-          }
-        ],
-        authFlag:false,
-        // 查询参数
-        queryParams: {
-          pageNo: 1,
-          pageSize: 10,
-          userId: null,
-          licenseImage: null,
-          idCardRight: null,
-          idCardBack: null,
-          driveLicenseImage: null,
-          carBrand: null,
-          carLicenseNum: null,
-          carType: null,
-          carNum: null,
-          carBuyTime: null,
-          carLicenseColor: null,
-          authStatus: null,
-          rejectInfo: null,
-          driverStatus: null,
-          driverLongitude: null,
-          driverLatitude: null,
-          driverPositionInfo: null,
-          driverOfflineTime: null,
+      ],
+      authDicts: [
+        {
+          label: '待认证',
+          value: '0'
         },
-        carfrom:{
-          carInfoList:[
-            {
-              rescueCarType: '1',
-              rescueCarNum: '',
-              rescueCarBrand: '',
-              carOwn: '',
-              carImage: '',
-              driveLicenseImage: '',
-              carBuyTime: '',
-              carLicenseColor: '',
-              carUseNature: '',
-              frameNumber: '',
-              possessorId: '',
-              deptId: '',
-            }
-          ],
+        {
+          label: '待审核',
+          value: '1'
         },
-
-        // 表单参数
-        form: {
+        {
+          label: '认证成功',
+          value: '2'
         },
-        carRules:{
-        },
-        // 表单校验
-        rules: {
-          realName: [
-            { required: true, message: '不能为空', trigger: 'blur' },
-            { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' }
-          ],
-          phonenumber:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-            { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' }
-          ],
-          rescueCarType:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          rescueCarNum:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          carOwn:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          carImage:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          driveLicenseImage:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          carLicenseColor:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          carUseNature:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          frameNumber:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-          possessorId:[
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
-
+        {
+          label: '认证失败',
+          value: '3'
         }
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      valid(value,idx,str){
-        this.$set(this.carfrom, str+idx, value)
+      ],
+      authFlag: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        userId: null,
+        licenseImage: null,
+        idCardRight: null,
+        idCardBack: null,
+        driveLicenseImage: null,
+        carBrand: null,
+        carLicenseNum: null,
+        carType: null,
+        carNum: null,
+        carBuyTime: null,
+        carLicenseColor: null,
+        authStatus: null,
+        rejectInfo: null,
+        driverStatus: null,
+        driverLongitude: null,
+        driverLatitude: null,
+        driverPositionInfo: null,
+        driverOfflineTime: null,
+        driveStatus: null,
+        phonenumber: null
       },
-      handleClick(tab, event) {
-        console.log(tab, event);
-      },
-      /** 查询【请填写功能名称】列表 */
-      getList() {
-        this.loading = true;
-        driverList(this.queryParams).then(response => {
-          this.infoList = response.rows;
-
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      addCommodity(){
-        let data = {
-          rescueCarType: null,
-          rescueCarNum: null,
-          rescueCarBrand: null,
-          carOwn: null,
-          carImage: null,
-          driveLicenseImage: null,
-          carBuyTime: null,
-          carLicenseColor: null,
-          carUseNature: null,
-          frameNumber: null,
-          possessorId: null,
-          deptId: null,
-        }
-
-        this.carfrom.carInfoList.push(data)
-        let idx = this.carfrom.carInfoList.length-1
-        let key = 'rescueCarNum'+idx;
-        this.$set(this.carRules, key, [
-          { required: true, message: '不能为空', trigger: 'blur' },
-        ])
-        console.log(this.carRules)
-      },
-      deletecomm(index){
-        this.carfrom.carInfoList.splice(index, 1);
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      authCancel() {
-        this.authFlag = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.resetForm("form");
-        this.form = {
-          id: null,
-          userId: null,
-          licenseImage: null,
-          idCardRight: null,
-          idCardBack: null,
-          driveLicenseImage: null,
-          carBrand: null,
-          carLicenseNum: null,
-          carType: null,
-          carNum: null,
-          carBuyTime: null,
-          carLicenseColor: null,
-          authStatus: null,
-          rejectInfo: null,
-          driverStatus: null,
-          driverLongitude: null,
-          driverLatitude: null,
-          driverPositionInfo: null,
-          driverOfflineTime: null,
-          createTime: null,
-          createBy: null,
-          updateTime: null,
-          updateBy: null,
-        };
-        this.carfrom.carInfoList=[
+      carfrom: {
+        carInfoList: [
           {
-            rescueCarType: '',
+            rescueCarType: '1',
             rescueCarNum: '',
             rescueCarBrand: '',
             carOwn: '',
@@ -636,101 +504,252 @@
             carUseNature: '',
             frameNumber: '',
             possessorId: '',
-            deptId: '',
+            deptId: ''
           }
         ]
+      },
 
+      // 表单参数
+      form: {
+        sex: '1'
       },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNo = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加司机";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
+      carRules: {},
+      // 表单校验
+      rules: {
+        realName: [
+          { required: true, message: '不能为空', trigger: 'blur' },
+          { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' }
+        ],
+        phonenumber: [
+          { required: true, message: '不能为空', trigger: 'blur' },
+          { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' }
+        ],
+        rescueCarType: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        rescueCarNum: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        carOwn: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        carImage: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        driveLicenseImage: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        carLicenseColor: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        carUseNature: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        frameNumber: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        possessorId: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
 
-        this.reset();
-        console.log(row)
-        this.form = row;
-        this.carfrom.carInfoList = row.carInfoList
-        this.open = true;
-        this.title = "修改司机信息";
-
-      },
-      handleAuth(row){
-        this.reset();
-        this.form = row;
-        this.authFlag = true;
-      },
-      //提交前的处理
-
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.$refs["carfrom"].validate(carValid => {
-              if (carValid) {
-                if (this.form.id != null) {
-                  this.form.carInfoList = this.carfrom.carInfoList
-                  updateDriver(this.form).then(response => {
-                    this.$modal.msgSuccess("修改成功");
-                    this.open = false;
-                    this.getList();
-                  });
-                } else {
-                  this.form.carInfoList =  this.carfrom.carInfoList
-                  addDriver(this.form).then(response => {
-                    this.$modal.msgSuccess("新增成功");
-                    this.open = false;
-                    this.getList();
-                  });
-                }
-
-              }
-            })
-          }
-        });
-      },
-      authSubmit(){
-        updateDriver(this.form).then(response => {
-            this.$modal.msgSuccess("审核成功");
-            this.authFlag = false;
-            this.getList();
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项？').then(function() {
-          return delDriver(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('system/info/export', {
-          ...this.queryParams
-        }, `info_${new Date().getTime()}.xlsx`)
       }
     }
-  };
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getDictDatasNew(str){
+      return this.getDictDatas(str)
+    },
+    valid(value, idx, str) {
+      this.$set(this.carfrom, str + idx, value)
+    },
+    handleClick(tab, event) {
+      // console.log(tab, event)
+    },
+    /** 查询【请填写功能名称】列表 */
+    getList() {
+      this.loading = true
+      driverList(this.queryParams).then(response => {
+        this.infoList = response.data.records
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    addCommodity() {
+      let data = {
+        rescueCarType: null,
+        rescueCarNum: null,
+        rescueCarBrand: null,
+        carOwn: null,
+        carImage: null,
+        driveLicenseImage: null,
+        carBuyTime: null,
+        carLicenseColor: null,
+        carUseNature: null,
+        frameNumber: null,
+        possessorId: null,
+        deptId: null
+      }
+
+      this.carfrom.carInfoList.push(data)
+      let idx = this.carfrom.carInfoList.length - 1
+      let key = 'rescueCarNum' + idx
+      this.$set(this.carRules, key, [
+        { required: true, message: '不能为空', trigger: 'blur' }
+      ])
+    },
+    deletecomm(index) {
+      this.carfrom.carInfoList.splice(index, 1)
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    authCancel() {
+      this.authFlag = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.resetForm('form')
+      this.form = {
+        id: null,
+        userId: null,
+        licenseImage: null,
+        idCardRight: null,
+        idCardBack: null,
+        driveLicenseImage: null,
+        carBrand: null,
+        carLicenseNum: null,
+        carType: null,
+        carNum: null,
+        carBuyTime: null,
+        carLicenseColor: null,
+        authStatus: null,
+        rejectInfo: null,
+        driverStatus: null,
+        driverLongitude: null,
+        driverLatitude: null,
+        driverPositionInfo: null,
+        driverOfflineTime: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        sex: '1'
+      }
+      this.carfrom.carInfoList = [
+        {
+          rescueCarType: '',
+          rescueCarNum: '',
+          rescueCarBrand: '',
+          carOwn: '',
+          carImage: '',
+          driveLicenseImage: '',
+          carBuyTime: '',
+          carLicenseColor: '',
+          carUseNature: '',
+          frameNumber: '',
+          possessorId: '',
+          deptId: ''
+        }
+      ]
+
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加司机'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      console.log(row)
+      this.reset()
+      this.form = row
+      this.form.realName = row.nickName
+      this.carfrom.carInfoList = !!row.carInfoList ? row.carInfoList : this.carfrom.carInfoList
+      this.open = true
+      this.title = '修改司机信息'
+
+    },
+    handleAuth(row) {
+      this.reset()
+      this.form = row
+      this.authFlag = true
+    },
+    //提交前的处理
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.$refs['carfrom'].validate(carValid => {
+            if (carValid) {
+              if (this.form.id != null) {
+                this.form.carInfoList = this.carfrom.carInfoList
+                updateDriver(this.form).then(response => {
+                  this.$modal.msgSuccess('修改成功')
+                  this.open = false
+                  this.getList()
+                })
+              } else {
+                this.form.carInfoList = this.carfrom.carInfoList[0].carOwn ? this.carfrom.carInfoList : null
+                addDriver(this.form).then(response => {
+                  this.$modal.msgSuccess('新增成功')
+                  this.open = false
+                  this.getList()
+                })
+              }
+
+            }
+          })
+        }
+      })
+    },
+    authSubmit() {
+      updateDriver(this.form).then(response => {
+        this.$modal.msgSuccess('审核成功')
+        this.authFlag = false
+        this.getList()
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then(function() {
+        return delDriver(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/info/export', {
+        ...this.queryParams
+      }, `info_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
 </script>
diff --git a/src/views/rescue/index.vue b/src/views/rescue/index.vue
index 6e0228f..fb600b2 100644
--- a/src/views/rescue/index.vue
+++ b/src/views/rescue/index.vue
@@ -526,8 +526,8 @@ export default {
     getList() {
       this.loading = true;
       listInfo(this.queryParams).then(response => {
-        this.infoList = response.rows;
-        this.total = response.total;
+        this.infoList = response.data.records;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

From 05be79b026e23db70af9b67efbb0e25ea439a269 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Thu, 22 Aug 2024 21:18:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=91=E6=8F=B4=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A63/5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rescue/info.js              |   9 ++
 src/utils/dict.js                   |  10 ++
 src/views/rescue/Locations.vue      |   6 +-
 src/views/rescue/customerIndex.vue  |   6 +-
 src/views/rescue/index.vue          | 137 +++++++++++++++-------------
 src/views/rescue/rescueCarSpend.vue |   6 +-
 src/views/rescue/rescueRoad.vue     |   6 +-
 7 files changed, 110 insertions(+), 70 deletions(-)

diff --git a/src/api/rescue/info.js b/src/api/rescue/info.js
index d1994e8..a3b4c0e 100644
--- a/src/api/rescue/info.js
+++ b/src/api/rescue/info.js
@@ -91,3 +91,12 @@ export function returnOrder(data) {
     data:data
   })
 }
+
+export function downloadOrder(params) {
+  return request({
+    url: '/system/rescueInfo/export',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
diff --git a/src/utils/dict.js b/src/utils/dict.js
index 6e4a99e..0c1cb59 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -149,6 +149,16 @@ export const DICT_TYPE = {
   CAR_LICENSE_COLOR: 'car_license_color',
   // 车辆使用性质
   CAR_USE_NATURE : 'car_use_nature',
+  // 救援类型
+  DLJY_TYPE: 'dljy_type',
+  // 收费类型
+  FEE_TYPE: 'fee_type',
+  // 救援状态
+  JY_STATUS: 'jy_status',
+  // 救援订单状态
+  JY_ORDER_STATUS: 'jy_order_status',
+  // 车辆类型
+  RESCUE_CAR_TYPE: 'rescue_car_type',
 }
 
 /**
diff --git a/src/views/rescue/Locations.vue b/src/views/rescue/Locations.vue
index 1f76ae8..8c2e75c 100644
--- a/src/views/rescue/Locations.vue
+++ b/src/views/rescue/Locations.vue
@@ -29,7 +29,11 @@
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="排序" align="center" prop="sort" />
 
       <el-table-column label="扣车地址" align="center" prop="dictLabel">
diff --git a/src/views/rescue/customerIndex.vue b/src/views/rescue/customerIndex.vue
index e1aa92b..bed1833 100644
--- a/src/views/rescue/customerIndex.vue
+++ b/src/views/rescue/customerIndex.vue
@@ -84,7 +84,11 @@
         </el-row>
 
         <el-table v-loading="loading" :data="rescueCustomerList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="序号" align="center">
+            <template scope="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <!--      <el-table-column label="主键" align="center" prop="id" />-->
           <el-table-column label="客户名称" align="center" prop="customerName"/>
           <el-table-column label="客户手机号" align="center" prop="customerPhone"/>
diff --git a/src/views/rescue/index.vue b/src/views/rescue/index.vue
index fb600b2..5b950a8 100644
--- a/src/views/rescue/index.vue
+++ b/src/views/rescue/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="名称" prop="connectionName">
         <el-input
           v-model="queryParams.connectionName"
@@ -33,23 +33,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="救援时间" prop="maintenanceTime" >
-        <el-date-picker
-            v-model="time1"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            align="right"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :picker-options="pickerOptions">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="救援类型" prop="rescueType">
         <el-select v-model="queryParams.rescueType" placeholder="请选择救援类型" clearable>
           <el-option
-            v-for="dict in dict.type.dljy_type"
+            v-for="dict in this.getDictDatas(DICT_TYPE.DLJY_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -59,7 +46,7 @@
       <el-form-item label="收费类型" prop="feeType">
         <el-select v-model="queryParams.feeType" placeholder="请选择收费类型" clearable>
           <el-option
-            v-for="dict in dict.type.fee_type"
+            v-for="dict in this.getDictDatas(DICT_TYPE.FEE_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -69,7 +56,7 @@
       <el-form-item label="救援状态" prop="rescueStatus">
         <el-select v-model="queryParams.rescueStatus" placeholder="请选择救援状态" clearable>
           <el-option
-            v-for="dict in dict.type.jy_status"
+            v-for="dict in this.getDictDatas(DICT_TYPE.JY_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -79,20 +66,38 @@
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
           <el-option
-            v-for="dict in dict.type.jy_order_status"
+            v-for="dict in this.getDictDatas(DICT_TYPE.JY_ORDER_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="救援时间" prop="maintenanceTime" >
+        <el-date-picker
+          v-model="time1"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
 
@@ -101,8 +106,7 @@
         <el-table-column label="手机号" width="130" align="center" prop="connectionPhone" />
         <el-table-column label="车牌号" width="150" align="center" prop="licenseNum" >
           <template slot-scope="scope">
-
-            <span v-if="editType==0 && scope.$index == editIdx"><el-input v-model="scope.row.licenseNum "></el-input><i @click="editInfo(scope.row)" class="el-icon-check"></i></span>
+            <span v-if="editType===0 && scope.$index == editIdx"><el-input v-model="scope.row.licenseNum "></el-input><i @click="editInfo(scope.row)" class="el-icon-check"></i></span>
             <span v-else>{{ scope.row.licenseNum }}<i @click="editInfoFront(0,scope.$index)" class="el-icon-edit"></i></span>
           </template>
         </el-table-column>
@@ -113,7 +117,7 @@
         <el-table-column label="车牌号" width="120" align="center" prop="driverCarNum" >
           <template slot-scope="scope">
 
-            <span v-if="editType==1 && scope.$index == editIdx"><el-input v-model="scope.row.driverCarNum "></el-input><i @click="editInfo(scope.row)" class="el-icon-check"></i></span>
+            <span v-if="editType===1 && scope.$index == editIdx"><el-input v-model="scope.row.driverCarNum "></el-input><i @click="editInfo(scope.row)" class="el-icon-check"></i></span>
             <span v-else>{{ scope.row.driverCarNum }}<i @click="editInfoFront(1,scope.$index)" class="el-icon-edit"></i></span>
           </template>
         </el-table-column>
@@ -125,31 +129,30 @@
       </el-table-column>
       <el-table-column label="救援类型" align="center" prop="rescueType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.dljy_type" :value="scope.row.rescueType"/>
+          <dict-tag :type="DICT_TYPE.DLJY_TYPE" :value="scope.row.rescueType"/>
         </template>
       </el-table-column>
       <el-table-column label="路段" align="center" prop="sectionRoad"/>
-
       <el-table-column label="车辆类型" align="center" prop="carType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.rescue_car_type" :value="scope.row.carType"/>
+          <dict-tag :type="DICT_TYPE.RESCUE_CAR_TYPE" :value="scope.row.carType"/>
         </template>
       </el-table-column>
-      <el-table-column width="130" label="救援地点" align="center" prop="rescuePosition" />
+      <el-table-column width="130" label="救援地点" :show-overflow-tooltip="true" align="center" prop="rescuePosition" />
       <el-table-column label="收费类型" align="center" prop="feeType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.fee_type" :value="scope.row.feeType"/>
+          <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="scope.row.feeType"/>
         </template>
       </el-table-column>
       <el-table-column label="救援状态" align="center" prop="rescueStatus" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.jy_status" :value="scope.row.rescueStatus"/>
+          <dict-tag :type="DICT_TYPE.JY_STATUS" :value="scope.row.rescueStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="订单状态·" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <span v-if="scope.row.orderStatus">
-             <dict-tag :options="dict.type.jy_order_status" :value="scope.row.orderStatus"/>
+             <dict-tag :type="DICT_TYPE.JY_ORDER_STATUS" :value="scope.row.orderStatus"/>
           </span>
          <span v-else>
             未成单
@@ -160,7 +163,7 @@
       <el-table-column label="应收金额(元)" width="150" align="center" prop="setMoney" >
         <template slot-scope="scope">
 
-          <span v-if="editType==2 && scope.$index == editIdx"><el-input  oninput="value=value.replace(/[^0-9.]/g,'')" v-model="scope.row.setMoney2 "></el-input><i @click="editInfo(scope.row,2)" class="el-icon-check"></i></span>
+          <span v-if="editType===2 && scope.$index == editIdx"><el-input  oninput="value=value.replace(/[^0-9.]/g,'')" v-model="scope.row.setMoney2 "></el-input><i @click="editInfo(scope.row,2)" class="el-icon-check"></i></span>
           <span v-else>{{ scope.row.setMoney/100 }}<i @click="editInfoFront(2,scope.$index)" class="el-icon-edit"></i></span>
         </template>
       </el-table-column>
@@ -272,11 +275,11 @@
         </el-form-item>
         <el-form-item label="是否为预约单" prop="isAppointment">
           <el-radio-group v-model="form.isAppointment">
-            <el-radio
-              v-for="dict in dict.type.yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.yes_no"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value"-->
+<!--            >{{dict.label}}</el-radio>-->
           </el-radio-group>
         </el-form-item>
         <el-form-item label="救援时间" prop="rescueTime">
@@ -289,22 +292,22 @@
         </el-form-item>
         <el-form-item label="救援类型 1拖车2送油3搭电4换台5扣车" prop="rescueType">
           <el-select v-model="form.rescueType" placeholder="请选择救援类型 1拖车2送油3搭电4换台5扣车">
-            <el-option
-              v-for="dict in dict.type.dljy_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.dljy_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
           </el-select>
         </el-form-item>
         <el-form-item label="车辆类型  大中小" prop="carType">
           <el-select v-model="form.carType" placeholder="请选择车辆类型  大中小">
-            <el-option
-              v-for="dict in dict.type.rescue_car_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.rescue_car_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
           </el-select>
         </el-form-item>
         <el-form-item label="救援地点 详细描述" prop="rescuePosition">
@@ -318,11 +321,11 @@
         </el-form-item>
         <el-form-item label="收费类型" prop="feeType">
           <el-radio-group v-model="form.feeType">
-            <el-radio
-              v-for="dict in dict.type.fee_type"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.fee_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value"-->
+<!--            >{{dict.label}}</el-radio>-->
           </el-radio-group>
         </el-form-item>
         <el-form-item label="车辆品牌" prop="carBrand">
@@ -377,7 +380,7 @@
 </template>
 
 <script>
-import { routeInfo, listInfo, getInfo, delInfo, addInfo, updateInfo,getDriver,designateDriver,returnOrder,watchImg } from "@/api/rescue/info";
+import { routeInfo, listInfo, getInfo, delInfo, addInfo, updateInfo,getDriver,designateDriver,returnOrder,watchImg, downloadOrder} from "@/api/rescue/info";
 import { getmap } from "@/api/Map/map";
 import Map from "../../components/Map/index"
 export default {
@@ -426,12 +429,18 @@ export default {
         destinationInfo: null,
         rescueStatus: null,
         rescueAmount: null,
+        driverName: null,
+        driverCarNum: null,
+        orderStatus: null,
+        rescueEnd: null,
+        rescueStart: null
       },
       // 表单参数
       form: {},
       driverList:[],
-      imgFlag:0,
+      imgFlag:false,
       watchImgList:[],
+      pickerOptions: null,
       // 表单校验
       rules: {
         connectionName: [
@@ -472,7 +481,7 @@ export default {
     watchImg(data){
 
       watchImg(data.id).then(response =>{
-        this.imgFlag = 1
+        this.imgFlag = true
         this.watchImgList = response.data
       })
     },
@@ -563,10 +572,6 @@ export default {
         rescueStatus: null,
         driverId: null,
         rescueAmount: null,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null
       };
       this.resetForm("form");
     },
@@ -583,7 +588,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.time1 =[]
+      this.time1 = null
+      this.queryParams.rescueStart = null
+      this.queryParams.rescueEnd = null
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -674,10 +681,12 @@ export default {
       }).catch(() => {});
     },
     /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/rescueInfo/export', {
-        ...this.queryParams
-      }, `救援订单_${new Date().getTime()}.xlsx`)
+    async handleExport() {
+     try {
+       const data = await downloadOrder(this.queryParams)
+       this.$download.excel(data, `救援订单_${new Date().getTime()}.xls`)
+     }catch {}
+     finally {}
     }
   }
 };
diff --git a/src/views/rescue/rescueCarSpend.vue b/src/views/rescue/rescueCarSpend.vue
index d11f465..fc21935 100644
--- a/src/views/rescue/rescueCarSpend.vue
+++ b/src/views/rescue/rescueCarSpend.vue
@@ -296,15 +296,15 @@ export default {
   methods: {
     getCarList(){
       listCar().then(res=>{
-        this.carList = res.rows
+        this.carList = res.data.records
       })
     },
     /** 查询车辆消费管理列表 */
     getList() {
       this.loading = true;
       listRescueCarSpend(this.queryParams).then(response => {
-        this.rescueCarSpendList = response.rows;
-        this.total = response.total;
+        this.rescueCarSpendList = response.data.records;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
diff --git a/src/views/rescue/rescueRoad.vue b/src/views/rescue/rescueRoad.vue
index 024b394..8dcad05 100644
--- a/src/views/rescue/rescueRoad.vue
+++ b/src/views/rescue/rescueRoad.vue
@@ -29,7 +29,11 @@
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="排序" align="center" prop="sort" />
 
       <el-table-column label="路段" align="center" prop="dictLabel">