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

# Conflicts:
#	src/plug/index.js

index.html

@@ -13,7 +13,7 @@
     <script type="text/javascript" src="static/MarkerClusterer.js"></script>
     <script type="text/javascript" src="static/CurveLine.min.js"></script>
     <!-- <script type="text/javascript" src="http://activity.oytour.com/google.js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> -->
-    <script type="text/javascript">
+    <!-- <script type="text/javascript">
       window.google = {
             maps: {}
         };
@@ -29,8 +29,8 @@
                 eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
             }
         });
-    </script>
-    <script type="text/javascript" src="http://www.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&libraries=geometry&language=zh_CN"></script>
+    </script> -->
+    <!-- <script type="text/javascript" src="http://www.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&libraries=geometry&language=zh_CN"></script> -->
     <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=OV7BZ-ZT3HP-6W3DE-LKHM3-RSYRV-ULFZV"></script>
     <title></title>
   </head>

src/assets/css/cssReset.css

@@ -905,7 +905,7 @@ input:-webkit-autofill {
 
 .el-dialog__body {
     padding-bottom: 0;
-    max-height: 600px;
+    max-height: 675px;
     overflow-y: auto;
 }
 

src/components/Hotel/GnHotelManagement.vue

@@ -327,7 +327,7 @@
             {{item.DieLine}}{{$t('hotel.hotel_day')}}
           </div>
         </div>
-        <div class="Address">
+        <div class="Address" style="margin-top:10px;">
           <div v-show="item.Address">
             <i class="iconfont icon-img_dz"></i>
             <el-tooltip class="item" effect="dark" :content="item.Address" placement="top-start">
@@ -343,13 +343,14 @@
           </div>
         </el-tooltip>
         <div class="btnList">
+          <div style="display:flex;justify-content:center;">
             <button @click="goSubInfo('GnHotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>
-          <button @click="CopyHotel(item.ID)" class="hotelBtnMan" v-if="userInfo.RB_Group_id==QjGroupId()">复制</button>
             <button @click="goproduct('HotelProductManage',item)" class="hotelBtnMan"
               v-if="userInfo.RB_Group_id!=QjGroupId()">房型</button>
             <br />
-          <button v-if="IsHotelPriceStock==1" style="width:80px;margin-top:10px;"
-            @click="goUrl('HotelProductManage2',item)" class="hotelBtnMan">{{$t('ground.baojiayukucun')}}</button>
+            <button v-if="IsHotelPriceStock==1" style="width:80px;margin-left:10px;"
+              @click="goUrl('HotelProductManage',item)" class="hotelBtnMan">{{$t('ground.baojiayukucun')}}</button>
+          </div>
         </div>
       </div>
     </div>
@@ -404,27 +405,6 @@
       };
     },
     methods: {
-      CopyHotel(Id) {
-        var that = this;
-        that.Confirm('是否要复制此酒店?', function () {
-          var msg = {
-            Id: Id
-          };
-          that.apipost(
-            "hotel_post_CopyHotelService",
-            msg,
-            res => {
-              if (res.data.resultCode == 1) {
-                that.Success(res.data.message);
-                that.selectResource();
-              } else {
-                that.Error(res.data.message);
-              }
-            },
-            null
-          );
-        });
-      },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.selectResource();

src/components/Hotel/HotelPrice.vue

@@ -451,7 +451,7 @@
           </div>
           <div class="resDiv">
             <el-form-item :label="$t('hotel.hotel_Currency')">
-              <el-select placeholder="$t('ground.qingxuanbizhong')" filterable class='multiple_input w210' @change="getCurrentRate(addMsg.CurrencyId)"
+              <el-select :placeholder="$t('ground.qingxuanbizhong')" filterable class='multiple_input w210' @change="getCurrentRate(addMsg.CurrencyId)"
                 v-model="addMsg.CurrencyId">
                 <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
                 <el-option v-for="item in allCurrencyList" :key="item.ID" :label="item.Name" :value="item.ID">
@@ -475,8 +475,8 @@
         </div>
         <button type="success" class="subPrice" :class="{'comDisableBtn':isDisable==true,'normalBtn':isDisable==false}"
           :disabled='isDisable' @click="isDeleteNote=true,submitForm('addMsg')">{{comBtnText}}</button>
-        <button type="success" class="hollowFixedBtn" @click="goBack" v-if="updateDay=='-1'">{{$t('ground.returnBack')}}</button>
-        <button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')" v-else>{{$t('ground.cancelBtn')}}</button>
+        <button type="success" class="hollowFixedBtn" @click="goBack" v-if="updateDay=='-1'">{{$t('pub.returnBack')}}</button>
+        <button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')" v-else>{{$t('pub.cancelBtn')}}</button>
       </div>
     </div>
   </div>

src/components/Hotel/HotelProductManage.vue

@@ -174,12 +174,12 @@
         <el-form-item :label="$t('hotel.product_name')">
           <el-input class="w300" type="text" v-model="addMsg.Name" maxlength="20"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('hotel.product_type_name')" prop="HotelProductType" >
+        <!-- <el-form-item :label="$t('hotel.product_type_name')" prop="HotelProductType" >
           <el-select filterable v-model='addMsg.HotelProductType' :placeholder="$t('pub.pleaseSel')" class="w300">
             <el-option v-for='item in HotelProductTypeList' :label='item.Name' :value='item.Id' :key='item.Id'>
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="$t('hotel.table_servers')" prop="ServiceNumber">
           <el-input type="text" class="w300" v-model="addMsg.ServiceNumber"
             @keyup.native="checkInteger(addMsg,'ServiceNumber')"></el-input>
@@ -197,7 +197,6 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"
       style="border-collapse:separate;border-spacing:0px 10px;table-layout:fixed;">
       <tr>
-        <th>{{$t('hotel.hotel_roomName')}}</th>
         <th>{{$t('scen.sc_bjts')}}</th>
         <th>{{$t('scen.sc_dj')}}</th>
         <th>{{$t('scen.sc_gj')}}</th>
@@ -205,11 +204,6 @@
         <th>{{$t('hotel.table_operat')}}</th>
       </tr>
       <tr v-for="(item,index) in pageData" :key="item.subCode">
-        <td>
-          <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
-            <span class="roomName">{{item.Name}}</span>
-          </el-tooltip>
-        </td>
         <td class="DaysInfo">
           <span><i class="iconfont icon-kaoqintongji"></i>{{item.Days}}{{$t('hotel.hotel_day')}}</span>
         </td>

src/components/TravelManager/Lxy/css/index.css

+.head-title {
+    font-size: 14px;
+    color: #303133;
+    padding: 18px 20px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    background: #fff;
+}
+.content {
+    background: #fff;
+    margin-top: 10px;
+    padding: 20px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+.searchInput .el-input__inner {
+    border: none;
+    outline: none;
+    height: 30px!important;
+    line-height: 30px!important;
+}
+.el-input--suffix .el-input__inner {
+    padding-right: 30px;
+}
+span{
+    font-size: 13px;
+    font-weight: normal;
+}
+.searchInput {
+    line-height: normal;
+    display: inline-table;
+    width: 100%;
+    border-collapse: separate;
+    border-spacing: 0;
+    width: 250px;
+    margin-right: 20px;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+}
+.blue {
+    color: #409eff;
+}
+ .point {
+    cursor: pointer;
+}
\ No newline at end of file