Merge branch 'base-modify'

src/App.vue

@@ -73,4 +73,6 @@
       height: 100% !important; //设置高优先，以覆盖内联样式
     }
   /*}*/
+  // .el-time-spinner__item{line-height: 16px !important;}
+  // .el-scrollbar__wrap{margin-bottom: 0px !important;}
 </style>

src/main.js

@@ -78,6 +78,24 @@ Vue.use(BaiduMap, {
 import infiniteScroll from 'vue-infinite-scroll'
 Vue.use(infiniteScroll);
 
+//只能输入正整数
+Vue.directive('enterNumber', {
+  inserted: function (el) {
+    el.addEventListener("keypress",function(e){
+      e = e || window.event;
+      let charcode = typeof e.charCode == 'number' ? e.charCode : e.keyCode;
+      let re = /\d/;
+      if(!re.test(String.fromCharCode(charcode)) && charcode > 9 && !e.ctrlKey){
+          if(e.preventDefault){
+              e.preventDefault();
+          }else{
+              e.returnValue = false;
+          }                            
+      }
+    });
+  }
+});
+
 // register global utility filters.
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])

src/utils/fetch.js

@@ -71,16 +71,61 @@ service.interceptors.response.use(
     } else {
       return response.data;
     }
-  },
-  error => {
-    // console.log(error); // for debug
-    Message({
-      message: error.message,
-      type: 'error',
-      duration: 5 * 1000
-    });
-    return Promise.reject(error);
+  },(err) => { // 这里是返回状态码不为200时候的错误处理
+    if (err && err.response) {
+      switch (err.response.status) {
+        case 400:
+          err.message = '页面不存在'
+          break
+        case 401:
+          err.message = '未授权，请登录'
+          break
+  
+        case 403:
+          err.message = '拒绝访问'
+          break
+  
+        case 404:
+          err.message = '页面不存在'
+          break
+  
+        case 408:
+          err.message = '页面不存在'
+          break
+  
+        case 500:
+          err.message = '网络开小差，请稍后重试'
+          break
+  
+        case 501:
+          err.message = '网络开小差，请稍后重试'
+          break
+  
+        case 502:
+          err.message = '网络开小差，请稍后重试'
+          break
+  
+        case 503:
+          err.message = '网络开小差，请稍后重试'
+          break
+  
+        case 504:
+          err.message = '网络开小差，请稍后重试'
+          break
+  
+        case 505:
+          err.message = '网络开小差，请稍后重试'
+          break
+        default:
+      }
+      Message({
+        message: err.message,
+        type: 'error',
+        duration: 3 * 1000
+      });
+    }
+    return Promise.reject(err)
   }
 );
 
-export default service;
+export default service;
\ No newline at end of file

src/views/admin/user/index.vue

@@ -245,7 +245,8 @@
         listQuery: {
           page: 1,
           limit: 20,
-          name: undefined
+          name: undefined,
+          username:undefined
         },
         sexOptions: ['男', '女'],
         zoneOptions: ['男', '女'],
@@ -341,6 +342,7 @@
        * */
       getList() {
         this.listLoading = true;
+        this.listQuery.username=this.listQuery.name
         page(this.listQuery)
           .then(response => {
             this.list = response.data.rows;

src/views/appManagement/appVersion/index.vue

@@ -413,7 +413,7 @@
           type: 'warning'
         }).then(() => {
           removeAppVersion(row.id).then(res=>{
-            if (res.rel) {
+            if (res.status==200) {
               this.$notify.success({
                 title: '删除成功',
                 message: `success`

src/views/index/index.vue

@@ -87,7 +87,7 @@
             <div v-for="iitem in  scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time">
               <div v-for="ii in  iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)">
                 <span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span>
-                <span v-else style="position: absolute;color: #fff;top: -24px;right: 0;">{{ii.timeEtr}}</span>
+                <span v-else style="position: relative;color: #fff;top: -24px;right: -20px;">{{ii.timeEtr}}</span>
                 <span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span>
               </div>
             </div>

src/views/purseManage/commissionSettings.vue

@@ -4,37 +4,37 @@
       <el-row v-for="(item,index) in settingList" :key="index">
         <el-col :span="24" v-if="item.level==1">
           <el-form-item label="总部股东分销提成">
-            <el-input v-model="item.extract" placeholder="请输入总部股东分销提成" ></el-input>
+            <el-input v-model="item.extract" placeholder="请输入总部股东分销提成" type="number" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==2">
           <el-form-item label="分公司股东分销提成">
-            <el-input v-model="item.extract" placeholder="请输入分公司股东分销提成" ></el-input>
+            <el-input v-model="item.extract" placeholder="请输入分公司股东分销提成" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==3">
           <el-form-item label="合伙人分销提成">
-            <el-input v-model="item.extract" placeholder="请输入合伙人分销提成" ></el-input>
+            <el-input v-model="item.extract" placeholder="请输入合伙人分销提成" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==4">
           <el-form-item label="员工分销提成">
-            <el-input v-model="item.extract" placeholder="请输入员工分销提成" ></el-input>
+            <el-input v-model="item.extract" placeholder="请输入员工分销提成" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==5">
           <el-form-item label="代理人分销提成">
-            <el-input v-model="item.extract" placeholder="请输入代理人分销提成" ></el-input>
+            <el-input v-model="item.extract" placeholder="请输入代理人分销提成" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="item.level==0">
           <el-form-item label="普通用户分销提成">
-            <el-input v-model="item.extract" placeholder="请输入普通用户分销提成" ></el-input>
+            <el-input v-model="item.extract" placeholder="请输入普通用户分销提成" v-enterNumber></el-input>
             <span  style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
           </el-form-item>
         </el-col>

src/views/userManagement/memberEnter.vue

@@ -125,14 +125,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="免费天数" placeholder="免费天数" prop="totalNumber">
-              <el-input size="small " type="text" v-model="newMemberObject.totalNumber"></el-input>
+              <el-input size="small " type="text" v-model="newMemberObject.totalNumber" v-enterNumber></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="剩余天数" placeholder="剩余天数" prop="rentFreeDays">
-              <el-input size="small " type="text" v-model="newMemberObject.rentFreeDays"></el-input>
+              <el-input size="small " type="text" v-model="newMemberObject.rentFreeDays" v-enterNumber></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/views/userManagement/userList/index.vue

@@ -344,14 +344,14 @@
         <el-row>
           <el-col :span="16">
             <el-form-item label="总天数" prop="totalNumber">
-              <el-input type="text" v-model="userMembershipInformation.totalNumber" placeholder="请填写赠送天数"></el-input>
+              <el-input type="text" v-model="userMembershipInformation.totalNumber" placeholder="请填写赠送天数" v-enterNumber></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="16">
             <el-form-item label="剩余天数/天" prop="rentFreeDays" placeholder="请填写剩余天数">
-              <el-input type="text" v-model="userMembershipInformation.rentFreeDays"></el-input>
+              <el-input type="text" v-model="userMembershipInformation.rentFreeDays" v-enterNumber></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -389,10 +389,10 @@
           <el-input size="small " type="text" v-model="newMemberObject.phone"></el-input>
         </el-form-item>
         <el-form-item label="免费天数" placeholder="免费天数" prop="totalNumber">
-          <el-input size="small " type="text" v-model="newMemberObject.totalNumber"></el-input>
+          <el-input size="small " type="text" v-model="newMemberObject.totalNumber" v-enterNumber></el-input>
         </el-form-item>
         <el-form-item label="剩余天数" placeholder="剩余天数" prop="rentFreeDays">
-          <el-input size="small " type="text" v-model="newMemberObject.rentFreeDays"></el-input>
+          <el-input size="small " type="text" v-model="newMemberObject.rentFreeDays" v-enterNumber></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/vehicle/bookRecord/index.vue

@@ -201,7 +201,7 @@
           <el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small"  @click="handleProve(scope.row)">通过</el-button>
           <el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small"  style="color: red;" @click="handleReject(scope.row)">驳回</el-button>
           <template v-if="scope.row.vehicleDepartureLogVo==undefined">
-            <el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1" size="small" class="el-button el-button--text el-button--small"  @click="handleLift(scope.row)">出车</el-button>
+            <el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small"  @click="handleLift(scope.row)">出车</el-button>
           </template>
           <template v-if="scope.row.vehicleDepartureLogVo!=undefined">
             <el-button v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1" size="small" class="el-button el-button--text el-button--small"  @click="handleRet(scope.row)">收车</el-button>
@@ -329,11 +329,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="提车公里数">
-              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart}}KM</span>
+              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart?detailItem.vehicleDepartureLogVo.mileageStart+'KM':''}}</span>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row style="margin-left: 20px;">
+        <el-row style="margin-left: 20px;" v-if="departurePicList.length>0">
           <el-col :span="3" v-for="(item, index) in departurePicList" :key="index" :offset="index%6 > 0 ? 1 : 0" style="margin-bottom:10px">
             <el-card>
               <img :src="item" class="image">
@@ -361,11 +361,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="还车公里数">
-              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd}}KM</span>
+              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd?detailItem.vehicleDepartureLogVo.mileageEnd+'KM':''}}</span>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row style="margin-left: 20px;">
+        <el-row style="margin-left: 20px;"  v-if="arrivalPicList.length>0">
           <el-col :span="3" v-for="(item, index) in arrivalPicList" :key="index" :offset="index%6 > 0 ? 1 : 0" style="margin-bottom:10px">
             <el-card>
               <img :src="item" class="image">
@@ -1085,7 +1085,7 @@
         var t = this
         this.detailItem = row;
         if(row.vehicleDepartureLogVo!= undefined){
-          if(row.vehicleDepartureLogVo.departurePic!= undefined){
+          if(row.vehicleDepartureLogVo.departurePic!= undefined&&row.vehicleDepartureLogVo.departurePic!=''){
             let arr = row.vehicleDepartureLogVo.departurePic.split(",");
             let departurePicList = [];
             let p = {};
@@ -1093,8 +1093,10 @@
               departurePicList.push(item);
             });
             t.departurePicList = departurePicList;
+          }else{
+            t.departurePicList = [];
           }
-          if(row.vehicleDepartureLogVo.arrivalPic!= undefined){
+          if(row.vehicleDepartureLogVo.arrivalPic!= undefined&&row.vehicleDepartureLogVo.arrivalPic!=''){
             let Arr = row.vehicleDepartureLogVo.arrivalPic.split(",");
             let arrivalPicList = [];
             let p = {};
@@ -1102,7 +1104,12 @@
               arrivalPicList.push(item);
             });
             t.arrivalPicList = arrivalPicList;
+          }else{
+            t.arrivalPicList = [];
           }
+        }else{
+          t.departurePicList = [];
+          t.arrivalPicList = [];
         }
         this.dialogDetailVisible = true;
       },
@@ -1559,5 +1566,5 @@
       height: 110px;
       display: block;
     }
-    .el-card__body,.el-card{padding: 0px;width: 110px;height: 110px;text-align: center;}
+    .el-card__body,.el-card{padding: 0px !important;width: 150px;text-align: center;}
 </style>

src/views/vehicle/vehicleInfo/index.vue

@@ -417,7 +417,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属人" prop="maintenanceMileage">
+            <el-form-item label="所属人">
               <el-select v-model.number="form.belongTo" placeholder="请选择所属人">
                 <el-option v-for="(val, key, index)   in getAllBelong2Type() " :key="val.code" :label="val.val"
                            :value="val.code"></el-option>
@@ -922,9 +922,6 @@
         },
         book_type_list:[
           {
-            name:'租车',
-            id:1
-          },{
             name:'维修',
             id:3
           },{
@@ -1913,10 +1910,10 @@
           item.value = item.name;
           selectArry.push(item);
         });
-        this.form4Apply.liftCompany = row.subordinateBranch;
+        this.form4Apply.liftCompany = row.parkBranchCompanyId;
         this.form4Apply.vehicleId = row.id;
         selectArry.map(function (iitem) {
-          if( row.subordinateBranch == iitem.id){
+          if( row.parkBranchCompanyId == iitem.id){
             that.form4Apply.state3 = iitem.name;
           }
         });

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -136,7 +136,7 @@
             <div v-for="iitem in  scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time">
               <div v-for="ii in  iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)">
                 <span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span>
-                <span v-else style="position: absolute;color: #fff;top: -24px;right: 0;">{{ii.timeEtr}}</span>
+                <span v-else style="position: relative;color: #fff;top: -24px;right: -20px;">{{ii.timeEtr}}</span>
                 <span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span>
               </div>
             </div>
@@ -529,10 +529,28 @@
 //        <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
         if(!ii.bg){
           //空白-可安排用车
-          this.anpai = true;
+          if(item.vehicleModel==undefined){
+            this.$notify({
+              title: '警告',
+              message: '车型未配置，请先配置',
+              type: 'warning',
+              duration: 2000
+            });
+            return false
+            if(item.vehicleModel.keyword==undefined){
+              this.$notify({
+                title: '警告',
+                message: '车型未配置，请先配置',
+                type: 'warning',
+                duration: 2000
+              });
+              return false
+            }
+          }
           let arr = item.vehicleModel.keyword.split(",");
           item.vehicleModel.keyword = arr.join(" | ");
           this.currentItem = {item: item, iitem: iitem, ii: ii};
+          this.anpai = true;
         } else {
           if(ii.vehicleBookRecord.status == 1){//审核中的显示预约弹框
               this.zhanlan = true;

src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue

@@ -28,7 +28,7 @@
         <span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
       </el-form-item>
     </el-form>
-    <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook' class="dialog-footer">
+    <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook&&currentItem.ii.vehicleBookRecord.vehicleDepartureLogVo!=undefined' class="dialog-footer">
       <el-button @click="cancel()">取消用车</el-button>
     </div>
     <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">

src/views/vehicle/vehicleSchedulManage/vehicleMaintenanceModal.vue

@@ -27,7 +27,7 @@
         <span>{{upkeepStr}}</span>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook">
+    <div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook&&currentItem.ii.vehicleBookRecord.vehicleDepartureLogVo!=undefined">
       <el-button @click="cancel()">取消用车</el-button>
     </div>
     <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -26,13 +26,15 @@
         </el-col>
       </el-row>
       <el-form-item label="房车配置">
-        <span>{{currentItem.item.vehicleModel.keyword}}</span>
+        <span v-if="currentItem.item.vehicleModel.keyword">{{currentItem.item.vehicleModel.keyword}}</span>
       </el-form-item>
       <el-form-item label="选择时间" prop="times">
         <el-date-picker
           v-model="form.times"
           type="datetimerange"
           :picker-options="pickerOptions0"
+          format="yyyy-MM-dd HH:00:00" 
+          value-format="yyyy-MM-dd HH:00:00"
           placeholder="选择时间范围">
         </el-date-picker>
       </el-form-item>
@@ -48,7 +50,7 @@
       <el-form-item label="用途" prop="bookType">
         <!--bookType 2-租车、1-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
         <el-select class="filter-item" v-model="form.bookType" placeholder="请选择用途">
-          <el-option label="租车" value="1"></el-option>
+          <!-- <el-option label="租车" value="1"></el-option> -->
           <el-option label="维修" value="3"></el-option>
           <el-option label="展览" value="4"></el-option>
           <el-option label="旅游" value="5"></el-option>
@@ -275,8 +277,8 @@
             }
             let params = {
               vehicleId:this.currentItem.item.id,
-              bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh:mm:ss"),//预定开始时间
-              bookEndDate: formatDate(this.form.times[1], "yyyy-MM-dd hh:mm:ss"),//预定结束时间
+              bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh") + ":00:00",//预定开始时间
+              bookEndDate: formatDate(this.form.times[1], "yyyy-MM-dd hh") + ":00:00",//预定结束时间
               retCompany: this.form.arrivalBranchCompanyId,//还车分公司
               bookType: this.form.bookType,//预定车辆用途类型
               vehicleUsername: this.form.vehicleUsername,//使用人姓名
@@ -302,5 +304,4 @@
 
     }
   }
-</script>
-
+</script>
\ No newline at end of file

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -53,8 +53,8 @@
       </el-table-column>
       <el-table-column align="center" label="操作" width="150" fixed="right">
         <template scope="scope">
-          <el-button size="small"  class="el-button el-button--text el-button--small" @click="toShowDialog(scope.row)" v-if="scope.row.bookType !=2 && scope.row.bookType !=3">详情</el-button>
-          <el-button size="small"  class="el-button el-button--text el-button--small" @click="getLogInfo(scope.row)">重新安排</el-button>
+          <el-button size="small" class="el-button el-button--text el-button--small" @click="toShowDialog(scope.row)" v-if="scope.row.bookType !=2 && scope.row.bookType !=3">详情</el-button>
+          <el-button size="small"  class="el-button el-button--text el-button--small" @click="getLogInfo(scope.row)" v-if="vehicleRecords_bookPlan&&scope.row.status==2&&scope.row.vehicleDepartureLogVo==undefined">重新安排</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -181,9 +181,11 @@
           }
         },
         vehicleSchedulManage_btn_add_plan:false,
+        vehicleRecords_bookPlan:false,
       }
     },
     created() {
+      this.vehicleRecords_bookPlan = this.elements['vehicleRecords:bookPlan'];
       this.vehicleSchedulManage_btn_add_plan = this.elements['vehicleSchedulManage:btn_add_plan'];
     },
     computed: {

src/views/vehicleType/vehicleTypeLabel.vue

@@ -12,7 +12,7 @@
       <el-table-column type="expand">
         <template scope="scope">
           <el-form label-position="left" inline class="demo-table-expand">
-            <el-form-item label="二级分类名称">
+            <el-form-item label="二级分类名称" style="margin-right: 100px;">
               <span  v-for="item,index in scope.row.children" style="margin-right: 30px;"
                      :key="item.id">{{index+1}}、{{item.name}}</span>
             </el-form-item>