Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/HotelTotalStock.vue

@@ -337,7 +337,7 @@
           <span>
             <em>酒店</em>
             <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
-              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
               <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
@@ -384,7 +384,7 @@
   export default {
     data() {
       return {
-        HotelId: 0,
+        DefaultSelectValue:0,
         //酒店列表
         HotelList: [],
         msg: {
@@ -479,7 +479,7 @@
     },
 
     mounted() {
-      this.msg.HotelId = this.$route.query.HotelId === undefined ? '0' : this.$route.query.HotelId
+      this.msg.HotelId = this.$route.query.HotelId === undefined ? 0 : this.$route.query.HotelId
       this.getList();
       this.GetHotelList();
     },