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

src/components/Hotel/HotelManagement.vue

@@ -344,9 +344,11 @@
         <li>
           <span>
             <em>{{$t('objFill.shangchuanshijian')}}</em>
-            <el-date-picker class="w150" type="date" v-model="msg.QFileStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder>
+            <el-date-picker class="w150" type="date" v-model="msg.QFileStartDate" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" placeholder>
             </el-date-picker>
-            <el-date-picker class="w150" type="date" v-model="msg.QFileEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder>
+            <el-date-picker class="w150" type="date" v-model="msg.QFileEndDate" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" placeholder>
             </el-date-picker>
           </span>
         </li>
@@ -398,16 +400,6 @@
             {{ $t("ground.zhenshimingcheng") }}: {{ item.HotelRealName }}
           </div>
         </el-tooltip>
-        <!-- <div class="brandList clearfix" >
-          <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">
           <div v-show="item.Address">
             <i class="iconfont icon-img_dz"></i>
@@ -443,12 +435,12 @@
               {{$t('hotel.hotel_roomType')}}
             </button>
             <br />
-            <button v-if="(IsHotelPriceStock==1||userInfo.RB_Group_id!=2)" style="width: 80px; margin-top: 10px"
+            <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||userInfo.RB_Group_id!=2)" style="width: 80px; margin-top: 10px" @click="downloadFile(item)"
-              class="hotelBtnMan">
+            <button v-if="(IsUpload_Hotel_Price==1)" style="width: 80px; margin-top: 10px"
+              @click="downloadFile(item)" class="hotelBtnMan">
               {{$t('objFill.shangchuanbj')}}
             </button>
             <template v-if="item.MaxFileDate&&item.MaxFileDate!=''">
@@ -554,6 +546,7 @@
         defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
         loading: true,
         IsHotelPriceStock: 0, //1-有获取餐厅与报价添加修改权限
+        IsUpload_Hotel_Price: 0, //1-可查看、上传酒店报价
         IsEditDmcSource: 0, //是否有新增修改权限
         msg: {
           pageIndex: 1,
@@ -640,7 +633,6 @@
             Id: file.Id,
           },
           (res) => {
-            // this.DmcFileStoreList.splice(index, 1);
             this.getFilelist();
           },
           (err) => {}
@@ -845,18 +837,7 @@
           (err) => {}
         );
       },
-      //获取酒店修改与报价添加修改权限
-      GetHotelPirceStockAuth() {
-        this.apipost(
-          "hotel_post_GetHotelPriceStockAuthService", {},
-          (res) => {
-            if (res.data.resultCode == 1) {
-              this.IsHotelPriceStock = res.data.data;
-            }
-          },
-          (err) => {}
-        );
-      },
+ 
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {
         let msg = {
@@ -880,6 +861,7 @@
       GetHotelPirceStockAuth() {
         let isStock = "IsHotelPriceStock";
         let editDmcSource = "F_EditDmcSource";
+        let isHotelPrice = "Upload_Hotel_Price"
         this.apipost('userauth_get_CheckUserAuthNewService', '', res => {
           if (res.data.resultCode == 1) {
             var tempData = res.data.data;
@@ -890,6 +872,9 @@
               if (tempData.includes(editDmcSource)) { //查看列表权限
                 this.IsEditDmcSource = 1;
               }
+              if (tempData.includes(isHotelPrice)) {
+                this.IsUpload_Hotel_Price = 1;
+              }
             }
           }
 
@@ -931,7 +916,6 @@
         this.msg.ID = id;
       }
       this.getEmployeeList();
-      this.GetHotelPirceStockAuth();
       this.getCountryList();
       this.GetHotelTypeList();
       this.GetHotelPirceTypeList();