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);

src/views/baseInfo/companyInfo/index.vue

@@ -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/purseManage/discountRecord.vue

@@ -17,7 +17,8 @@
             <el-col :span="6">
               <el-form-item label="状态" prop="type">
                 <el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态">
-                  <el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option>
+                  <el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name"
+                             :value="item.val"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -49,7 +50,7 @@
           <template scope="scope">
             <span v-if="scope.row.stauts==0">未到帐</span>
             <span v-if="scope.row.stauts==1">已到账</span>
-            <span v-if="scope.row.stauts==2">审核失败</span>
+            <span v-if="scope.row.stauts==2">驳回</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="申请时间">
@@ -64,7 +65,9 @@
         </el-table-column>
         <el-table-column align="center" label="操作" width="65" fixed="right">
           <template scope="scope">
-            <el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.stauts==0" @click="handleUpdate(scope.row)">审核</el-button>
+            <el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.stauts==0"
+                       @click="handleUpdate(scope.row)">审核
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -133,19 +136,19 @@
             return {
                 typeOptions: [
                     {
-            "name":'全部',
-            "val":''
+                        "name": '全部',
+                        "val": ''
                     },
                     {
-            "name":'未到账',
-            "val":'0'
+                        "name": '未到账',
+                        "val": '0'
                     },
                     {
-            "name":'已到账',
-            "val":'1'
+                        "name": '已到账',
+                        "val": '1'
                     },
                 ],
-        dialogVisible:false,
+                dialogVisible: false,
                 BASE_API: process.env.BASE_API,
                 showLoadingBody: false,
                 list: null,
@@ -156,14 +159,14 @@
                     limit: 20,
                     phone: '',//手机号
                     username: '',//姓名
-          state:'',//状态
+                    state: '',//状态
                 },
                 inline: true,
                 tableKey: 0,
-        dialogFrom:{
-          status:'1',
-          cono:'',
-          reason:''
+                dialogFrom: {
+                    status: '1',
+                    cono: '',
+                    reason: ''
                 },
             }
         },
@@ -187,9 +190,11 @@
                     if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
                         listRs = response.data.data;
                         totalCountRs = response.data.totalCount;
-            listRs.map(function(item){
+                        listRs.map(function (item) {
                             item.crtTimeStr = timestamp2Date(item.crtTime);
+                            if (item.finishTime != 0 && item.finishTime != null) {
                                 item.finishTimeStr = timestamp2Date(item.finishTime);
+                            }
                         });
                     }
                     this.listLoading = false;
@@ -216,10 +221,10 @@
                 this.listQuery.page = val;
                 this.getList();
             },
-      cancelHandel(){
+            cancelHandel() {
                 this.dialogVisible = false;
             },
-      handleUpdate(row){
+            handleUpdate(row) {
                 this.dialogFrom.cathId = row.id;
                 this.dialogVisible = true;
             },
@@ -227,8 +232,8 @@
                 var that = this;
                 const set = this.$refs;
                 set[formName].validate(valid => {
-          if(this.dialogFrom.status==1){
-            if(this.dialogFrom.cono==''){
+                    if (this.dialogFrom.status == 1) {
+                        if (this.dialogFrom.cono == '') {
                             this.$notify({
                                 title: '警告',
                                 message: '请输入订单号',
@@ -238,8 +243,8 @@
                             return false;
                         }
                     }
-          if(this.dialogFrom.status==2){
-            if(this.dialogFrom.reason==''){
+                    if (this.dialogFrom.status == 2) {
+                        if (this.dialogFrom.reason == '') {
                             this.$notify({
                                 title: '警告',
                                 message: '请输入拒绝原因',

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

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>