Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/tradePavilion/VehicleManagement.vue

@@ -22,7 +22,7 @@
       <div>
         <div class="searchInput" style="width:250px">
           <el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
-            style="display:inline-block;width:225px;height:30px" placeholder="地铁站名称" v-model="msg.MetroName"
+            style="display:inline-block;width:225px;height:30px" placeholder="载体名称" v-model="msg.CarrierName"
             size="small" clearable>
           </el-input>
           <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
@@ -30,15 +30,15 @@
         </div>
         <div class="searchInput" style="width:250px">
           <el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
-            style="display:inline-block;width:225px;height:30px" placeholder="载体名称" v-model="msg.CarrierName"
-            size="small" clearable>
+            style="display:inline-block;width:225px;height:30px" placeholder="开发商" v-model="msg.Developers" size="small"
+            clearable>
           </el-input>
           <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <div class="searchInput" style="width:250px">
           <el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
-            style="display:inline-block;width:225px;height:30px" placeholder="地铁线路" v-model="msg.MetroNum" size="small"
+            style="display:inline-block;width:225px;height:30px" @keyup.native="checkInteger(msg,'MetroNum')" placeholder="地铁线路" v-model="msg.MetroNum" size="small"
             clearable>
           </el-input>
           <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
@@ -46,14 +46,14 @@
         </div>
         <div class="searchInput" style="width:250px">
           <el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
-            style="display:inline-block;width:225px;height:30px" placeholder="开发商" v-model="msg.Developers" size="small"
-            clearable>
+            style="display:inline-block;width:225px;height:30px" placeholder="地铁站名称" v-model="msg.MetroName"
+            size="small" clearable>
           </el-input>
           <span @click="msg.pageIndex=1,getList()" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <el-date-picker class="indataPicker" type="daterange" v-model="dateStr" range-separator="至"
-          start-placeholder="开始日期" end-placeholder="结束日期" size="small" @change="getList" value-format="yyyy-MM-dd">
+          start-placeholder="开业日期" end-placeholder="开业日期" size="small" @change="getList" value-format="yyyy-MM-dd">
         </el-date-picker>
       </div>
       <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">