Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	src/views/vehicleType/modal/oneType.vue

src/router/index.js

@@ -337,12 +337,12 @@ export const asyncRouterMap = [{
       name: '车辆排班管理',
       authority: 'bookRecord'
     },
-    {
-      path: 'bookingManagement',
-      component: _import('vehicle/smallProgram/bookingManagement'),
-      name: '小程序车辆申请管理',
-      authority: 'bookingManagement'
-    },
+    // {
+    //   path: 'bookingManagement',
+    //   component: _import('vehicle/smallProgram/bookingManagement'),
+    //   name: '小程序车辆申请管理',
+    //   authority: 'bookingManagement'
+    // },
     {
       path: 'vehicleWarningMsg',
       component: _import('vehicle/vehicleWarningMsg/index'),

src/views/baseInfo/companyInfo/companyMap.vue

@@ -98,7 +98,7 @@
         } else {
           allPage(this.listQuery)
             .then(response => {
-              let listTemp = response.data.data;
+              let listTemp = response.data;
               let arr = [];
               listTemp.map(function(item){
                 arr.push(item);
@@ -202,7 +202,7 @@
                 type: 'get',
                 url: 'https://api.map.baidu.com/geocoder/v2/?ak=wWYw0yCb8ntXmSgTxTx40vKR&callback=renderReverse&location=' + r.point.lat + ',' + r.point.lng + '&output=json&pois=1',
                 async: false,
-                jsonp: "callback", 
+                jsonp: "callback",
                 dataType: 'jsonp',
                 success: function (data) {
                   var addrCity = data.result.addressComponent.adcode

src/views/baseInfo/companyInfo/index.vue

@@ -328,7 +328,7 @@
       }
     },
     created() {
-      
+
     },
     computed: {
       ...mapGetters([
@@ -381,7 +381,7 @@
     //鼠标释放时候的函数
       end(){
         this.flags = false;
-      }, 
+      },
       close(){
         this.otherProvince = false
         this.quanguo()
@@ -490,7 +490,7 @@
           .then(res => {
             this.loading = false;
             let allList = [];
-            let listTemp = res.data.data;
+            let listTemp = res.data;
             //一次读入所有涉及地区，防止多次读取
             // if (!this.$utils.isEmpty(listTemp)) {
             //   let allRegions = new Set();
@@ -503,11 +503,11 @@
             //   }
             //   getRegionByCodes([...allRegions]);
             // }
-            if(res.data.data){
-              res.data.data.forEach(function (item) {
+            if(res.data){
+              res.data.forEach(function (item) {
                 allList.push(item);
               });
-              if(res.data.data.length< this.listQuery.limit && this.list.length>0){
+              if(res.data.length< this.listQuery.limit && this.list.length>0){
                 //已加载全部
                 this.nomore = true;
               }

src/views/vehicle/bookRecord/index.vue

@@ -802,6 +802,7 @@
         listQuery: {
           page: 1,
           limit: 20,
+					flag: false,
           zoneId:undefined,
 					liftCompany: undefined,
           numberPlate: undefined,
@@ -1239,7 +1240,7 @@
       getList() {
         this.listLoading = true;
         for(var key in this.listQuery){
-          if(this.listQuery[key]==''){
+          if(this.listQuery[key]===''){
             this.listQuery[key]=undefined
           }
         }

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -535,7 +535,10 @@
        * */
       toShowDialog(item, iitem, ii){
 //        <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
-        if(!ii.bg){
+        if (!item.mileageLastUpdate) {
+					item.mileageLastUpdate = 0
+				}
+				if(!ii.bg){
           //空白-可安排用车
           if(item.vehicleModel==undefined){
             this.$notify({

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -21,7 +21,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="公里数">
-            <span>{{currentItem.item.maintenanceMileage}}km</span>
+            <span>{{currentItem.item.mileageLastUpdate}}km</span>
           </el-form-item>
         </el-col>
       </el-row>