bug

src/views/vehicle/bookRecord/index.vue

@@ -206,8 +206,9 @@
           <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>
           </template>
-          <el-button v-if="bookRecord_btn_unbook&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small"  style="color: red;" @click="handleUnbook(scope.row)">取消预定
-          </el-button>
+          <template v-if="scope.row.vehicleDepartureLogVo==undefined">
+            <el-button v-if="bookRecord_btn_unbook&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small"  style="color: red;" @click="handleUnbook(scope.row)">取消预定</el-button>
+          </template>
         </template>
       </el-table-column>
     </el-table>
@@ -642,11 +643,17 @@
             message: '请输入验车人',
             trigger: 'blur'
           },
-          checkManTel:{
-            required: true,
-            message: '请输入验车人联系方式',
-            trigger: 'blur'
-          },
+          checkManTel:[
+            {
+              required: true,
+              message: '请输入验车人联系方式',
+              trigger: 'blur'
+            },
+            {
+              pattern: /^1[3456789]\d{9}$/,
+              message: '请输入正确的手机号'
+            }
+          ],
           mileage:{
             type:"number",
             required: true,
@@ -693,11 +700,17 @@
             message: '请输入收车人',
             trigger: 'blur'
           },
-          recycleManTel:{
-            required: true,
-            message: '请输入收车人联系方式',
-            trigger: 'blur'
-          },
+          recycleManTel:[
+            {
+              required: true,
+              message: '请输入收车人联系方式',
+              trigger: 'blur'
+            },
+            {
+              pattern: /^1[3456789]\d{9}$/,
+              message: '请输入正确的手机号'
+            }
+          ],
           mileage:{
             type:"number",
             required: true,
@@ -1156,6 +1169,15 @@
         const set = this.$refs;
         set[formName].validate(valid => {
           if (valid) {
+            if(Number(this.departureForm.mileage)>999999){
+              this.$notify({
+                title: '警告',
+                message: '公里数不能大于999999',
+                type: 'warning',
+                duration: 2000
+              });
+              return false;
+            }
             var arr = [];
             this.departurePicList.map(function(item){
               arr.push(item.url);
@@ -1408,6 +1430,15 @@
         const set = this.$refs;
         set[formName].validate(valid => {
           if (valid) {
+            if(Number(this.arrivalForm.mileage)>999999){
+              this.$notify({
+                title: '警告',
+                message: '公里数不能大于999999',
+                type: 'warning',
+                duration: 2000
+              });
+              return false;
+            }
             var arr = [];
             this.arrivalPicList.map(function(item){
               arr.push(item.url);

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -259,7 +259,7 @@
        * */
       handelOk(formName){
         const set = this.$refs;
-        console.log(this.form.times);
+        // console.log(formatDate(this.form.times[0], "yyyy-MM-dd hh:mm:ss"));
         set[formName].validate(valid => {
           if (valid) {
             if(this.form.bookType==6){
@@ -275,8 +275,8 @@
             }
             let params = {
               vehicleId:this.currentItem.item.id,
-              bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh")+":00:00",//预定开始时间
-              bookEndDate: formatDate(this.form.times[1], "yyyy-MM-dd hh")+":00:00",//预定结束时间
+              bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh:mm:ss"),//预定开始时间
+              bookEndDate: formatDate(this.form.times[1], "yyyy-MM-dd hh:mm:ss"),//预定结束时间
               retCompany: this.form.arrivalBranchCompanyId,//还车分公司
               bookType: this.form.bookType,//预定车辆用途类型
               vehicleUsername: this.form.vehicleUsername,//使用人姓名