修改

src/components/Hotel/GnHotelInfo.vue

@@ -102,6 +102,10 @@
                     </div>
                   </div>
                 </div>
+                <el-form-item label="地址说明">
+                  <el-input type="text" class="w300" v-model="addMsg.AddressDes" size="small">
+                  </el-input>
+                </el-form-item>
                 <el-form-item label="标签">
                   <el-tag :key="tag" v-for="(tag,index) in TagsList" style="margin-right:5px;" closable
                     :disable-transitions="false" @close="handleClose(tag,index)">
@@ -139,7 +143,7 @@
                 </div>
                 <div>
                   <el-tabs>
-                    <el-tab-pane v-for="(subItem,subIndex) in addMsg.InnerHotelImaList" :key="subIndex" :label="subItem.Label==''?'酒店图片':subItem.Label">
+                    <el-tab-pane v-for="(subItem,subIndex) in addMsg.InnerHotelImaList" :key="subIndex" :label="subItem.Label==''?'全部':subItem.Label">
                       <div class="InnerHotelDiv">
                         <div class="InnerHoImgDiv" v-for="(sItem,sIndex) in subItem.ImgList" :key="sIndex">
                           <img :src="sItem.Path" />
@@ -356,6 +360,7 @@
             DecorationTime: "", //装修时间
             Into: "", //酒店介绍
           },
+          AddressDes:'' //地址说明
         },
         //酒店图片
         HotelImgArr: [],

src/components/Hotel/GnHotelManagement.vue

@@ -291,7 +291,15 @@
       </el-table-column>
       <el-table-column prop="Name" label="酒店名称">
       </el-table-column>
-      <el-table-column prop="HotelRealName" label="真实姓名">
+      <el-table-column prop="Star" label="星级">
+        <template slot-scope="scope">
+          <span>{{scope.row.Star}}星</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="OpenPlatformList" label="开放平台">
+        <template slot-scope="scope">
+          <el-tag v-for="(item,index) in scope.row.OpenPlatformList" size="small" style="margin-right:5px;" :key="index">{{item.Name}}</el-tag>
+        </template>
       </el-table-column>
       <el-table-column prop="UpdateName" label="修改人">
       </el-table-column>
@@ -312,8 +320,8 @@
           <el-tooltip class="item" effect="dark" content="修改" placement="top">
             <el-button @click="goSubInfo('GnHotelInfo',scope.row.ID)" type="primary" icon="el-icon-edit" circle></el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="报价与库存" placement="top">
-            <el-button @click="goUrl('HotelProductManage',scope.row)" style="font-size:14px;" title="" type="primary" icon="iconfont icon-iconkaobei" circle></el-button>
+          <el-tooltip class="item" effect="dark" content="房型" placement="top">
+            <el-button @click="goUrl('HotelProductManage',scope.row)" style="font-size:12px;" type="primary" icon="iconfont icon-shouye1-copy" circle></el-button>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -321,73 +329,6 @@
     <el-pagination style="text-align:center" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
       layout="prev, pager, next" :total="msg.total">
     </el-pagination>
-
-    <!-- <div class="hotelResource clearfix" v-loading="loading">
-      <div class="resourceListMan" v-for="(item,index) in tableData" :key="index">
-        <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
-          <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
-          <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
-          <div class="resTypeList">
-            <span v-for="(items,index) in item.OpenPlatformList" :key="index"
-              :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}">{{items.Name}}</span>
-          </div>
-          <div class="delScien" @click.stop="isdelete(item.ID)">
-            <i class="iconfont icon-xingzhuang"></i>
-          </div>
-          <div class="starSu">
-            <div class="star" v-if="item.Star<8">
-              <i v-for="(items,index) in item.starArr" class="iconfont icon-star1" :key="index"></i>
-            </div>
-            <span v-if="item.Star==8" class="sushe">{{$t('restaurant.res_homeFacility')}}</span>
-            <span v-if="item.Star==9" class="sushe">{{$t('restaurant.res_SpringHotel')}}</span>
-          </div>
-        </div>
-        <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
-          <div class="hotelTitle">{{item.Name}}</div>
-        </el-tooltip>
-        <el-tooltip class="item" effect="dark" :content="item.HotelRealName" placement="top-start"
-          popper-class="max-w250">
-          <div class="hotelTitle fz12">{{$t('ground.zhenshimingcheng')}}: {{item.HotelRealName}}</div>
-        </el-tooltip>
-        <div class="brandList clearfix" style="display:none;">
-          <div class="brand">
-            <i class="iconfont honor icon-img_biaozhi"></i>
-            {{item.ChainBrand}}
-          </div>
-          <div class="dayNum">
-            <i class="iconfont dieline icon-img_shijian"></i>
-            {{item.DieLine}}{{$t('hotel.hotel_day')}}
-          </div>
-        </div>
-        <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">
-              <div class="AddressInner">{{item.Address}}</div>
-            </el-tooltip>
-          </div>
-        </div>
-        <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start">
-          <div style="padding-left:15px;padding-top:5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
-            <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
-            <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
-            {{item.UpdateTimeStr}}
-          </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="goproduct('HotelProductManage',item)" class="hotelBtnMan"
-              v-if="userInfo.RB_Group_id!=QjGroupId()">房型</button>
-            <br />
-            <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>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
-      :page-size="this.msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination> -->
   </div>
 </template>
 <script>

src/components/Hotel/HotelProductManage.vue

@@ -177,13 +177,39 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('hotel.product_name')">
+        <el-form-item label="名称">
           <el-input class="w300" type="text" v-model="addMsg.Name" maxlength="20"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('hotel.table_servers')" prop="ServiceNumber">
+        <el-form-item label="入住人数" prop="ServiceNumber">
           <el-input type="text" class="w300" v-model="addMsg.ServiceNumber"
             @keyup.native="checkInteger(addMsg,'ServiceNumber')"></el-input>
         </el-form-item>
+        <el-form-item label="早餐类型">
+          <el-select :placeholder="$t('pub.pleaseSel')" class="w300" v-model="addMsg.BreakfastType">
+            <el-option v-for="item in BreakfastList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="床型">
+          <el-select :placeholder="$t('pub.pleaseSel')" class="w300" v-model="addMsg.BedType">
+            <el-option v-for="item in BedTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="床型描述">
+          <el-input class="w300" type="textarea" v-model="addMsg.BedDesc" :rows="4" maxlength="200"></el-input>
+        </el-form-item>
+        <el-form-item label="是否有窗">
+          <el-switch v-model="addMsg.HasWindow" :active-value="1" :inactive-value="2">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="免费取消">
+          <el-switch v-model="addMsg.IsCancel" :active-value="2" :inactive-value="1">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="免费取消时间" v-if="addMsg.IsCancel==2">
+          <el-input class="w300" type="text" v-model="addMsg.CancelTime" maxlength="200"></el-input>
+        </el-form-item>
         <el-form-item :label="$t('hotel.hotel_produceDes')" prop="Description">
           <el-input class="w300" type="textarea" v-model="addMsg.Description"></el-input>
         </el-form-item>
@@ -280,8 +306,36 @@
           Name: "",
           HotelProductType: 0,
           Description: "",
-          ServiceNumber: ""
+          ServiceNumber: "",
+          BreakfastType: 1, //早餐类型 1-含早餐,2-单早餐，3-双早餐
+          BedType: 1, //床型 1-单人床,2-大床，3-双床
+          BedDesc: '', //床型描述
+          HasWindow: 1, //是否有窗(1-有窗，2-无窗)
+          IsCancel: 1, //'是否可免费取消(1-不可取消,2-可取消
+          CancelTime: '' //免费取消时间
         },
+        //早餐类型下拉
+        BreakfastList: [{
+          Id: 1,
+          Name: '含早餐'
+        }, {
+          Id: 2,
+          Name: '单早餐'
+        }, {
+          Id: 3,
+          Name: '双早餐'
+        }],
+        //床型下拉
+        BedTypeList: [{
+          Id: 1,
+          Name: '单人床'
+        }, {
+          Id: 2,
+          Name: '大床'
+        }, {
+          Id: 3,
+          Name: '双床'
+        }],
         rules: {
           //表单必填验证
           Hotel_ID: [{
@@ -399,6 +453,7 @@
               this.innerVisible = true;
               this.insideDialogTxt = res.data.message;
               this.isDeleteNote = true;
+              this.Error(res.data.message);
             }
           },
           null
@@ -411,7 +466,13 @@
           Hotel_ID: parseInt(this.HotelID),
           Name: "",
           Description: "",
-          ServiceNumber: ""
+          ServiceNumber: "",
+          BreakfastType:1,
+          BedType:1,
+          BedDesc:'',
+          HasWindow:1,
+          IsCancel:1,
+          CancelTime:''
         };
         this.addMsg = newMsg;
       },

src/components/commonPage/comImgList.vue

@@ -17,7 +17,7 @@
                 <div flex="dir:left box:last">
                   <el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
                     <i class="el-icon-tickets"></i>
-                    <span>{{item.Label==''?'酒店图片':item.Label}}</span>
+                    <span>{{item.Label==''?'全部':item.Label}}</span>
                   </el-col>
                   <el-col class="blue" :span="6" v-if="index!=0">
                     <span @click="editGroup(index)">编辑</span>