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

src/components/Hotel/roomReservations.vue

@@ -39,7 +39,6 @@
           <th width="120">占床/不占床</th>
           <th width="80">实际用房数</th>
           <th></th>
-          <!-- <th v-for='item in thLengthTitle'>{{item}}</th> -->
           <th></th>
           <th>备注</th>
           <th>操作</th>
@@ -140,8 +139,7 @@
                     <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
                     <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
                       class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
-                      <span v-if='childItem.HotelOrderState==0'
-                        class="colorE95252">（待定）</span>{{childItem.NewHotelName}}
+                      <span  class="colorE95252">{{childItem.HotelOrderState==1?"[OK]":"[暂定]"}}</span>{{childItem.NewHotelName}}
                     </p>
                     <p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
                     <p class="pDateStyle">

src/components/ShoppingStore/ShoppingStore.vue

@@ -1184,7 +1184,7 @@
               that.tabLoading = false;
               if (res.data.resultCode == 1) {
                 that.fillShow = false;
-                that.Success("导入成功");
+                that.Success("导入成功，用时【"+(res.data.data/1000)+"秒】");
                 that.getList();
               } else {
                 that.Error(res.data.message);