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

src/components/Hotel/roomReservationsDetails.vue

@@ -118,7 +118,7 @@
                   <tr>
                     <td width="70" style="text-align:center;" colspan="2">
                       <span style="color:red">{{subItem.NewHotelName}}</span>
-                      <el-popover placement="right" width="500" trigger="click" v-model="subItem.isShowPop">
+                      <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
                         <comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList" :UseDate="item.UseTimeStr">
                         </comCheckHotel>
                         <el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"

src/components/SalesModule/productQuery.vue

@@ -712,7 +712,6 @@
                           <th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
                           <th style="width:150px;">更换酒店</th>
                           <th style="width:100px;">状态</th>
-
                         </tr>
                         <template v-for="subItem in item.HotelOrderListReports">
                           <tr v-for="(childItem,childIndex) in subItem.SubList">

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -498,6 +498,7 @@
                           <th style="width:150px;">更换酒店</th>
                           <th style="width:100px;">状态</th>
                           <th style="width:150px;">使用数量/价格</th>
+                          <th style="width:100px;">付款方式</th>
                           <th style="width:120px">占房时间</th>
                         </tr>
                         <template v-for="subItem in item.HotelOrderListReports">
@@ -532,9 +533,12 @@
                             <td>
                               <a v-if="(childItem.OPState==1|| childItem.OPState==2 || childItem.DMCState==1 )">
                                 {{childItem.UseCount>0? childItem.UseCount+" 间" :""}}
-                                {{childItem.CostPrice!=0?" 价格:"+childItem.CostPrice:""}}
+                                {{childItem.CostPriceNew>0?" 价格:"+childItem.CostPriceNew:(childItem.CostPrice!=0?" 价格:"+childItem.CostPrice:"")}}
                               </a>
                             </td>
+                            <td>
+                               {{childItem.PayTypeStr}}
+                            </td>
                             <td>
                               <template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)">
                                 {{childItem.CreateDateStr}}</template>

src/components/commonPage/comCheckHotel.vue

@@ -53,13 +53,20 @@
     <div class="Ck_hotelInfo">
       <span style="color:red">{{UseDate}}</span> 酒店库存信息
     </div>
-    <div class="cm_hotelTitle">
-      地区筛选：
-      <el-select filterable v-model="ProvinceId" @change="getCheckHotel()" :placeholder="$t('pub.pleaseSel')">
-        <el-option label="不限" :value='0'></el-option>
-        <el-option v-for="item in ProvinceList" :label='item.Name' :value='item.ID' :key='item.ID'>
-        </el-option>
-      </el-select>
+    <div class="cm_hotelTitle clearfix">
+      <div style="float:left;">
+        地区筛选:
+        <el-select filterable v-model="qMsg.ProvinceId" class="w120" :placeholder="$t('pub.pleaseSel')">
+          <el-option label="不限" :value='0'></el-option>
+          <el-option v-for="item in ProvinceList" :label='item.Name' :value='item.ID' :key='item.ID'>
+          </el-option>
+        </el-select>
+      </div>
+      <div style="float:left;margin-left:15px;">
+        酒店名称:
+        <el-input type="text" v-model="qMsg.Name" class="w120" @keyup.native.enter="getCheckHotel()" placeholder="请输入关键字"></el-input>
+        <input type="button" class="normalBtn" value="查询" @click="getCheckHotel()" />
+      </div>
     </div>
     <div>
       <el-tabs type="border-card" v-loading="loading" v-if="IsShow" >
@@ -85,7 +92,10 @@
         loading:false,
         dataList: [],
         ProvinceList: [],
-        ProvinceId: 0, //选择个省份编号
+        qMsg:{
+           ProvinceId: 0, //选择个省份编号
+           Name:"",//酒店名称
+        },
         IsShow:false,
         ckedHotel:{}
       };
@@ -101,7 +111,8 @@
           IsMoreThanZero: 0,
           Country: "651",
           IsAllHotel: 1,
-          Province: this.ProvinceId,
+          Province: this.qMsg.ProvinceId,
+          Name:this.qMsg.Name,
           sDate: this.UseDate
         }, res => {
           this.loading=false;