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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -504,6 +504,7 @@
                     <i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i> </p> <p>
                         <span>已报入</span>
                         <i>
+
                           {{item.OrderGuestNum}}
                           <span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人
                         </i>
@@ -514,7 +515,7 @@
                   </p>
                   <p class="travelnowrap">
                     <span>候补</span>
-                    <span v-if="item.IsSubstitution==1" class="TCL-greenType">允许候补（候补{{item.SubstitutionCount}}人）</span>
+                    <span v-if="item.IsSubstitution==1" class="TCL-greenType">允许候补（候补{{item.HBNum}}人）</span>
                     <span v-else class="TCL-redType">不允许候补</span>
                   </p>
                   <p>
@@ -645,7 +646,7 @@
                 <div class="TCL_remarkTitle">OP对内备注：</div>
                 <div class="TCL_Content">{{item.OPInnerRemark}}</div>
               </div>
-              <div class="clearfix TCL-redType" v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
+              <div class="clearfix TCL-redType" v-if="item.DmcRemarkLast ||  item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
                 <div class="TCL_remarkTitle">地接备注：</div>
                 <div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
                   <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"

src/components/busManagement/BusApportionManagement.vue

@@ -66,22 +66,21 @@
         border:1px dashed rgba(210,210,210,1);
         border-radius:2px;
         cursor: pointer;
-        margin-bottom: 10px;
         padding: 5px;
         margin-right: 10px;
         position: relative;
     }
-    ._addUpload_box>div:hover{
+    .BusApportionManagement ._addUpload_box>div:hover{
         background-color: #f5f5f5;
     }
-    ._addFile_name{
+    .BusApportionManagement ._addFile_name{
         padding-left: 15px;
         max-width: 450px;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
     }
-    ._addUpload_box .icon-guanbi1 {
+    .BusApportionManagement ._addUpload_box .icon-guanbi1 {
         font-size: 12px;
         color: white;
         display: inline-block;
@@ -96,11 +95,11 @@
         text-align: center;
         line-height: 20px;
     }
-    ._addUpload_box .icon-guanbi1:hover {
+    .BusApportionManagement ._addUpload_box .icon-guanbi1:hover {
         font-size: 12px;
         color: #c94052;
     }
-    ._addUpload_box .icon-excel,._addUpload_box .icon-pdf{
+    .BusApportionManagement ._addUpload_box .icon-excel,._addUpload_box .icon-pdf{
         text-align: center;
         font-size: 38px;
         color: green;
@@ -110,7 +109,7 @@
         width:126px!important;
         height:80px!important;
     }
-    ._show_img_box{
+    .BusApportionManagement ._show_img_box{
       position: fixed;
       background: rgba(0,0,0,.6);
       left: 0;

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -359,6 +359,7 @@
         } else {
           basicData.TeamType = 0;
         }
+ 
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -1213,8 +1213,9 @@
         );
         return _string;
       },
-      setDisDirectFlight(priceFlight) {
-        this.priceData.PriceFlight = JSON.parse(JSON.stringify(priceFlight));
+      setDisDirectFlight(obj) {
+        this.priceData.PriceFlight = JSON.parse(JSON.stringify(obj.priceFlight));
+        this.priceData.DeleteAirticketIds=obj.DeleteAirticketIdArray.join(',');
       },
       //删除标签
       delDateList(item) {