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

src/components/Hotel/HotelInfo.vue

@@ -42,8 +42,7 @@
             </el-switch>
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel_payType')">
-            <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"
-              :disabled="IsHaveAuth==1?false:true">
+            <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
               <el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
               </el-option>

src/components/Hotel/HotelManagement.vue

@@ -7,7 +7,7 @@
 
   .hotelmanagement .resourceListMan {
     width: 215px;
-    height: 350px;
+    height: 330px;
     background-color: #fff;
     border: 1px dashed #ededed;
     border-radius: 4px;
@@ -87,7 +87,7 @@
   }
 
   .hotelmanagement .hotelTitle {
-    margin: 22px 16px 0 16px;
+    margin: 10px 16px 0 16px;
     font-size: 14px;
     color: #333333;
     overflow: hidden;
@@ -117,7 +117,7 @@
   }
 
   .hotelmanagement .Address {
-    margin: 0 16px;
+    margin: 10px 10px 0px 16px;
     height: 17px;
     overflow: hidden;
   }
@@ -129,7 +129,7 @@
   .hotelmanagement .iconfont {
     margin-right: 5px;
     position: relative;
-    top: -4px;
+    top: 0px;
   }
 
   .hotelmanagement .icon-star1 {
@@ -374,11 +374,9 @@
                 L5: items.ID == 5,
               }">{{ items.Name }}</span>
           </div>
-          <template v-if="msg.IsRecommend==0" > 
-             <div class="delScien" @click.stop="isdelete(item.ID)">
+          <div class="delScien" @click.stop="isdelete(item.ID)">
             <i class="iconfont icon-xingzhuang"></i>
-          </div></template>
-         
+          </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>
@@ -400,7 +398,7 @@
             {{ $t("ground.zhenshimingcheng") }}: {{ item.HotelRealName }}
           </div>
         </el-tooltip>
-        <div class="brandList clearfix" style="display: none">
+        <!-- <div class="brandList clearfix" >
           <div class="brand">
             <i class="iconfont honor icon-img_biaozhi"></i>
             {{ item.ChainBrand }}
@@ -409,7 +407,7 @@
             <i class="iconfont dieline icon-img_shijian"></i>
             {{ item.DieLine }}{{ $t("hotel.hotel_day") }}
           </div>
-        </div>
+        </div> -->
         <div class="Address">
           <div v-show="item.Address">
             <i class="iconfont icon-img_dz"></i>
@@ -420,13 +418,8 @@
         </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;
-            ">
+          <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
@@ -436,37 +429,30 @@
         </el-tooltip>
         <div class="btnList">
           <template v-if="userInfo.RB_Group_id==2">
-           <template v-if="msg.IsRecommend==0">
             <button @click="goSubInfo('HotelInfo', item.ID)" class="hotelBtnMan">
               {{ $t("pub.updateMsg") }}
             </button>
-           </template>
-           <button @click="goSubInfo('HotelInfoDetails', item.ID)" class="hotelBtnMan">
-            详情
+            <button @click="goSubInfo('HotelInfoDetails', item.ID)" class="hotelBtnMan">
+              详情
             </button>
-           <template v-if="msg.IsRecommend==0">
             <button @click="CopyHotel(item.ID)" class="hotelBtnMan" v-if="userInfo.RB_Group_id == QjGroupId()">
               {{$t('objFill.copy')}}
-            </button> 
-          </template>
-          <template v-if="msg.IsRecommend==0">
+            </button>
             <button @click="goproduct('HotelProductManage', item)" class="hotelBtnMan"
               v-if="userInfo.RB_Group_id != QjGroupId()">
               {{$t('hotel.hotel_roomType')}}
             </button>
-          </template>
             <br />
-
-            <button v-if="(IsHotelPriceStock==1||userInfo.RB_Group_id!=2)&&msg.IsRecommend==0" style="width: 80px; margin-top: 10px"
+            <button v-if="(IsHotelPriceStock==1||userInfo.RB_Group_id!=2)" style="width: 80px; margin-top: 10px"
               @click="goUrl('HotelProductManage2', item)" class="hotelBtnMan">
               {{ $t("ground.baojiayukucun") }}
             </button>
-            <button v-if="IsHotelPriceStock==1&&msg.IsRecommend==0" style="width: 80px; margin-top: 10px" @click="downloadFile(item)"
+            <button v-if="IsHotelPriceStock==1 " style="width: 80px; margin-top: 10px" @click="downloadFile(item)"
               class="hotelBtnMan">
               {{$t('objFill.shangchuanbj')}}
             </button>
-            <template v-if="item.MaxFileDate&&item.MaxFileDate!=''&&msg.IsRecommend==0">
-              <span style="color:red">{{$t('objFill.zuijinscsij')}}:{{item.MaxFileDate}}</span>
+            <template v-if="item.MaxFileDate&&item.MaxFileDate!=''">
+              <br /><span style="color:red">{{$t('objFill.zuijinscsij')}}:{{item.MaxFileDate}}</span>
             </template>
           </template>
           <template v-else>
@@ -588,7 +574,6 @@
           QFileStartDate: "", //报价上传开始日期
           QFileEndDate: "", //报价上传结束日期
           IsUpFile: 0, //是否上传报价(1-已上传，2-未上传)
-          IsRecommend:0,
         },
         isDisableCountry: false, //是否禁用国家查询
       };
@@ -891,8 +876,8 @@
           (err) => {}
         );
       },
-            //获取酒店修改与报价添加修改权限
-    GetHotelPirceStockAuth() {
+      //获取酒店修改与报价添加修改权限
+      GetHotelPirceStockAuth() {
         let isStock = "IsHotelPriceStock";
         let editDmcSource = "F_EditDmcSource";
         this.apipost('userauth_get_CheckUserAuthNewService', '', res => {
@@ -902,18 +887,12 @@
               if (tempData.includes(isStock)) {
                 this.IsHotelPriceStock = 1;
               }
-              if (tempData.includes(editDmcSource)) {//查看列表权限
+              if (tempData.includes(editDmcSource)) { //查看列表权限
                 this.IsEditDmcSource = 1;
               }
-              else{
-                this.msg.IsRecommend=1;
-              }
             }
           }
-          else{
-            this.msg.IsRecommend=1;
-          }
-          this.selectResource();
+
         });
       },
     },
@@ -956,6 +935,7 @@
       this.getCountryList();
       this.GetHotelTypeList();
       this.GetHotelPirceTypeList();
+      this.selectResource();
     },
   };
 

src/components/Restaurant/restaurantInfoManage.vue

@@ -704,7 +704,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel_website')">
-            <el-input readonly v-model="addMsg.URL" maxlength="100" class="w300">
+            <el-input v-model="addMsg.URL" maxlength="100" class="w300">
               <template slot="prepend">https://</template>
             </el-input>
           </el-form-item>
@@ -781,8 +781,7 @@
             </el-switch>
           </el-form-item>
           <el-form-item :label="$t('ground.zhifufangshi')">
-            <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"
-              :disabled="IsHaveAuth==1?false:true">
+            <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
               <el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
               </el-option>

src/components/Restaurant/restaurantList.vue

@@ -60,23 +60,27 @@
 
   .restaurantList .L1 {
     background-color: #e95252;
+    border-radius: 2px;
   }
 
   .restaurantList .L2 {
     background-color: #47bf8c;
+    border-radius: 2px;
   }
 
   .restaurantList .L3 {
     background-color: #2aaef2;
+    border-radius: 2px;
   }
 
   .restaurantList .L4 {
     background-color: #9cf;
+    border-radius: 2px;
   }
 
   .restaurantList .L5 {
     background-color: #00c6ff;
-    margin-top: 5px;
+    border-radius: 2px;
   }
 
   .restaurantList .F1 {
@@ -321,8 +325,8 @@
         <li>
           <button class="hollowFixedBtn" type="button"
             @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
-          <!--v-if="IsEditDmcSource==1"-->
-          <button class="normalBtn" type="button"
+
+          <button v-if="IsEditDmcSource==1" class="normalBtn" type="button"
             @click="$router.push('restaurantInfoManage')">{{$t('pub.addBtn')}}</button>
         </li>
       </ul>
@@ -335,7 +339,7 @@
           <div class="resTypeList">
             <span class="foodList" v-for="(items,index) in item.FoodTagArr" :key="`ft_`+index">{{items}}</span>
           </div>
-          <div class="delScien" @click="isdelete(item.ID)" v-if="msg.IsRecommend==0">
+          <div class="delScien" @click="isdelete(item.ID)" v-if="IsEditDmcSource==1">
             <i class="iconfont icon-xingzhuang"></i>
           </div>
           <div class="starSu">
@@ -354,7 +358,7 @@
         <template v-if="item.OpenPlatformList&&item.OpenPlatformList.length>0">
           <div class="hotelTitle fz12">上架平台:<span v-for="(items,index) in item.OpenPlatformList"
               :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
-              :key="`pl_`+index" style="padding-left:1px;">{{items.Name}}</span>
+              :key="`pl_`+index" style="margin-left:1.5px;">{{items.Name}}</span>
           </div>
         </template>
         <el-tooltip class="item" effect="dark" :content="item.UseTypeListStr" placement="top-start"
@@ -372,11 +376,14 @@
           <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
           {{item.UpdateTimeStr}}
         </div>
-        <div class="btnList" :style="msg.IsRecommend==1?'text-align:left;':''">
-          <button  v-if="msg.IsRecommend==0" @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
-          <button  :style="msg.IsRecommend==1?'margin-left:19px;':''"  @click="goSubInfo('restaurantInfoDetail',item.ID)" class="hotelBtn">{{$t('fnc.xiangqing')}}</button>
-          <button  v-if="IsHotelPriceStock==1&&msg.IsRecommend==0" @click="goUrl('RestaurantPackage',item.ID)"
+        <div class="btnList" style="text-align:center;">
+          <button v-if="IsEditDmcSource==1" @click="goSubInfo('restaurantInfoManage',item.ID)"
+            class="hotelBtn">{{$t('pub.updateMsg')}}</button>
+
+          <button v-if="IsHotelPriceStock==1&&IsEditDmcSource==1" @click="goUrl('RestaurantPackage',item.ID)"
             class="hotelBtn">{{$t('restaurant.res_package')}}</button>
+
+          <button @click="goSubInfo('restaurantInfoDetail',item.ID)" class="hotelBtn">{{$t('fnc.xiangqing')}}</button>
         </div>
       </div>
     </div>
@@ -427,7 +434,7 @@
           currentPage: 1,
           ID: 0,
           UpdateBy: 0, //操作人
-          IsRecommend:0,
+          IsRecommend: 0,
         },
         IsHotelPriceStock: 0, //1-有获取餐厅与报价添加修改权限
         IsEditDmcSource: 0, //是否有新增修改权限
@@ -592,16 +599,14 @@
               if (tempData.includes(isStock)) {
                 this.IsHotelPriceStock = 1;
               }
-              if (tempData.includes(editDmcSource)) {//查看列表权限
+              if (tempData.includes(editDmcSource)) { //查看列表权限
                 this.IsEditDmcSource = 1;
-              }
-              else{
-                this.msg.IsRecommend=1;
+              } else {
+                this.msg.IsRecommend = 1;
               }
             }
-          }
-          else{
-            this.msg.IsRecommend=1;
+          } else {
+            this.msg.IsRecommend = 1;
           }
           this.selectResource();
         });