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

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -47,7 +47,7 @@
 
         <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
           :priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
-          :TeamType="TeamType"></TravelPrice>
+          :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
         <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice2>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -452,8 +452,14 @@
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
                     </el-checkbox>
-                    <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
+                    <template v-if="CurrentUserInfo.RB_Group_id==2">
+                        <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
                       v-if="(PostConfig.LineId==14 || PostConfig.LineId==131) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
+                    </template>
+                    <template v-else>
+                     <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
+                      v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> 
+                    </template>
                   </div>
                   <el-form-item prop="B2BMemberPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@@ -999,7 +1005,7 @@
   import commonPHlInfo from "../../commonPage/commonPriceHotelInfo.vue";
   import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
   export default {
-    props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
+    props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType","CurrentUserInfo","IsDirect"],
     data() {
       return {
         outerVisible: false,