1

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -662,7 +662,7 @@
                   <el-form-item prop="OutBranchId" style="margin-top:1px;">
                     <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
                     <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"
-                      :disabled="CurrentUserInfo.RB_Group_id==2">
+                      :disabled="CurrentUserInfo.RB_Group_id==2 &&PostConfig.OfferId>0">
                       <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
                       <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
                       </el-option>
@@ -904,7 +904,7 @@
                 </div>
                 <div class="clearfix">
                   <div class="TPright clearfix">
-                    <el-form-item prop="OutBranchId" style="margin-top:1px;">
+                    <el-form-item  style="margin-top:1px;">
                       <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
                       <el-select class="w180" v-model="priceData.PriceTeamType">
                         <template v-for="item in TeamListArr">

src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue

@@ -387,7 +387,7 @@
       },
       //早餐切换
       changeBreakfastList(breakfastObj) {
-        if (breakfastObj.BreakfastUseType != 0) {
+        if (breakfastObj&&breakfastObj.BreakfastUseType != 0) {
           //获取当前选中的对象
           let obj = {};
           obj = this.breakFirstList.find(item => {