Merge remote-tracking branch 'origin/master'

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'
+  })
+}

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',
 }
 
 /**

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">

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',
+  })
+}

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()"
+                  :key="item.id"
-                  :label="item.realName"
+                  :label="item.nickName"
-                  :value="item.id.toString()">
+                  :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()"
+                  :key="item.id"
-                  :label="item.realName"
+                  :label="item.nickName"
-                  :value="item.id.toString()">
+                  :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()"
+                  :key="item.id"
-                  :label="item.realName"
+                  :label="item.nickName"
-                  :value="item.id.toString()">
+                  :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
+        this.xtitle = data.name
-        console.log('x',data);
+        // console.log('x',data);
-        console.log(this.form.customerDeptId)
+        // console.log(this.form.customerDeptId)
       },
       /** 查询救援的客户信息列表 */
       getList() {
         this.loading = true;
         driverlist(this.queryParams).then(response => {
-          this.rescueCustomerList = response.rows;
+          this.rescueCustomerList = response.data.records;
-          this.total = response.total;
+          this.total = response.data.total;
           this.loading = false;
         });
         getdeptTree().then(res=>{
-          console.log(res)
+          this.Thetree = this.handleTree(res.data, 'id')
-          this.Thetree = res.data
         })
         let data = {
           pageNo: 1,
           pageSize: 999,
         }
         driverList(data).then(res=>{
-          console.log(res)
+          // console.log(res)
-          this.options = res.rows
+          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(",");
+        const data = {
-        row.secondDriverIds = row.secondDriverIds.split(",");
+          ...row,
-        row.thirdDriverIds = row.thirdDriverIds.split(",");
+          firstDriverIds: row.firstDriverIds.split(",").map(id => parseInt(id)),
-        this.form = row
+          secondDriverIds: row.secondDriverIds.split(",").map(id => parseInt(id)),
-        console.log(this.form)
+          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("删除成功");

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,198 @@
                  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">
+    <el-col :span="20">
-  <div class="app-container">
+      <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"
-      <el-form-item label="客户名称" prop="customerName">
+                 label-width="68px"
-        <el-input
+        >
-          v-model="queryParams.customerName"
+          <el-form-item label="客户名称" prop="customerName">
-          placeholder="请输入客户名称"
+            <el-input
-          clearable
+              v-model="queryParams.customerName"
-          @keyup.enter.native="handleQuery"
+              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 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"/>
+          <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
+        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-          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-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-col :span="1.5">
+            <el-form-item label="客户公司" prop="customerDeptId">
-        <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">
+              <span style="font-weight: bold; font-size: 16px">{{ form.deptName || xtitle }}</span>
-      <el-table-column type="selection" width="55" align="center" />
+            </el-form-item>
-<!--      <el-table-column label="主键" align="center" prop="id" />-->
+            <el-form-item label="客户名称" prop="customerName">
-      <el-table-column label="客户名称" align="center" prop="customerName" />
+              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>
-      <el-table-column label="客户手机号" align="center" prop="customerPhone" />
+            </el-form-item>
-      <el-table-column label="客户公司" align="center" prop="deptName" />
+            <el-form-item label="客户手机号" prop="customerPhone">
-      <el-table-column label="签约开始日期" align="center" prop="signStartDate" width="180">
+              <el-input v-model="form.customerPhone" placeholder="请输入客户手机号"/>
-        <template slot-scope="scope">
+            </el-form-item>
-          <span>{{ parseTime(scope.row.signStartDate, '{y}-{m}-{d}') }}</span>
+            <el-form-item label="单号前缀" prop="orderPrefix">
-        </template>
+              <el-input v-model="form.orderPrefix" placeholder="请输入单号前缀"/>
-      </el-table-column>
+            </el-form-item>
-      <el-table-column label="签约结束日期" align="center" prop="signEndDate" width="180">
+            <el-form-item label="签约开始日期" prop="signStartDate">
-        <template slot-scope="scope">
+              <el-date-picker clearable
-          <span>{{ parseTime(scope.row.signEndDate, '{y}-{m}-{d}') }}</span>
+                              v-model="form.signStartDate"
-        </template>
+                              type="date"
-      </el-table-column>
+                              value-format="yyyy-MM-dd"
-<!--      <el-table-column label="默认救援类型" align="center" prop="defaultRescueType">-->
+                              placeholder="请选择签约开始日期"
-<!--        <template slot-scope="scope">-->
+              >
-<!--          <dict-tag :options="dict.type.dljy_type" :value="scope.row.defaultRescueType"/>-->
+              </el-date-picker>
-<!--        </template>-->
+            </el-form-item>
-<!--      </el-table-column>-->
+            <el-form-item label="签约结束日期" prop="signEndDate">
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <el-date-picker clearable
-        <template slot-scope="scope">
+                              v-model="form.signEndDate"
-          <el-button
+                              type="date"
-            size="mini"
+                              value-format="yyyy-MM-dd"
-            type="text"
+                              placeholder="请选择签约结束日期"
-            icon="el-icon-edit"
+              >
-            @click="handleUpdate(scope.row)"
+              </el-date-picker>
-          >修改</el-button>
+            </el-form-item>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
 
-    <pagination
+            <!--        <el-form-item label="默认救援类型" prop="defaultRescueType">-->
-      v-show="total>0"
+            <!--          <el-select v-model="form.defaultRescueType" placeholder="请选择默认救援类型">-->
-      :total="total"
+            <!--            <el-option-->
-      :page.sync="queryParams.pageNo"
+            <!--              v-for="dict in dict.type.dljy_type"-->
-      :limit.sync="queryParams.pageSize"
+            <!--              :key="dict.value"-->
-      @pagination="getList"
+            <!--              :label="dict.label"-->
-    />
+            <!--              :value="dict.value"-->
-
+            <!--            ></el-option>-->
-    <!-- 添加或修改救援的客户信息对话框 -->
+            <!--          </el-select>-->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+            <!--        </el-form-item>-->
-
+          </el-form>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <div slot="footer" class="dialog-footer">
-        <el-form-item label="客户公司" prop="customerDeptId">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
-
+            <el-button @click="cancel">取 消</el-button>
-          <span style="font-weight: bold; font-size: 16px">{{ form.deptName ||xtitle}}</span>
+          </div>
-        </el-form-item>
+        </el-dialog>
-        <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>
       </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 +229,9 @@ export default {
       // 救援的客户信息表格数据
       rescueCustomerList: [],
       // 弹出层标题
-      title: "",
+      title: '',
-      xtitle:'',
+      xtitle: '',
-      xid:'',
+      xid: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -220,57 +243,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) {
+    filterNode(value, data) {
-      // console.log(data, checked, indeterminate);
+      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.rescueCustomerList = response.data.records
-        this.total = response.data.total;
+        this.total = response.data.total
-        this.loading = false;
+        this.loading = false
-      });
+      })
-      getdeptTree().then(res=>{
+      getdeptTree().then(res => {
         this.Thetree = this.handleTree(res.data, 'id')
       })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open = false
-      this.reset();
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -288,76 +312,77 @@ export default {
         createBy: null,
         updateTime: null,
         updateBy: null
-      };
+      }
-      this.resetForm("form");
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
+      this.queryParams.pageNo = 1
-      this.getList();
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm')
-      this.handleQuery();
+      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 == ''){
+      if (this.xtitle == '') {
-        this.$modal.msgSuccess("请先选择部门");
+        this.$modal.msgSuccess('请先选择部门')
         return
       }
-      this.reset();
+      this.reset()
-      this.open = true;
+      this.open = true
-      this.title = "添加客户信息";
+      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.form = response.data
-        this.open = true;
+        this.open = true
-        this.title = "修改救援的客户信息";
+        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.$modal.msgSuccess('修改成功')
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           } else {
             addRescueCustomer(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess('新增成功')
-              this.open = false;
+              this.open = false
-              this.getList();
+              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.getList()
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {});
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -366,29 +391,31 @@ export default {
       }, `rescueCustomer_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
 <style>
-  .left-box{
+.left-box {
-    box-sizing: border-box;
+  box-sizing: border-box;
-    padding: 15px;
+  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;
 
-    /*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>

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
+<!--            <el-radio-->
-              v-for="dict in dict.type.yes_no"
+<!--              v-for="dict in dict.type.yes_no"-->
-              :key="dict.value"
+<!--              :key="dict.value"-->
-              :label="dict.value"
+<!--              :label="dict.value"-->
-            >{{dict.label}}</el-radio>
+<!--            >{{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
+<!--            <el-option-->
-              v-for="dict in dict.type.dljy_type"
+<!--              v-for="dict in dict.type.dljy_type"-->
-              :key="dict.value"
+<!--              :key="dict.value"-->
-              :label="dict.label"
+<!--              :label="dict.label"-->
-              :value="dict.value"
+<!--              :value="dict.value"-->
-            ></el-option>
+<!--            ></el-option>-->
           </el-select>
         </el-form-item>
         <el-form-item label="车辆类型  大中小" prop="carType">
           <el-select v-model="form.carType" placeholder="请选择车辆类型  大中小">
-            <el-option
+<!--            <el-option-->
-              v-for="dict in dict.type.rescue_car_type"
+<!--              v-for="dict in dict.type.rescue_car_type"-->
-              :key="dict.value"
+<!--              :key="dict.value"-->
-              :label="dict.label"
+<!--              :label="dict.label"-->
-              :value="dict.value"
+<!--              :value="dict.value"-->
-            ></el-option>
+<!--            ></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
+<!--            <el-radio-->
-              v-for="dict in dict.type.fee_type"
+<!--              v-for="dict in dict.type.fee_type"-->
-              :key="dict.value"
+<!--              :key="dict.value"-->
-              :label="dict.value"
+<!--              :label="dict.value"-->
-            >{{dict.label}}</el-radio>
+<!--            >{{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
       })
     },
@@ -526,8 +535,8 @@ export default {
     getList() {
       this.loading = true;
       listInfo(this.queryParams).then(response => {
-        this.infoList = response.rows;
+        this.infoList = response.data.records;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -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() {
+    async handleExport() {
-      this.download('system/rescueInfo/export', {
+     try {
-        ...this.queryParams
+       const data = await downloadOrder(this.queryParams)
-      }, `救援订单_${new Date().getTime()}.xlsx`)
+       this.$download.excel(data, `救援订单_${new Date().getTime()}.xls`)
+     }catch {}
+     finally {}
     }
   }
 };

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.rescueCarSpendList = response.data.records;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

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">