预约中

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -487,42 +487,45 @@
           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);
+        } else {debugger
+          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 == 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:'其他'};
+              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:'其他'};
+            }
           }
+
         }
       },
       /**
@@ -902,7 +905,12 @@
                   if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间
                     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){

src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue

@@ -21,7 +21,8 @@
         <span>{{currentItem.ii.vehicleBookRecord.bookStartDate}}~{{currentItem.ii.vehicleBookRecord.bookEndDate}}</span>
       </el-form-item>
       <el-form-item label="用途:">
-        <span>{{currentItem.upkeepName}}</span>
+        <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
+        <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>