首页

src/views/index/index.vue

@@ -548,45 +548,68 @@
 //        <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
         if(!ii.bg){
           //空白-可安排用车
-//          this.anpai = true;
-//          let arr = item.vehicleModel.keyword.split(",");
-//          item.vehicleModel.keyword = arr.join(" | ");
-//          this.currentItem = {item: item, iitem: iitem, ii: ii};
+          this.anpai = true;
+          let arr = item.vehicleModel.keyword.split(",");
+          item.vehicleModel.keyword = arr.join(" | ");
+          this.currentItem = {item: item, iitem: iitem, ii: ii};
         } else {
-          if(ii.bookType == 6){
-            //保养
-            this.baoyang = true;
-            this.currentItem = {item: item, iitem: iitem, ii: ii};
-          } else if(ii.bookType == 3){
-            //维修
-            this.zhanlan = true;
-            this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'};
-          } else if(ii.bookType == 4){
-            //展览
-            this.zhanlan = true;
-            this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
-          } else if(ii.bookType == 7){
-            this.zhanlan = true;
-            this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'};
-          } else if(ii.bookType == 1){
-            this.getOneVechi(ii.vehicleBookRecord.orderNo);
-//            this.rentOrder = true;
-//            this.rentOrderInfo = {};
-            this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
-          } else if(ii.bookType == 9){
-            this.zhanlan = true;
-            this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
-          } else if(ii.bookType == 5) {
-            //房车游订单详情
-            this.tourRow = {no: ii.vehicleBookRecord.orderNo};
-            this.tourDialogVisible = true
-          } else if(ii.bookType == 8) {
-            //禁用
-            this.jinyong = true;
-            this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"};
-          } else if(ii.bookType == 10) {
-            this.zhanlan = true;
-            this.currentItem = {item: item, iitem: iitem, ii: ii,title: "其他",upkeepName:'其他'};
+          if(ii.vehicleBookRecord.status == 1){//审核中的显示预约弹框
+              this.zhanlan = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车"};
+          }else{
+            if(ii.bookType == 6){
+              //保养
+              this.baoyang = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii};
+            } else if(ii.bookType == 3){
+              //维修
+              this.zhanlan = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'};
+            } else if(ii.bookType == 4){
+              //展览
+              this.zhanlan = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
+            } else if(ii.bookType == 7){
+              this.zhanlan = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'};
+            } else if(ii.bookType == 1){
+              if(!ii.vehicleBookRecord.orderNo){
+                  this.$notify({
+                    title: '警告',
+                    message: '订单号缺失',
+                    type: 'warning',
+                    duration: 2000
+                  });
+                  return false;
+                } else{
+                  this.getOneVechi(ii.vehicleBookRecord.orderNo);
+                }
+                this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
+            } else if(ii.bookType == 9){
+              this.zhanlan = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
+            } else if(ii.bookType == 5) {
+              //房车游订单详情
+              if(!ii.vehicleBookRecord.orderNo){
+                this.$notify({
+                  title: '警告',
+                  message: '订单号缺失',
+                  type: 'warning',
+                  duration: 2000
+                });
+                return false;
+              }else{
+                this.tourRow = {no: ii.vehicleBookRecord.orderNo};
+                this.tourDialogVisible = true
+              }
+            } else if(ii.bookType == 8) {
+              //禁用
+              this.jinyong = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"};
+            } else if(ii.bookType == 10) {
+              this.zhanlan = true;
+              this.currentItem = {item: item, iitem: iitem, ii: ii,title: "其他",upkeepName:'其他'};
+            }
           }
         }
       },
@@ -915,13 +938,18 @@
             item.vehicleBookRecord.map(function (iitem) {
               if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
 //                <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
-                if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间
+                if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间
                   pp.timeStr = h;
                 }
-                pp.bg = "bg-"+ iitem.bookType;
+                if(iitem.status == 1){
+                    //审核中
+                  pp.bg = "bg-7";
+                } else {
+                  pp.bg = "bg-"+ iitem.bookType;
+                }
                 pp.vehicleBookRecord = iitem;
                 pp.bookType = iitem.bookType;
-                if(iitem.bookEndDate == tt){
+                if(iitem.bookEndDate == tt && iitem.status == 2){
                   if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
                     pp.timeEtr = h;
                   }
@@ -963,29 +991,34 @@
               pp.h = h;
               item.vehicleBookRecord.map(function (iitem) {
                 if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
-  //                <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
-                  if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间
-                    pp.timeStr = h;
-                  }
+//                <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
+                if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间
+                  pp.timeStr = h;
+                }
+                if(iitem.status == 1){
+                  //审核中
+                  pp.bg = "bg-7";
+                } else {
                   pp.bg = "bg-"+ iitem.bookType;
-                  pp.vehicleBookRecord = iitem;
-                  pp.bookType = iitem.bookType;
-                  if(iitem.bookEndDate == tt){
-                    if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
-                      pp.timeEtr = h;
-                      if(h == "00"){
-                        let cc = new Date(tt);
-                        console.log(cc);
-                        let te = cc.getTime()-24*60*60;
-                        endTime = timestamp2Date(te).substring(0, 13) +":00:00";
-                        console.log(endTime);
-                      }
+                }
+                pp.vehicleBookRecord = iitem;
+                pp.bookType = iitem.bookType;
+                if(iitem.bookEndDate == tt  && iitem.status == 2){
+                  if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
+                    pp.timeEtr = h;
+                    if(h == "00"){
+                      let cc = new Date(tt);
+                      console.log(cc);
+                      let te = cc.getTime()-24*60*60;
+                      endTime = timestamp2Date(te).substring(0, 13) +":00:00";
+                      console.log(endTime);
                     }
-                    pp.bg = "";
                   }
+                  pp.bg = "";
                 }
-              });
-              children.push(pp);
+              }
+            });
+            children.push(pp);
             }
             ttemp.children = children
           });

src/views/index/vehicleExhibitionModal.vue

@@ -21,7 +21,7 @@
         <span>{{currentItem.ii.vehicleBookRecord.bookStartDate}}~{{currentItem.ii.vehicleBookRecord.bookEndDate}}</span>
       </el-form-item>
       <el-form-item label="用途:">
-        <span>{{currentItem.upkeepName}}</span>
+        <span>{{currentItem.ii.bookType==1?"租房车":currentItem.ii.bookType==3?"维修":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==9?"客户用车":currentItem.ii.bookType==10?"其他":currentItem.ii.bookType==4?"展览":currentItem.ii.bookType==5?"旅游":currentItem.ii.bookType==6?"保养":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==2?"分公司使用":'未知用途'}}</span>
       </el-form-item>
       <el-form-item label="申请说明:">
         <span>{{currentItem.ii.vehicleBookRecord.remark}}</span>

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -527,8 +527,18 @@
               this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
             } else if(ii.bookType == 5) {
               //房车游订单详情
-//              this.tourRow = {no: ii.vehicleBookRecord.orderNo};
-//              this.tourDialogVisible = true
+              if(!ii.vehicleBookRecord.orderNo){
+                this.$notify({
+                  title: '警告',
+                  message: '订单号缺失',
+                  type: 'warning',
+                  duration: 2000
+                });
+                return false;
+              }else{
+                this.tourRow = {no: ii.vehicleBookRecord.orderNo};
+                this.tourDialogVisible = true
+              }
             } else if(ii.bookType == 8) {
               //禁用
               this.jinyong = true;

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -296,8 +296,18 @@
             this.currentItem = {item: item, ii: ii,title: "客户用车",upkeepName:'客户用车'};
           } else if(cc.bookType == 5) {
             //房车游订单详情
-//            this.tourRow = {no: cc.vehicleBookRecord.orderNo};
-//            this.tourDialogVisible = true
+            if(!ii.vehicleBookRecord.orderNo){
+              this.$notify({
+                title: '警告',
+                message: '订单号缺失',
+                type: 'warning',
+                duration: 2000
+              });
+              return false;
+            }else{
+              this.tourRow = {no: ii.vehicleBookRecord.orderNo};
+              this.tourDialogVisible = true
+            }
           } else if(cc.bookType == 8) {
             //禁用
             this.jinyong = true;