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

src/components/Hotel/HotelSalesBoard.vue

@@ -224,7 +224,7 @@
           <span><em>{{$t('admin.admin_company')}}</em>
             <el-select filterable v-model='msg.OutBranchId'
               :placeholder="$t('pub.unlimitedSel')">
-              <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
+              <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
               <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
               </el-option>
             </el-select>
@@ -313,7 +313,7 @@
           Province: 0,
           City: 0,
           loading: false,
-          OutBranchId:0,
+          OutBranchId:-1,
         },
         //分公司列表
         companyList: [],

src/components/busManagement/BusInfo.vue

@@ -124,7 +124,9 @@
   .carPlanOne .w320 {
     margin: 5px 0;
   }
-
+  .busInfo .w200{
+    padding:10px 0;
+  }
 </style>
 <template>
   <div class="flexOne busInfo">
@@ -274,7 +276,7 @@
                   <span class="subName" :class="{'spanCked':item.AccommodationType==subItem.Id}"
                     @click="AccommodationCLick(subItem.Id,index)">{{subItem.Name}}</span>
                   <span v-if="subItem.Id==1 && item.AccommodationType==1">
-                    <el-input class="w135" v-model="item.AccommodationRemark" placeholder="请输入外宿地址"></el-input>
+                    <el-input class="w135" style="margin-top:13px;" v-model="item.AccommodationRemark" placeholder="请输入外宿地址"></el-input>
                   </span>
                 </span>
               </div>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -370,9 +370,7 @@
         if (SaveType == 3) {
           basicData.TravelInfoIsCopy = true;
         }
-
         basicData.TeamType=this.TeamType;
-        console.log("basicData",basicData);
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,
@@ -599,7 +597,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-                console.log("tempData",tempData);
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1466,6 +1466,7 @@
             this.priceData.IsNew = true;
           }
         }
+
       },
       //保存酒店使用情况
       saveHoteluseDetail() {