修改车辆

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -3,8 +3,8 @@
     <div class="filter-container">
       <el-form>
         <el-row>
-          <el-col :span="4">
-            <el-form-item label="日期">
+          <el-col :span="8">
+            <el-form-item>
               <el-date-picker
                 v-model="listQuery.time"
                 type="date"
@@ -15,13 +15,13 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item  label="车牌号">
+          <el-col :span="8">
+            <el-form-item >
               <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
                         v-model="listQuery.numberPlate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="8">
             <el-form-item>
               <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
             </el-form-item>

src/views/vehicle/vehicleInfo/index.vue

@@ -1585,6 +1585,9 @@
         let listQueryTemp = this.fillDateRange2Object(this.listQuery, 'mRange', 'mRangeDateStart', 'mRangeDateEnd');
         listQueryTemp = this.fillDateRange2Object(listQueryTemp, 'aVRange', 'aVRangeDateStart', 'aVRangeDateEnd');
         listQueryTemp = this.fillDateRange2Object(listQueryTemp, 'insuranceDateRange', 'insuranceDateRangeStart', 'insuranceDateRangeEnd');
+        if(!this.state1){
+          listQueryTemp.subordinateBranch = undefined;
+        }
         page(listQueryTemp).then(response => {
           let totalCountRs = undefined;
           let listRs = undefined;