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

src/components/TravelManager/TravelList/DistributionTransport.vue

@@ -72,7 +72,7 @@
     <div class="DT_rightList">
       <div class="TMTitle"><i></i>联运设置</div>
       <!--保存-->
-      <input type='button' class="normalBtn" @click="SaveUnion()" value="保存"></input>
+      <input type='button' class="normalBtn" @click="SaveUnion()" value="保存" />
       <table class="singeRowTable DT_Table" border="0" cellspacing="0" cellpadding="0">
         <tbody>
           <tr>
@@ -128,6 +128,9 @@
             <th width="160">
               集合地点
             </th>
+            <th width="160">
+              隐藏航班
+            </th>
             <th width="150">
               操作
             </th>
@@ -197,6 +200,13 @@
             <td rowspan="2">
               <el-input class="w150" v-model="item.GatherAddress"></el-input>
             </td>
+            <td rowspan="2">
+              <el-select class="w200" filterable v-model="item.NotShowFlightIdsList" multiple clearable>
+                <el-option v-for="subItem in TravelFlightList" :label='subItem.Flight_number' :value='subItem.ID'
+                  :key="subItem.subCode">
+                </el-option>
+              </el-select>
+            </td>
             <td rowspan="2">
               <el-button type="danger" icon="iconfont icon-guanbi" circle @click="DeleteUnion(item,index)"></el-button>
               <el-popover width="400" trigger="click">
@@ -273,9 +283,9 @@
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="12">
+            <td colspan="13">
               <input v-if="ChoosrPriceArray!=null && ChoosrPriceArray.length>0" type='button' class="normalBtn"
-                @click="AddItem()" value="新增"></input>
+                @click="AddItem()" value="新增" />
             </td>
           </tr>
         </tfoot>
@@ -338,10 +348,23 @@
             ID: 2,
             Name: "后两天"
           }
-        ]
+        ],
+        //团绑定的航班列表
+        TravelFlightList: [],
       };
     },
     methods: {
+      //根据团号获取团绑定的航班列表
+      getTravelPriceFlight(TCID) {
+        this.apipost(
+          "travel_post_GetFlightListByTCID", {
+            TCID: TCID
+          },
+          res => {
+            this.TravelFlightList = res.data.data;
+          },
+        );
+      },
       //交通类型切换
       getTrafficType1(item, type) {
         item.FlightList = [];
@@ -383,6 +406,7 @@
           //出团公司
           OutBranchId: item.OutBranchId
         };
+        this.getTravelPriceFlight(item.TCID);
         switch (item.checkState) {
           //未选中====>选中
           case this.ShowStatusList.NoChecked:
@@ -573,6 +597,8 @@
           ArrList: [],
           GoTrafficType: 1, //去程交通类型
           BackTrafficType: 1, //回程交通类型
+          NotShowFlightIdsList: [], //不显示航班下拉列表
+          NotShowFlightIds: "", //不显示航班
         });
       },
       //保存联运信息数据