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

src/components/Hotel/HotelProductManage.vue

@@ -144,7 +144,7 @@
   <div class="flexOne hotelproduct">
     <div class="query-box">
       <ul>
-        <li>
+        <li style="display:none;">
           <span>
             <em>{{$t('hotel.hotel_roomName')}}</em>
             <el-select filterable v-model='msg.HotelProductType' :placeholder="$t('pub.pleaseSel')">
@@ -153,6 +153,12 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>{{$t('hotel.hotel_roomName')}}</em>
+            <el-input class="w300" type="text" v-model="msg.Name" maxlength="20"></el-input>
+          </span>
+        </li>
         <li>
           <button class="hollowFixedBtn" type="success"
             @click="resetPageIndex(),initData()">{{$t('pub.searchBtn')}}</button>
@@ -164,7 +170,7 @@
     <el-dialog custom-class='addGroup' :visible.sync="outerVisible" :title="dialogTitle" center
       :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg">
-        <el-form-item :label="$t('hotel.hotel_resource')" prop="Hotel_ID">
+        <el-form-item label="酒店名称" prop="Hotel_ID">
           <el-select :placeholder="$t('pub.pleaseSel')" filterable class="w300" disabled clearable
             v-model="addMsg.Hotel_ID">
             <el-option v-for="item in HotelName" :key="item.ID" :label="item.Name" :value="item.ID">
@@ -174,12 +180,6 @@
         <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-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 :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,6 +197,7 @@
     <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>名称</th>
         <th>{{$t('scen.sc_bjts')}}</th>
         <th>{{$t('scen.sc_dj')}}</th>
         <th>{{$t('scen.sc_gj')}}</th>
@@ -204,6 +205,9 @@
         <th>{{$t('hotel.table_operat')}}</th>
       </tr>
       <tr v-for="(item,index) in pageData" :key="item.subCode">
+        <td>
+          {{item.Name}}
+        </td>
         <td class="DaysInfo">
           <span><i class="iconfont icon-kaoqintongji"></i>{{item.Days}}{{$t('hotel.hotel_day')}}</span>
         </td>