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

src/components/SalesVisa/VisaProduct.vue

@@ -291,8 +291,8 @@
         </li>
         <li>
           <button class="hollowFixedBtn" @click="getList()">查询</button>
-          <button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button>
-          <button class="normalBtn" v-show="buttonshow" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加(新)</button>
+          <!-- <button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button> -->
+          <button class="normalBtn" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加</button>
         </li>
       </ul>
     </div>
@@ -395,7 +395,7 @@
         </td>
         <td class="groupTourOrderIcon">
           <el-button-group>
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="修改"
@@ -408,15 +408,15 @@
                 icon="iconfont icon-img_bianji_small"
                 @click="getDetail(item)"
               ></el-button>
-            </el-tooltip>
+            </el-tooltip> -->
             <el-tooltip
               class="item"
               effect="dark"
-              content="修改(新)"
+              content="修改"
               placement="top-start"
               v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
             >
-              <el-button v-show="buttonshow"
+              <el-button
                 type="primary"
                 style="background:#409EFF; border-color:#409EFF"
                 icon="iconfont icon-img_bianji_small"
@@ -665,15 +665,15 @@ export default {
       addShow: false,
       currentPage: 1,
       VisaManagementList: [],
-      buttonshow:false,
+      // buttonshow:false,
       Type:0,
     };
   },
   created(){
-    let locationName = window.location.hostname;
-    if (locationName.indexOf('viitto') !== -1 || locationName.indexOf('www') !== -1){
-      this.buttonshow=true;
-    }
+    // let locationName = window.location.hostname;
+    // if (locationName.indexOf('viitto') !== -1 || locationName.indexOf('www') !== -1){
+    //   this.buttonshow=true;
+    // }
     
   },
   methods: {

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

@@ -55,14 +55,14 @@
     </div>
     <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:20px;">
+      <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()" />