页面修改

src/components/Hotel/GnHotelManagement.vue

@@ -243,9 +243,10 @@
         <li>
           <span>
             <em>{{$t('hotel.hotel_status')}}</em>
-            <el-select v-model="msg.Status" class="w210" :placeholder="$t('pub.unlimitedSel')">
-              <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
-              <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <el-select v-model="msg.HotelStatus" class="w210" :placeholder="$t('pub.unlimitedSel')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
+              <el-option  :key="1" label="上架" :value="1"></el-option>
+              <el-option  :key="2" label="下架" :value="2"></el-option>
             </el-select>
           </span>
         </li>
@@ -392,7 +393,7 @@
           QCountry: "2",
           QProvince: "",
           QCity: "",
-          Status: "0",
+          HotelStatus: 1,
           HotelPirceType: "-1",
           HotelType: "-1",
           QDistrict: "",
@@ -447,6 +448,11 @@
           res => {
             if (res.data.resultCode == 1) {
               this.selectResource();
+              this.Success(res.data.message);
+            }
+            else
+            {
+               this.Error(res.data.message);
             }
           },
           null

src/components/Hotel/HotelProductManage.vue

@@ -258,8 +258,15 @@
           </el-switch>
         </el-form-item>
         <el-form-item label="是否有窗">
-          <el-switch v-model="addMsg.HasWindow" :active-value="1" :inactive-value="2">
-          </el-switch>
+          <el-select placeholder="是否有窗" class="w300" v-model="addMsg.HasWindow">
+            <el-option :key="1" label="有窗" :value="1">
+            </el-option>
+            <el-option :key="2" label="无窗" :value="2">
+            </el-option>
+            <el-option :key="3" label="部分有窗" :value="3">
+            </el-option>
+          </el-select>
+ 
         </el-form-item>
         <el-form-item label="免费取消">
           <el-switch v-model="addMsg.IsCancel" :active-value="2" :inactive-value="1">
@@ -306,9 +313,9 @@
         <th>床型/早餐</th>
         <th>房间信息</th>
         <th>是否可取消</th>
-        <!-- <th>{{$t('scen.sc_bjts')}}</th>
+        <th>{{$t('scen.sc_bjts')}}</th>
         <th>{{$t('scen.sc_dj')}}</th>
-        <th>{{$t('scen.sc_gj')}}</th> -->
+        <th>{{$t('scen.sc_gj')}}</th>
         <th>{{$t('hotel.hotel_remark')}}</th>
         <th>{{$t('hotel.table_operat')}}</th>
       </tr>
@@ -342,7 +349,7 @@
             <br /> {{item.CancelTime}} 前
           </template>
         </td>
-        <!-- <td class="DaysInfo">
+        <td class="DaysInfo">
           <span><i class="iconfont icon-kaoqintongji"></i>{{item.Days}}{{$t('hotel.hotel_day')}}</span>
         </td>
         <td>
@@ -357,7 +364,7 @@
             <span class='tit_name HP'>{{item.HPrice}}</span>
           </p>
           <p class="Ldata">{{item.HDate}}</p>
-        </td> -->
+        </td>
         <td>
           <el-tooltip v-if="item.Description" class="item" effect="dark" :content="item.Description"
             placement="top-start" popper-class="max-w250">
@@ -443,6 +450,9 @@
         }, {
           Id: 4,
           Name: '无早餐'
+        }, {
+          Id: 5,
+          Name: '早晚餐'
         }],
         //床型下拉
         BedTypeList: [{

src/components/Restaurant/demesticRestaurantPrice.vue

@@ -473,7 +473,7 @@
             </el-form-item>
           </div>
           <div class="resDiv">
-            <el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook" prop="Supplier">
+            <el-form-item :label="$t('hotel.hotel_Supplier')"   >
               <el-select v-model="addMsg.Supplier" class="w210" filterable :placeholder="$t('hotel.hotel_inputholder')">
                 <el-option :label='$t("hotel.hotel_inputholder")' :value='defaultSelect'></el-option>
                 <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>