优化

src/App.vue

@@ -74,5 +74,5 @@
     }
   /*}*/
   // .el-time-spinner__item{line-height: 16px !important;}
-  .el-scrollbar__wrap{margin-bottom: 0px !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/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/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
           },{

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

@@ -50,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>

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: {