bug

src/views/order/modal/tourOrderDetailModal.vue

@@ -66,13 +66,11 @@
         <div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">出游人信息 成人{{form.orderTourDetail.adultNum}}人  儿童{{form.orderTourDetail.childNum}}人</span></div>
         <table class="orderDetail">
           <tr><th>姓名</th><th>电话</th><th>身份证号</th></tr>
-          <template v-if="form.orderTourDetail.userVoList.length>0">
             <tr  v-for="(item,index) in form.orderTourDetail.userVoList " :key="index">
-              <td>{{item.realname}}</td>
-              <td>{{item.username}}</td>
-              <td>{{item.idNumber}}</td>
+              <td v-if="item">{{item.realname}}</td>
+              <td v-if="item">{{item.username}}</td>
+              <td v-if="item">{{item.idNumber}}</td>
             </tr>
-          </template>
         </table>
       </div>
     </el-form>
@@ -229,10 +227,11 @@
           } else {
             this.$notify({
               title: '失败',
-              message: '操作失败！',
+              message: res.message,
               type: 'error',
               duration: 2000
             });
+            this.$emit("tourOrderDetailDialogEvent", false);
           }
         });
       }

src/views/order/tourOrderInfo/index.vue

@@ -330,6 +330,7 @@
 			getProvinceRegions(item) {
 								this.listQuery.zoneId = item
 								this.baranchQuery.zoneId = item
+								this.listQuery.startCompanyId = undefined;
 								getAllBranchCompanyByZoneId(this.baranchQuery)
 								.then(response => {
 								  this.allBranchCompany = response.data;

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -4,7 +4,7 @@
       <div class="filter-container" ref="filter-container">
         <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
           <el-row>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="车辆状态">
                 <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
                   <el-option :key="undefined" label="无" :value="undefined"></el-option>
@@ -12,31 +12,37 @@
                              :value="val.code"></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            </el-col> -->
               <el-form-item label="车牌">
                 <el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="所属地区" prop="zoneId">
                 <el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions">
                   <el-option :key="undefined" label="无" :value="undefined"></el-option>
                   <el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+              <el-form-item label="当前停放公司" prop="parkBranchCompanyId">
+                <el-autocomplete
+                  class="inline-input"
+                  v-model="listQuery.parkBranchCompanyName"
+                  :fetch-suggestions="querySearch"
+                  placeholder="请输入内容"
+                  @select="handleSelectPark"
+                ></el-autocomplete>
+              </el-form-item>
+               <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="所属分公司" prop="subordinateBranch">
                 <el-select class="filter-item" v-model="listQuery.subordinateBranch" placeholder="请选择" @change="getAllBranchCompanyChange">
                   <el-option :key="undefined" label="无" :value="undefined"></el-option>
                   <el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"> </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            </el-col> -->
+            <!-- <el-col :span="8">
               <el-form-item label="时间">
                 <el-date-picker
                   v-model="listQuery.startTime"
@@ -53,8 +59,8 @@
                   placeholder="选择日期"
                 ></el-date-picker>
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
+            </el-col> -->
+            <!-- <el-col :span="6">
               <el-form-item label="当前停放公司" prop="parkBranchCompanyId">
                 <el-autocomplete
                   class="inline-input"
@@ -64,10 +70,9 @@
                   @select="handleSelectPark"
                 ></el-autocomplete>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-form>
-        <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
       </div>
       <el-form label-width="100px" v-if="countTJ">
       <el-row :gutter="20">
@@ -794,6 +799,9 @@
       },
       handleFilter() {
         this.listQuery.page = 1;
+        if(this.listQuery.numberPlate==''){
+        this.listQuery.numberPlate = null;
+        }
         this.$refs.queryForm.validate(valid => {
           if (valid) {
             this.getList();

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -48,10 +48,15 @@
       <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="3"></el-option>
           <el-option label="展览" value="4"></el-option>
-          <el-option label="房车游" value="5"></el-option>
+          <el-option label="旅游" value="5"></el-option>
           <el-option label="保养" value="6"></el-option>
           <el-option label="禁用" value="8"></el-option>
+          <el-option label="客户用车" value="9"></el-option>
+          <el-option label="其他" value="10"></el-option>
+
 
           <!--<el-option v-for="item  in getAllUseType() " :key="item.code" :label="item.val"-->
                      <!--:value="item.code"></el-option>-->

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -251,7 +251,8 @@
       toShowDialog( cc, iitem){
         let item = {};
         let ii = {
-          vehicleBookRecord: cc
+          vehicleBookRecord: cc,
+          bookType:cc.bookType
         };
 //      <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
         item.numberPlate = this.listQuery.numberPlate;//车牌号

src/views/vehicle/vehicleWarningMsg/index.vue

@@ -15,6 +15,13 @@
                            :value="val.code"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="颜色预警">
+              <el-select class="filter-item" v-model="listQuery.colorType" placeholder="请选择颜色预警">
+                <el-option :key="undefined" label="无" :value="undefined"></el-option>
+                <el-option v-for="(val, key, index) in vehicleWarningMsgColorType " :key="val.code" :label="val.val"
+                           :value="val.code"></el-option>
+              </el-select>
+            </el-form-item>
             <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
             <el-button class="filter-item" v-if="vehicleWarningMsg_btn_add" style="margin-left: 10px;"
                        @click="handleCreate"
@@ -45,6 +52,13 @@
         </template>
       </el-table-column>
 
+      <el-table-column width="150" align="center" label="颜色预警">
+        <template scope="scope">
+          <span v-if="scope.row.colorType==1">红色预警</span>
+          <span v-if="scope.row.colorType==2">蓝色预警</span>
+          <span v-if="scope.row.colorType==3">黄色预警</span>
+        </template>
+      </el-table-column>
 
       <el-table-column width="150" align="center" label="预警消息类型">
         <template scope="scope">
@@ -137,6 +151,18 @@
     },
     data() {
       return {
+        vehicleWarningMsgColorType:[
+          {
+            code:1,
+            val:'红色预警'
+          },{
+            code:2,
+            val:'蓝色预警'
+          },{
+            code:3,
+            val:'黄色预警'
+          }
+        ],
         upkeepRow: {},//保养数据
         form: {
           msg: undefined,
@@ -186,7 +212,8 @@
           limit: 10,
           numberPlate: undefined,
           vehicleCode: undefined,
-          type: undefined
+          type: undefined,
+          colorType:undefined,
         },
         allCompanies: {},
         allCompaniesArr: [],
@@ -270,6 +297,7 @@
        * */
       upkeepDialogEvent(e){
         this.upkeepDialogVisible = e;
+        this.getList();
       },
       handleCreate() {
         this.resetTemp();